diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index f4bfef4a7c..e1304d174b 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/polymerelements/iron-meta", + "homepage": "https://github.com/PolymerElements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/polymerelements/iron-meta.git", + "_source": "git://github.com/PolymerElements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-meta" + "_originalSource": "PolymerElements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json index 3911d5458a..781650cdba 100644 --- a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json @@ -33,14 +33,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-overlay-behavior", + "homepage": "https://github.com/polymerelements/iron-overlay-behavior", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "1ed1603ce820456feab3f62ae86f8f3ec801d131" }, - "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git", + "_source": "git://github.com/polymerelements/iron-overlay-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-overlay-behavior" + "_originalSource": "polymerelements/iron-overlay-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/neon-animation/.bower.json b/dashboard-ui/bower_components/neon-animation/.bower.json index 67f935cf9f..fa31ad184d 100644 --- a/dashboard-ui/bower_components/neon-animation/.bower.json +++ b/dashboard-ui/bower_components/neon-animation/.bower.json @@ -54,7 +54,7 @@ "tag": "v1.0.8", "commit": "36656916b75a4715b025a03473620002c2650ee8" }, - "_source": "git://github.com/polymerelements/neon-animation.git", + "_source": "git://github.com/PolymerElements/neon-animation.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/neon-animation" + "_originalSource": "PolymerElements/neon-animation" } \ No newline at end of file diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index b05adc10ab..c6732b392b 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -728,7 +728,7 @@ var elem = e.target; - if (!elem.classList.contains('card')) { + if (!elem.classList.contains('cardImage')) { return; } diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 23aa9fcd9e..a8fed69d37 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1014,7 +1014,7 @@ { transform: 'none', opacity: '1', offset: 1 } ]; - var timing = { duration: 240, iterations: 1, easing: 'ease-out' }; + var timing = { duration: 200, iterations: 1, easing: 'ease-out' }; elem.animate(keyframes, timing); }); } diff --git a/dashboard-ui/scripts/searchmenu.js b/dashboard-ui/scripts/searchmenu.js index d77c8d92f4..b80bb9af86 100644 --- a/dashboard-ui/scripts/searchmenu.js +++ b/dashboard-ui/scripts/searchmenu.js @@ -6,7 +6,7 @@ self.show = function () { - Dashboard.importCss('css/search.css'); + require(['css!/css/search.css']); $('.headerSearchInput').val(''); $('.btnCloseSearch').hide(); diff --git a/dashboard-ui/scripts/sharingwidget.js b/dashboard-ui/scripts/sharingwidget.js index dbb4f3a802..093b2a7f96 100644 --- a/dashboard-ui/scripts/sharingwidget.js +++ b/dashboard-ui/scripts/sharingwidget.js @@ -2,9 +2,7 @@ function showMenu(options, successCallback, cancelCallback) { - Dashboard.importCss('thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css'); - - require(['thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min'], function () { + require(['thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min', 'css!thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css'], function () { var id = 'dlg' + new Date().getTime(); var html = ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index f69f75c790..5ef6628aa0 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1967,10 +1967,6 @@ var AppInfo = {}; define("connectservice", ["apiclient/connectservice"]); - define("jqmicons", [], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css'); - return {}; - }); define("livetvcss", [], function () { Dashboard.importCss('css/livetv.css'); return {}; @@ -1979,10 +1975,7 @@ var AppInfo = {}; Dashboard.importCss('css/detailtable.css'); return {}; }); - define("tileitemcss", [], function () { - Dashboard.importCss('css/tileitem.css'); - return {}; - }); + define("tileitemcss", ['css!/css/tileitem.css']); if (Dashboard.isRunningInCordova()) { define("actionsheet", ["cordova/actionsheet"]); @@ -2004,39 +1997,20 @@ var AppInfo = {}; define("searchmenu", ["scripts/searchmenu"]); } - define("jqmtable", ["thirdparty/jquerymobile-1.4.5/jqm.table"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.table.css'); - return {}; - }); + define("jqmicons", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']); + define("jqmtable", ["thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']); - define("jqmwidget", ["thirdparty/jquerymobile-1.4.5/jqm.widget"], function () { - return {}; - }); + define("jqmwidget", ["thirdparty/jquerymobile-1.4.5/jqm.widget"]); - define("jqmslider", ["thirdparty/jquerymobile-1.4.5/jqm.slider"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.slider.css'); - return {}; - }); + define("jqmslider", ["thirdparty/jquerymobile-1.4.5/jqm.slider", 'css!thirdparty/jquerymobile-1.4.5/jqm.slider.css']); - define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.popup.css'); - return {}; - }); + define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup", 'css!thirdparty/jquerymobile-1.4.5/jqm.popup.css']); - define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.listview.css'); - return {}; - }); + define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview", 'css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']); - define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css'); - return {}; - }); + define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup", 'css!thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css']); - define("jqmcollapsible", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.collapsible"], function () { - Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.collapsible.css'); - return {}; - }); + define("jqmcollapsible", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.collapsible", 'css!thirdparty/jquerymobile-1.4.5/jqm.collapsible.css']); define("jqmcheckbox", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.checkbox", 'css!thirdparty/jquerymobile-1.4.5/jqm.checkbox.css']); diff --git a/dashboard-ui/themes/halloween/theme.js b/dashboard-ui/themes/halloween/theme.js index 6be381828e..bf9235c9b0 100644 --- a/dashboard-ui/themes/halloween/theme.js +++ b/dashboard-ui/themes/halloween/theme.js @@ -18,7 +18,7 @@ return; } - Dashboard.importCss('themes/halloween/style.css'); + require(['css!themes/halloween/style.css']); if (!browserInfo.mobile) { diff --git a/dashboard-ui/voice/voice.js b/dashboard-ui/voice/voice.js index 8cc6186bbb..856173910a 100644 --- a/dashboard-ui/voice/voice.js +++ b/dashboard-ui/voice/voice.js @@ -329,7 +329,7 @@ destroyCurrentRecognition(); - Dashboard.importCss('voice/voice.css'); + require(['css!voice/voice.css']); startListeningInternal(); }