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

use require css

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-30 12:21:52 -05:00
parent a4cf4d91ff
commit 7355fb1f65
10 changed files with 23 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

6
dashboard-ui/bower_components/iron-overlay-behavior/.bower.json vendored
View file

@ -33,14 +33,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-overlay-behavior", "homepage": "https://github.com/polymerelements/iron-overlay-behavior",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "1ed1603ce820456feab3f62ae86f8f3ec801d131" "commit": "1ed1603ce820456feab3f62ae86f8f3ec801d131"
}, },
"_source": "git://github.com/PolymerElements/iron-overlay-behavior.git", "_source": "git://github.com/polymerelements/iron-overlay-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-overlay-behavior" "_originalSource": "polymerelements/iron-overlay-behavior"
} }

4
dashboard-ui/bower_components/neon-animation/.bower.json vendored
View file

@ -54,7 +54,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "36656916b75a4715b025a03473620002c2650ee8" "commit": "36656916b75a4715b025a03473620002c2650ee8"
}, },
"_source": "git://github.com/polymerelements/neon-animation.git", "_source": "git://github.com/PolymerElements/neon-animation.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/neon-animation" "_originalSource": "PolymerElements/neon-animation"
} }

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

@ -728,7 +728,7 @@
var elem = e.target; var elem = e.target;
if (!elem.classList.contains('card')) { if (!elem.classList.contains('cardImage')) {
return; return;
} }

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1014,7 +1014,7 @@
{ transform: 'none', opacity: '1', offset: 1 } { 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); elem.animate(keyframes, timing);
}); });
} }

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

@ -6,7 +6,7 @@
self.show = function () { self.show = function () {
Dashboard.importCss('css/search.css'); require(['css!/css/search.css']);
$('.headerSearchInput').val(''); $('.headerSearchInput').val('');
$('.btnCloseSearch').hide(); $('.btnCloseSearch').hide();

4
dashboard-ui/scripts/sharingwidget.js
View file

@ -2,9 +2,7 @@
function showMenu(options, successCallback, cancelCallback) { 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', 'css!thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css'], function () {
require(['thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min'], function () {
var id = 'dlg' + new Date().getTime(); var id = 'dlg' + new Date().getTime();
var html = ''; var html = '';

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

@ -1967,10 +1967,6 @@ var AppInfo = {};
define("connectservice", ["apiclient/connectservice"]); define("connectservice", ["apiclient/connectservice"]);
define("jqmicons", [], function () {
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
return {};
});
define("livetvcss", [], function () { define("livetvcss", [], function () {
Dashboard.importCss('css/livetv.css'); Dashboard.importCss('css/livetv.css');
return {}; return {};
@ -1979,10 +1975,7 @@ var AppInfo = {};
Dashboard.importCss('css/detailtable.css'); Dashboard.importCss('css/detailtable.css');
return {}; return {};
}); });
define("tileitemcss", [], function () { define("tileitemcss", ['css!/css/tileitem.css']);
Dashboard.importCss('css/tileitem.css');
return {};
});
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
define("actionsheet", ["cordova/actionsheet"]); define("actionsheet", ["cordova/actionsheet"]);
@ -2004,39 +1997,20 @@ var AppInfo = {};
define("searchmenu", ["scripts/searchmenu"]); define("searchmenu", ["scripts/searchmenu"]);
} }
define("jqmtable", ["thirdparty/jquerymobile-1.4.5/jqm.table"], function () { define("jqmicons", ['css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.table.css'); define("jqmtable", ["thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']);
return {};
});
define("jqmwidget", ["thirdparty/jquerymobile-1.4.5/jqm.widget"], function () { define("jqmwidget", ["thirdparty/jquerymobile-1.4.5/jqm.widget"]);
return {};
});
define("jqmslider", ["thirdparty/jquerymobile-1.4.5/jqm.slider"], function () { define("jqmslider", ["thirdparty/jquerymobile-1.4.5/jqm.slider", 'css!thirdparty/jquerymobile-1.4.5/jqm.slider.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.slider.css');
return {};
});
define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup"], function () { define("jqmpopup", ["thirdparty/jquerymobile-1.4.5/jqm.popup", 'css!thirdparty/jquerymobile-1.4.5/jqm.popup.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.popup.css');
return {};
});
define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview"], function () { define("jqmlistview", ["thirdparty/jquerymobile-1.4.5/jqm.listview", 'css!thirdparty/jquerymobile-1.4.5/jqm.listview.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.listview.css');
return {};
});
define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup"], function () { define("jqmcontrolgroup", ["thirdparty/jquerymobile-1.4.5/jqm.controlgroup", 'css!thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css');
return {};
});
define("jqmcollapsible", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.collapsible"], function () { define("jqmcollapsible", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.collapsible", 'css!thirdparty/jquerymobile-1.4.5/jqm.collapsible.css']);
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jqm.collapsible.css');
return {};
});
define("jqmcheckbox", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.checkbox", 'css!thirdparty/jquerymobile-1.4.5/jqm.checkbox.css']); define("jqmcheckbox", ["jqmicons", "thirdparty/jquerymobile-1.4.5/jqm.checkbox", 'css!thirdparty/jquerymobile-1.4.5/jqm.checkbox.css']);

2
dashboard-ui/themes/halloween/theme.js
View file

@ -18,7 +18,7 @@
return; return;
} }
Dashboard.importCss('themes/halloween/style.css'); require(['css!themes/halloween/style.css']);
if (!browserInfo.mobile) { if (!browserInfo.mobile) {

2
dashboard-ui/voice/voice.js
View file

@ -329,7 +329,7 @@
destroyCurrentRecognition(); destroyCurrentRecognition();
Dashboard.importCss('voice/voice.css'); require(['css!voice/voice.css']);
startListeningInternal(); startListeningInternal();
} }