wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9121 from owncloud/filepicker-avoidtwice

Browse source 
Prevent showing the file picker twice
This commit is contained in:
Morris Jobke 2014-06-20 22:41:57 +02:00
commit 1f17814e40
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/js/oc-dialogs.js
View file

@ -144,7 +144,13 @@ var OCdialogs = {
*/
filepicker:function(title, callback, multiselect, mimetypeFilter, modal) {
var self = this;
// avoid opening the picker twice
if (this.filepicker.loading) {
return;
}
this.filepicker.loading = true;
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false;
var dialogName = 'oc-dialog-filepicker-content';
if(self.$filePicker) {
self.$filePicker.ocdialog('close');
@ -220,6 +226,7 @@ var OCdialogs = {
.fail(function(status, error) {
// If the method is called while navigating away
// from the page, it is probably not needed ;)
self.filepicker.loading = false;
if(status !== 0) {
alert(t('core', 'Error loading file picker template: {error}', {error: error}));
}