milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update image editor

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-17 13:32:39 -04:00
parent 1bb7d85b87
commit c5bfd529a2
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dashboard-ui/components/imagedownloader/imagedownloader.js
View file

@ -1,10 +1,11 @@
(function ($, window, document) { (function ($, window, document) {
var currentItemId; var currentItemId;
var currentItemType;
var currentDeferred; var currentDeferred;
var hasChanges = false; var hasChanges = false;
var browsableImagePageSize = 10; var browsableImagePageSize = 20;
var browsableImageStartIndex = 0; var browsableImageStartIndex = 0;
var browsableImageType = 'Primary'; var browsableImageType = 'Primary';
var selectedProvider; var selectedProvider;
@ -152,10 +153,10 @@
} }
else { else {
if (currentItem.Type == "Episode") { if (currentItemType == "Episode") {
cssClass += " remoteBackdropImage"; cssClass += " remoteBackdropImage";
} }
else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist") { else if (currentItemType == "MusicAlbum" || currentItemType == "MusicArtist") {
cssClass += " remoteDiscImage"; cssClass += " remoteDiscImage";
} }
else { else {
@ -252,7 +253,7 @@
}); });
} }
function showEditor(itemId) { function showEditor(itemId, itemType) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -264,6 +265,7 @@
}).done(function (template) { }).done(function (template) {
currentItemId = itemId; currentItemId = itemId;
currentItemType = itemType;
var dlg = document.createElement('paper-dialog'); var dlg = document.createElement('paper-dialog');
@ -316,20 +318,19 @@
} }
window.ImageDownloader = { window.ImageDownloader = {
show: function (itemId, imageType) { show: function (itemId, itemType, imageType) {
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
currentDeferred = deferred; currentDeferred = deferred;
hasChanges = false; hasChanges = false;
browsableImagePageSize = 10;
browsableImageStartIndex = 0; browsableImageStartIndex = 0;
browsableImageType = imageType || 'Primary'; browsableImageType = imageType || 'Primary';
selectedProvider = null; selectedProvider = null;
require(['components/paperdialoghelper'], function () { require(['components/paperdialoghelper'], function () {
showEditor(itemId); showEditor(itemId, itemType);
}); });
return deferred.promise(); return deferred.promise();
} }

4
dashboard-ui/components/imagedownloader/imagedownloader.template.html
View file

@ -7,10 +7,10 @@
<option value="">${OptionAll}</option> <option value="">${OptionAll}</option>
</select> </select>
</div> </div>
<div style="margin: 0; display: inline-block;"> <div style="margin-left:1em; display: inline-block;">
<label for="selectBrowsableImageType">${LabelImage}</label> <label for="selectBrowsableImageType">${LabelImage}</label>
</div> </div>
<div style="margin: 0; display: inline-block;"> <div style="display: inline-block;">
<select id="selectBrowsableImageType" name="selectBrowsableImageType" data-mini="true" data-inline="true"> <select id="selectBrowsableImageType" name="selectBrowsableImageType" data-mini="true" data-inline="true">
<option value="Primary">${OptionPrimary}</option> <option value="Primary">${OptionPrimary}</option>
<option value="Art">${OptionArt}</option> <option value="Art">${OptionArt}</option>

2
dashboard-ui/components/imageeditor/imageeditor.js
View file

@ -185,7 +185,7 @@
function showImageDownloader(page, imageType) { function showImageDownloader(page, imageType) {
require(['components/imagedownloader/imagedownloader'], function () { require(['components/imagedownloader/imagedownloader'], function () {
ImageDownloader.show(currentItem.Id, imageType).done(function (hasChanges) { ImageDownloader.show(currentItem.Id, currentItem.Type, imageType).done(function (hasChanges) {
if (hasChanges) { if (hasChanges) {
reload(page); reload(page);

2
dashboard-ui/css/metadataeditor.css
View file

@ -49,7 +49,7 @@
.remoteImageDetails paper-icon-button { .remoteImageDetails paper-icon-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 5px; right: 0;
} }
.remoteImageDetailText { .remoteImageDetailText {