Fix #261

pydio · Dec 16, 2013 · 8416302 · 8416302
1 parent 6bc96c7
commit 8416302
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActivityMonitor.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActivityMonitor.js
@@ -91,7 +91,10 @@ Class.create("ActivityMonitor", {
 	/**
 	 * Listener to clear the timer 
 	 */
-	activityObserver : function(){
+	activityObserver : function(event){
+        if(event && event.memo && event.memo.discrete){
+            return;
+        }
 		if(this._state == 'warning') return;
 		if(this.timer){
 			window.clearTimeout(this.timer);

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Connexion.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Connexion.js
@@ -197,7 +197,7 @@ Class.create("Connexion", {
 		if(this.onComplete){
 			this.onComplete(transport);
 		}
-		document.fire("ajaxplorer:server_answer");
+		document.fire("ajaxplorer:server_answer", this);
 	},
 
 	/**

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js