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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Eric Reed 2013-11-07 12:27:21 -05:00
commit a96eeb0e76
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/edititemmetadata.html
View file

@ -326,7 +326,7 @@
</div> </div>
<ul id="ulSave" data-role="listview" class="ulForm" style="display: none;"> <ul id="ulSave" data-role="listview" class="ulForm" style="display: none;">
<li> <li>
<button type="submit" data-theme="b" data-icon="ok"> <button id="btnSave" type="submit" data-theme="b" data-icon="ok">
Save Save
</button> </button>
</li> </li>

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

@ -749,7 +749,7 @@
if (chapter.ImageTag) { if (chapter.ImageTag) {
imgUrl = ApiClient.getImageUrl(item.Id, { imgUrl = ApiClient.getImageUrl(item.Id, {
width: 400, maxwidth: 400,
tag: chapter.ImageTag, tag: chapter.ImageTag,
type: "Chapter", type: "Chapter",
index: i index: i

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

@ -351,6 +351,7 @@
$('#btnRefresh', page).button('enable'); $('#btnRefresh', page).button('enable');
$('#btnDelete', page).button('enable'); $('#btnDelete', page).button('enable');
$('#btnSave', page).button('enable');
$('#refreshLoading', page).hide(); $('#refreshLoading', page).hide();
@ -1193,6 +1194,7 @@
$('#btnDelete', page).button('disable'); $('#btnDelete', page).button('disable');
$('#btnRefresh', page).button('disable'); $('#btnRefresh', page).button('disable');
$('#btnSave', page).button('disable');
$('#refreshLoading', page).show(); $('#refreshLoading', page).show();
@ -1237,13 +1239,18 @@
$('#btnDelete', page).button('disable'); $('#btnDelete', page).button('disable');
$('#btnRefresh', page).button('disable'); $('#btnRefresh', page).button('disable');
$('#btnSave', page).button('disable');
$('#refreshLoading', page).show(); $('#refreshLoading', page).show();
var parentId = currentItem.ParentId;
ApiClient.deleteItem(currentItem.Id).done(function () { ApiClient.deleteItem(currentItem.Id).done(function () {
Dashboard.navigate('edititemmetadata.html?id=' + currentItem.ParentId); var elem = $('#' + parentId)[0];
$('.libraryTree').jstree("select_node", elem, true)
.jstree("delete_node", '#' + currentItem.Id);
}); });
} }

10
dashboard-ui/scripts/librarybrowser.js
View file

@ -20,14 +20,14 @@
loadSavedQueryValues: function (key, query) { loadSavedQueryValues: function (key, query) {
var values = localStorage.getItem(key + '_' + Dashboard.getCurrentUserId()); //var values = localStorage.getItem(key + '_' + Dashboard.getCurrentUserId());
if (values) { //if (values) {
values = JSON.parse(values); // values = JSON.parse(values);
return $.extend(query, values); // return $.extend(query, values);
} //}
return query; return query;
}, },