[Pkg-owncloud-commits] [owncloud] 210/223: Prevent showing the file picker twice

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 763d9ded1d47612bab6423646c18a214473a72ae
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 20 13:39:46 2014 +0200

    Prevent showing the file picker twice
    
    In case the filepicker function is called twice, only show it once.
---
 core/js/oc-dialogs.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 0e4c346..a76f917 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -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}));
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git