diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 5a16c1459b..3f00a02e09 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.197", - "_release": "1.4.197", + "version": "1.4.198", + "_release": "1.4.198", "_resolution": { "type": "version", - "tag": "1.4.197", - "commit": "253ef4d5fe1a4e7126ea48786342d3cb44c23b47" + "tag": "1.4.198", + "commit": "53c25fdedfc4a7ae750ce403a779bd8f5cb1f7c3" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js index 6ffb03d5d9..18c8c7e225 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js @@ -740,7 +740,6 @@ } var selectedMediaInfoTimeout; - var focusedElement; function onProgramGridFocus(e) { var programCell = parentWithClass(e.target, 'programCell'); @@ -749,25 +748,15 @@ return; } - focusedElement = e.target; - if (selectedMediaInfoTimeout) { - clearTimeout(selectedMediaInfoTimeout); - } - selectedMediaInfoTimeout = setTimeout(onSelectedMediaInfoTimeout, 700); - } + var focused = e.target; + var id = focused.getAttribute('data-id'); + var item = items[id]; - function onSelectedMediaInfoTimeout() { - var focused = focusedElement - if (focused && document.activeElement == focused) { - var id = focused.getAttribute('data-id'); - var item = items[id]; - - if (item) { - events.trigger(self, 'focus', [ - { - item: item - }]); - } + if (item) { + events.trigger(self, 'focus', [ + { + item: item + }]); } } diff --git a/dashboard-ui/bower_components/emby-webcomponents/polyfills/raf.js b/dashboard-ui/bower_components/emby-webcomponents/polyfills/raf.js new file mode 100644 index 0000000000..a856f6a76a --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/polyfills/raf.js @@ -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); + }; +}()); \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index bc60e6e941..25eb84c037 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -32,14 +32,14 @@ "iron-component-page": "polymerElements/iron-component-page#^1.1.6" }, "private": true, - "homepage": "https://github.com/Polymer/polymer", + "homepage": "https://github.com/polymer/polymer", "_release": "1.6.1", "_resolution": { "type": "version", "tag": "v1.6.1", "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" }, - "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.2.0", - "_originalSource": "Polymer/polymer" + "_source": "git://github.com/polymer/polymer.git", + "_target": "^1.1.0", + "_originalSource": "polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index d427f23337..511e8a0195 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -303,7 +303,7 @@ } } else if (item.IsFolder) { - if (item.Type != "BoxSet") { + if (item.Type != "BoxSet" && item.Type != "Series") { return id ? "itemlist.html?parentId=" + id : "#"; } } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a5c972a0c1..bf2cc4ef8e 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1398,6 +1398,7 @@ var AppInfo = {}; define('fetch', [bowerPath + '/fetch/fetch']); + define('raf', [embyWebComponentsBowerPath + '/polyfills/raf']); define('functionbind', [embyWebComponentsBowerPath + '/polyfills/bind']); define('arraypolyfills', [embyWebComponentsBowerPath + '/polyfills/array']); define('objectassign', [embyWebComponentsBowerPath + '/polyfills/objectassign']); @@ -1796,6 +1797,10 @@ var AppInfo = {}; list.push('functionbind'); } + if (!window.requestAnimationFrame) { + list.push('raf'); + } + require(list, function () { createConnectionManager().then(function () {