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 fixes

Browse source
This commit is contained in:
softworkz 2016-02-05 03:01:03 +01:00
parent a252b74db2
commit 15a66799a8
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/autoorganizesmart.html
View file

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title> <title>${TitleAutoOrganize}</title>
</head> </head>
<body> <body>
<div id="libraryFileOrganizerSmartMatchPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizesmart,scripts/taskbutton,paperbuttonstyle,detailtablecss"> <div id="libraryFileOrganizerSmartMatchPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizesmart,scripts/taskbutton,detailtablecss">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

20
dashboard-ui/scripts/autoorganizesmart.js
View file

@ -12,14 +12,15 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
ApiClient.getSmartMatchInfos(query).done(function (infos) { ApiClient.getSmartMatchInfos(query).then(function (infos) {
currentResult = infos; currentResult = infos;
populateList(page, infos); populateList(page, infos);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); }, onApiFailure);
} }
function populateList(page, result) { function populateList(page, result) {
@ -86,6 +87,15 @@
$('.divMatchInfos', page).html(html).trigger('create'); $('.divMatchInfos', page).html(html).trigger('create');
} }
function onApiFailure(e) {
Dashboard.hideLoadingMsg();
Dashboard.alert({
title: Globalize.translate('AutoOrganizeError'),
message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.getResponseHeader("X-Application-Error-Code"))
});
}
$(document).on('pageinit', "#libraryFileOrganizerSmartMatchPage", function () { $(document).on('pageinit', "#libraryFileOrganizerSmartMatchPage", function () {
@ -101,15 +111,15 @@
MatchString: button.getAttribute('data-matchstring') MatchString: button.getAttribute('data-matchstring')
}; };
ApiClient.deleteSmartMatchEntry(id, options).done(function () { ApiClient.deleteSmartMatchEntry(id, options).then(function () {
reloadList(page); reloadList(page);
}); }, onApiFailure);
}); });
}).on('pageshowready', "#libraryFileOrganizerSmartMatchPage", function () { }).on('pageshow', "#libraryFileOrganizerSmartMatchPage", function () {
var page = this; var page = this;