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

fix metadata sidebar for IE

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-02 12:57:54 -04:00
parent 61cdab9bd1
commit a43b91f49c
3 changed files with 38 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/edititemmetadata.html
View file

@ -14,7 +14,7 @@
<div class="editPageInnerContent" style="visibility:hidden;"> <div class="editPageInnerContent" style="visibility:hidden;">
<h1 class="itemName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<paper-tabs hidescrollbuttons noink> <paper-tabs hidescrollbuttons>
<paper-tab class="metadataTabButton">${TabMetadata}</paper-tab> <paper-tab class="metadataTabButton">${TabMetadata}</paper-tab>
<paper-tab class="subtitleTabButton hide">${TabSubtitles}</paper-tab> <paper-tab class="subtitleTabButton hide">${TabSubtitles}</paper-tab>
<paper-tab class="collectionItemsTabButton hide">${TabCollectionTitles}</paper-tab> <paper-tab class="collectionItemsTabButton hide">${TabCollectionTitles}</paper-tab>

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

@ -12,8 +12,8 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var promise1 = MetadataEditor.getItemPromise(); var promise1 = MetadataEditor.getItemPromise();
var promise2 = MetadataEditor.currentItemId ? var promise2 = MetadataEditor.getCurrentItemId() ?
ApiClient.getJSON(ApiClient.getUrl('Items/' + MetadataEditor.currentItemId + '/MetadataEditor')) : ApiClient.getJSON(ApiClient.getUrl('Items/' + MetadataEditor.getCurrentItemId() + '/MetadataEditor')) :
{}; {};
$.when(promise1, promise2).done(function (response1, response2) { $.when(promise1, promise2).done(function (response1, response2) {
@ -1455,8 +1455,6 @@
if (data.id != currentItem.Id) { if (data.id != currentItem.Id) {
MetadataEditor.currentItemId = data.id;
MetadataEditor.currentItemType = data.itemType;
//Dashboard.navigate('edititemmetadata.html?id=' + data.id); //Dashboard.navigate('edititemmetadata.html?id=' + data.id);
//$.mobile.urlHistory.ignoreNextHashChange = true; //$.mobile.urlHistory.ignoreNextHashChange = true;
@ -1481,7 +1479,12 @@
configurePaperLibraryTabs(page, tabs); configurePaperLibraryTabs(page, tabs);
$(tabs).on('iron-select', function () { $(tabs).on('iron-select', function () {
Events.trigger(this, 'tabchange');
var self = this;
setTimeout(function () {
Events.trigger(self, 'tabchange');
}, 400);
}).on('tabchange', function () { }).on('tabchange', function () {
var selected = this.selected; var selected = this.selected;
@ -1519,7 +1522,9 @@
tabs.hideScrollButtons = true; tabs.hideScrollButtons = true;
tabs.noSlide = true; tabs.noSlide = true;
tabs.noink = true;
// Unfortunately we can't disable this because it causes iron-select to not fire in IE and Safari.
//tabs.noink = true;
$(ownerpage).on('pageshowready', function () { $(ownerpage).on('pageshowready', function () {

79
dashboard-ui/scripts/editorsidebar.js
View file

@ -262,9 +262,23 @@
} }
} }
function loadJsTree() {
var deferred = DeferredBuilder.Deferred();
require([
'bower_components/jstree/dist/jstree.min'
], function () {
Dashboard.importCss('thirdparty/jstree/themes/default/style.min.css');
deferred.resolve();
});
return deferred.promise();
}
function initializeTree(page, currentUser, openItems, selectedId) { function initializeTree(page, currentUser, openItems, selectedId) {
MetadataEditor.loadJsTree().done(function () { loadJsTree().done(function () {
initializeTreeInternal(page, currentUser, openItems, selectedId); initializeTreeInternal(page, currentUser, openItems, selectedId);
}); });
} }
@ -403,7 +417,6 @@
}).on('pagebeforeshow', ".metadataEditorPage", function () { }).on('pagebeforeshow', ".metadataEditorPage", function () {
Dashboard.importCss('css/metadataeditor.css'); Dashboard.importCss('css/metadataeditor.css');
window.MetadataEditor = new metadataEditor();
}).on('pagebeforeshow', ".metadataEditorPage", function () { }).on('pagebeforeshow', ".metadataEditorPage", function () {
@ -411,7 +424,7 @@
Dashboard.getCurrentUser().done(function (user) { Dashboard.getCurrentUser().done(function (user) {
var id = MetadataEditor.currentItemId; var id = getCurrentItemId();
if (id) { if (id) {
@ -438,64 +451,24 @@
}); });
function metadataEditor() { function getCurrentItemId() {
var self = this; var url = window.location.hash || getWindowUrl();
function ensureInitialValues() { return getParameterByName('id', url);
}
if (self.currentItemType || self.currentItemId) { window.MetadataEditor = {
return; getItemPromise: function() {
} var currentItemId = getCurrentItemId();
var url = window.location.hash || getWindowUrl();
var id = getParameterByName('id', url);
if (id) {
self.currentItemId = id;
self.currentItemType = null;
}
};
self.getItemPromise = function () {
var currentItemType = self.currentItemType;
var currentItemId = self.currentItemId;
if (currentItemType == "TvChannel") {
return ApiClient.getLiveTvChannel(currentItemId);
}
if (currentItemId) { if (currentItemId) {
return ApiClient.getItem(Dashboard.getCurrentUserId(), currentItemId); return ApiClient.getItem(Dashboard.getCurrentUserId(), currentItemId);
} }
return ApiClient.getRootFolder(Dashboard.getCurrentUserId()); return ApiClient.getRootFolder(Dashboard.getCurrentUserId());
}; },
getCurrentItemId: getCurrentItemId
self.getEditQueryString = function (item) { };
var query = "id=" + item.Id;
return query;
};
self.loadJsTree = function () {
var deferred = DeferredBuilder.Deferred();
require([
'bower_components/jstree/dist/jstree.min'
], function () {
Dashboard.importCss('thirdparty/jstree/themes/default/style.min.css');
deferred.resolve();
});
return deferred.promise();
};
ensureInitialValues();
}
})(jQuery, document, window); })(jQuery, document, window);