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

apply suggestion

Browse source
This commit is contained in:
grafixeyehero 2020-06-26 19:30:44 +03:00
parent c5e2bbf87f
commit daedd3a61d
3 changed files with 58 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/components/mediaLibraryCreator/mediaLibraryCreator.js
View file

@ -194,37 +194,35 @@ import 'flexStyles';
}); });
} }
export class editor { export class showEditor {
constructor() { constructor(options) {
this.show = options => { return new Promise((resolve) => {
return new Promise((resolve) => { currentOptions = options;
currentOptions = options; currentResolve = resolve;
currentResolve = resolve; hasChanges = false;
hasChanges = false; import('text!./components/mediaLibraryCreator/mediaLibraryCreator.template.html').then(({default: template}) => {
import('text!./components/mediaLibraryCreator/mediaLibraryCreator.template.html').then(({default: template}) => { const dlg = dialogHelper.createDialog({
const dlg = dialogHelper.createDialog({ size: 'small',
size: 'small', modal: false,
modal: false, removeOnClose: true,
removeOnClose: true, scrollY: false
scrollY: false
});
dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a');
dlg.classList.add('dlg-librarycreator');
dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template);
initEditor(dlg, options.collectionTypeOptions);
dlg.addEventListener('close', onDialogClosed);
dialogHelper.open(dlg);
dlg.querySelector('.btnCancel').addEventListener('click', () => {
dialogHelper.close(dlg);
});
pathInfos = [];
renderPaths(dlg);
initLibraryOptions(dlg);
}); });
dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a');
dlg.classList.add('dlg-librarycreator');
dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template);
initEditor(dlg, options.collectionTypeOptions);
dlg.addEventListener('close', onDialogClosed);
dialogHelper.open(dlg);
dlg.querySelector('.btnCancel').addEventListener('click', () => {
dialogHelper.close(dlg);
});
pathInfos = [];
renderPaths(dlg);
initLibraryOptions(dlg);
}); });
}; });
} }
} }
@ -235,4 +233,4 @@ export class editor {
let isCreating = false; let isCreating = false;
/* eslint-enable indent */ /* eslint-enable indent */
export default editor; export default showEditor;

58
src/components/mediaLibraryEditor/mediaLibraryEditor.js
View file

@ -209,36 +209,34 @@ import 'flexStyles';
currentDeferred.resolveWith(null, [hasChanges]); currentDeferred.resolveWith(null, [hasChanges]);
} }
export class editor { export class showEditor {
constructor() { constructor(options) {
this.show = options => { const deferred = jQuery.Deferred();
const deferred = jQuery.Deferred(); currentOptions = options;
currentOptions = options; currentDeferred = deferred;
currentDeferred = deferred; hasChanges = false;
hasChanges = false; import('text!./components/mediaLibraryEditor/mediaLibraryEditor.template.html').then(({default: template}) => {
import('text!./components/mediaLibraryEditor/mediaLibraryEditor.template.html').then(({default: template}) => { const dlg = dialogHelper.createDialog({
const dlg = dialogHelper.createDialog({ size: 'small',
size: 'small', modal: false,
modal: false, removeOnClose: true,
removeOnClose: true, scrollY: false
scrollY: false
});
dlg.classList.add('dlg-libraryeditor');
dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a');
dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template);
dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name;
initEditor(dlg, options);
dlg.addEventListener('close', onDialogClosed);
dialogHelper.open(dlg);
dlg.querySelector('.btnCancel').addEventListener('click', () => {
dialogHelper.close(dlg);
});
refreshLibraryFromServer(dlg);
}); });
return deferred.promise(); dlg.classList.add('dlg-libraryeditor');
}; dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a');
dlg.classList.add('formDialog');
dlg.innerHTML = globalize.translateDocument(template);
dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.library.Name;
initEditor(dlg, options);
dlg.addEventListener('close', onDialogClosed);
dialogHelper.open(dlg);
dlg.querySelector('.btnCancel').addEventListener('click', () => {
dialogHelper.close(dlg);
});
refreshLibraryFromServer(dlg);
});
return deferred.promise();
} }
} }
@ -248,4 +246,4 @@ export class editor {
let isCreating = false; let isCreating = false;
/* eslint-enable indent */ /* eslint-enable indent */
export default editor; export default showEditor;

4
src/controllers/dashboard/mediaLibrary.js
View file

@ -3,7 +3,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
function addVirtualFolder(page) { function addVirtualFolder(page) {
require(['medialibrarycreator'], function (medialibrarycreator) { require(['medialibrarycreator'], function (medialibrarycreator) {
new medialibrarycreator.default().show({ new medialibrarycreator.showEditor({
collectionTypeOptions: getCollectionTypeOptions().filter(function (f) { collectionTypeOptions: getCollectionTypeOptions().filter(function (f) {
return !f.hidden; return !f.hidden;
}), }),
@ -18,7 +18,7 @@ define(['jQuery', 'apphost', 'scripts/taskbutton', 'loading', 'libraryMenu', 'gl
function editVirtualFolder(page, virtualFolder) { function editVirtualFolder(page, virtualFolder) {
require(['medialibraryeditor'], function (medialibraryeditor) { require(['medialibraryeditor'], function (medialibraryeditor) {
new medialibraryeditor.default().show({ new medialibraryeditor.showEditor({
refresh: shouldRefreshLibraryAfterChanges(page), refresh: shouldRefreshLibraryAfterChanges(page),
library: virtualFolder library: virtualFolder
}).then(function (hasChanges) { }).then(function (hasChanges) {