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

move tv data

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-29 12:29:06 -04:00
parent 09c7da7d48
commit 68e71b78db
17 changed files with 121 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -267,16 +267,14 @@
var editorContent = dlg.querySelector('.editorContent');
reload(editorContent, item);
$('.btnCloseDialog', dlg).on('click', closeDialog);
$('.btnCloseDialog', dlg).on('click', function() {
PaperDialogHelper.close(dlg);
});
});
});
}
function closeDialog() {
history.back();
}
function onDialogClosed() {
$(this).remove();

10
dashboard-ui/components/imageuploader/imageuploader.js
View file

@ -170,15 +170,13 @@
var editorContent = dlg.querySelector('.editorContent');
initEditor(editorContent);
$('.btnCloseDialog', dlg).on('click', closeDialog);
$('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
});
}
function closeDialog() {
history.back();
}
function onDialogClosed() {
$(this).remove();

10
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -85,16 +85,14 @@
var editorContent = dlg.querySelector('.editorContent');
reload(editorContent, item);
$('.btnCloseDialog', dlg).on('click', closeDialog);
$('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
});
});
}
function closeDialog() {
history.back();
}
function onDialogClosed() {
$(this).remove();

35
dashboard-ui/components/paperdialoghelper.js
View file

@ -26,10 +26,12 @@
}
dlg = null;
$(window).off('navigate', onHashChange);
if (enableHashChange()) {
$(window).off('navigate', onHashChange);
if (window.location.hash == '#' + hash) {
history.back();
if (window.location.hash == '#' + hash) {
history.back();
}
}
}
@ -42,9 +44,20 @@
Dashboard.onPopupOpen();
}
window.location.hash = hash;
if (enableHashChange()) {
$(window).on('navigate', onHashChange);
window.location.hash = hash;
$(window).on('navigate', onHashChange);
}
}
function enableHashChange() {
// It's not firing popstate in response to hashbang changes
if ($.browser.msie) {
return false;
}
return true;
}
function openWithHash(dlg, hash, lockDocumentScroll) {
@ -52,8 +65,18 @@
new paperDialogHashHandler(dlg, hash, lockDocumentScroll);
}
function close(dlg) {
if (enableHashChange()) {
history.back();
} else {
dlg.close();
}
}
globalScope.PaperDialogHelper = {
openWithHash: openWithHash
openWithHash: openWithHash,
close: close
};
})(this);

10
dashboard-ui/components/subtitleeditor/subtitleeditor.js
View file

@ -377,16 +377,14 @@
fillLanguages(editorContent, languages);
});
$('.btnCloseDialog', dlg).on('click', closeDialog);
$('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
});
});
}
function closeDialog() {
history.back();
}
function onDialogClosed() {
$(this).remove();