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 collapsible

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-02 14:05:40 -04:00
parent f351643d29
commit 891a865464
42 changed files with 1185 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -666,19 +666,7 @@ var Dashboard = {
menuHtml += "<div class='sidebarDivider'></div>";
}
if (item.items) {
var style = item.color ? ' iconstyle="color:' + item.color + '"' : '';
var expanded = item.expanded ? (' expanded') : '';
if (item.icon) {
menuHtml += '<emby-collapsible icon="' + item.icon + '" title="' + item.name + '"' + style + expanded + '>';
} else {
menuHtml += '<emby-collapsible title="' + item.name + '"' + style + expanded + '>';
}
menuHtml += item.items.map(Dashboard.getToolsLinkHtml).join('');
menuHtml += '</emby-collapsible>';
}
else if (item.href) {
if (item.href) {
menuHtml += Dashboard.getToolsLinkHtml(item);
} else {
@ -1805,6 +1793,7 @@ var AppInfo = {};
define("libjass", [bowerPath + "/libjass/libjass", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
define("emby-collapse", [embyWebComponentsBowerPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
define("emby-button", [embyWebComponentsBowerPath + "/emby-button/emby-button"], returnFirstDependency);
define("alphaPicker", [embyWebComponentsBowerPath + "/alphapicker/alphapicker"], returnFirstDependency);
define("paper-icon-button-light", [embyWebComponentsBowerPath + "/emby-button/paper-icon-button-light"]);
@ -2779,7 +2768,7 @@ var AppInfo = {};
defineRoute({
path: '/myprofile.html',
dependencies: ['emby-button', 'emby-collapsible', 'emby-checkbox', 'emby-input'],
dependencies: ['emby-button', 'emby-collapse', 'emby-checkbox', 'emby-input'],
autoFocus: false,
transition: 'fade',
controller: 'scripts/myprofile'

8
dashboard-ui/scripts/sync.js
View file

@ -81,7 +81,7 @@
return new Promise(function (resolve, reject) {
require(['emby-checkbox', 'emby-input', 'emby-collapsible'], function () {
require(['emby-checkbox', 'emby-input', 'emby-collapse'], function () {
appHost.appInfo().then(function (appInfo) {
renderFormInternal(options, appInfo, resolve);
@ -168,8 +168,8 @@
if (dialogOptions.Options.indexOf('SyncNewContent') != -1 ||
dialogOptions.Options.indexOf('ItemLimit') != -1) {
html += '<emby-collapsible title="' + Globalize.translate('HeaderAdvanced') + '">';
html += '<div style="padding:0 0 1em;">';
html += '<div is="emby-collapse" title="' + Globalize.translate('HeaderAdvanced') + '">';
html += '<div class="collapseContent">';
if (dialogOptions.Options.indexOf('SyncNewContent') != -1) {
html += '<br/>';
html += '<div class="checkboxContainer">';
@ -188,7 +188,7 @@
html += '</div>';
}
html += '</div>';
html += '</emby-collapsible>';
html += '</div>';
html += '<br/>';
}