mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update recording file name

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-29 14:42:53 -04:00
parent 7acfaee309
commit 3003c976a8
6 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.197", "version": "1.4.198",
"_release": "1.4.197", "_release": "1.4.198",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.197", "tag": "1.4.198",
"commit": "253ef4d5fe1a4e7126ea48786342d3cb44c23b47" "commit": "53c25fdedfc4a7ae750ce403a779bd8f5cb1f7c3"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

13
dashboard-ui/bower_components/emby-webcomponents/guide/guide.js vendored
View file

@ -740,7 +740,6 @@
} }
var selectedMediaInfoTimeout; var selectedMediaInfoTimeout;
var focusedElement;
function onProgramGridFocus(e) { function onProgramGridFocus(e) {
var programCell = parentWithClass(e.target, 'programCell'); var programCell = parentWithClass(e.target, 'programCell');
@ -749,16 +748,7 @@
return; return;
} }
focusedElement = e.target; var focused = e.target;
if (selectedMediaInfoTimeout) {
clearTimeout(selectedMediaInfoTimeout);
}
selectedMediaInfoTimeout = setTimeout(onSelectedMediaInfoTimeout, 700);
}
function onSelectedMediaInfoTimeout() {
var focused = focusedElement
if (focused && document.activeElement == focused) {
var id = focused.getAttribute('data-id'); var id = focused.getAttribute('data-id');
var item = items[id]; var item = items[id];
@ -769,7 +759,6 @@
}]); }]);
} }
} }
}
function onTimerCreated(e, apiClient, data) { function onTimerCreated(e, apiClient, data) {

31
dashboard-ui/bower_components/emby-webcomponents/polyfills/raf.js vendored Normal file
View file

@ -0,0 +1,31 @@
// http://paulirish.com/2011/requestanimationframe-for-smart-animating/
// http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel
// MIT license
(function () {
var lastTime = 0;
var vendors = ['ms', 'moz', 'webkit', 'o'];
for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame']
|| window[vendors[x] + 'CancelRequestAnimationFrame'];
}
if (!window.requestAnimationFrame)
window.requestAnimationFrame = function (callback, element) {
var currTime = new Date().getTime();
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
var id = window.setTimeout(function () { callback(currTime + timeToCall); },
timeToCall);
lastTime = currTime + timeToCall;
return id;
};
if (!window.cancelAnimationFrame)
window.cancelAnimationFrame = function (id) {
clearTimeout(id);
};
}());

8
dashboard-ui/bower_components/polymer/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/Polymer/polymer", "homepage": "https://github.com/polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/polymer/polymer.git",
"_target": "^1.2.0", "_target": "^1.1.0",
"_originalSource": "Polymer/polymer" "_originalSource": "polymer/polymer"
} }

2
dashboard-ui/scripts/librarybrowser.js
View file

@ -303,7 +303,7 @@
} }
} }
else if (item.IsFolder) { else if (item.IsFolder) {
if (item.Type != "BoxSet") { if (item.Type != "BoxSet" && item.Type != "Series") {
return id ? "itemlist.html?parentId=" + id : "#"; return id ? "itemlist.html?parentId=" + id : "#";
} }
} }

5
dashboard-ui/scripts/site.js
View file

@ -1398,6 +1398,7 @@ var AppInfo = {};
define('fetch', [bowerPath + '/fetch/fetch']); define('fetch', [bowerPath + '/fetch/fetch']);
define('raf', [embyWebComponentsBowerPath + '/polyfills/raf']);
define('functionbind', [embyWebComponentsBowerPath + '/polyfills/bind']); define('functionbind', [embyWebComponentsBowerPath + '/polyfills/bind']);
define('arraypolyfills', [embyWebComponentsBowerPath + '/polyfills/array']); define('arraypolyfills', [embyWebComponentsBowerPath + '/polyfills/array']);
define('objectassign', [embyWebComponentsBowerPath + '/polyfills/objectassign']); define('objectassign', [embyWebComponentsBowerPath + '/polyfills/objectassign']);
@ -1796,6 +1797,10 @@ var AppInfo = {};
list.push('functionbind'); list.push('functionbind');
} }
if (!window.requestAnimationFrame) {
list.push('raf');
}
require(list, function () { require(list, function () {
createConnectionManager().then(function () { createConnectionManager().then(function () {