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

remove unused call to hide loading indicator

Browse source
This commit is contained in:
dkanada 2019-05-06 21:26:48 -07:00
parent e833225ab3
commit b41ae5f483
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/medialibrarycreator/medialibrarycreator.js
View file

@ -34,8 +34,8 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
dialogHelper.close(dlg);
}, function() {
require(["toast"], function(toast) {
toast(Globalize.translate("ErrorAddingMediaPathToVirtualFolder"))
})
toast(Globalize.translate("ErrorAddingMediaPathToVirtualFolder"));
});
isCreating = false;
loading.hide();
});
@ -70,7 +70,12 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
$(".collectionTypeFieldDescription", dlg).html(folderOption.message || "")
}
}
}), page.querySelector(".btnAddFolder").addEventListener("click", onAddButtonClick), page.querySelector("form").addEventListener("submit", onSubmit), page.querySelector(".folderList").addEventListener("click", onRemoveClick), page.querySelector(".chkAdvanced").addEventListener("change", onToggleAdvancedChange)
});
page.querySelector(".btnAddFolder").addEventListener("click", onAddButtonClick);
page.querySelector("form").addEventListener("submit", onSubmit);
page.querySelector(".folderList").addEventListener("click", onRemoveClick);
page.querySelector(".chkAdvanced").addEventListener("change", onToggleAdvancedChange);
}
function onToggleAdvancedChange() {
@ -131,9 +136,6 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
}
function onDialogClosed() {
// I can't see any corresponding call to loading.show,
// so I think this is not supposed to be here.
loading.hide();
currentResolve(hasChanges);
}
@ -176,7 +178,7 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
initLibraryOptions(dlg);
};
xhr.send();
})
});
}
}
@ -184,7 +186,7 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
var currentResolve;
var currentOptions;
var hasChanges;
var hasChanges = false;
var isCreating = false;
return editor

3
src/components/medialibraryeditor/medialibraryeditor.js
View file

@ -193,8 +193,9 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra
}
var currentDeferred;
var hasChanges;
var currentOptions;
var hasChanges = false;
return editor;
});