Fix BackgroundTaskManager initialisation, and make sure to read the n…

…ode_diff message.
pydio · Oct 23, 2015 · c59a8aa · c59a8aa
1 parent c671c55
commit c59a8aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/BackgroundTasksManager.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/BackgroundTasksManager.es6
@@ -101,8 +101,12 @@ class BackgroundTasksManager extends Observable {
 				if(type != 'SUCCESS'){
 					this.interruptOnError(childs[i].firstChild.nodeValue);
 				}
-			}
-			else if(childs[i].nodeName == "trigger_bg_action"){				
+			} else if(childs[i].nodeName == 'nodes_diff') {
+                var dm = this.actionManager.getDataModel();
+                if(dm.getAjxpNodeProvider().parseAjxpNodesDiffs){
+                    dm.getAjxpNodeProvider().parseAjxpNodesDiffs(childs[i], dm, !window.currentLightBox);
+                }
+            } else if(childs[i].nodeName == "trigger_bg_action"){
 				var name = childs[i].getAttribute("name");
 				var messageId = childs[i].getAttribute("messageId");
                 delay = parseInt(childs[i].getAttribute("delay"));

diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6
@@ -118,7 +118,7 @@ class Controller extends Observable{
 
     getBackgroundTasksManager(){
         if(!Controller._bgManager){
-            Controller._bgManager = new BackgroundTasksManager();
+            Controller._bgManager = new BackgroundTasksManager(this);
         }
         return Controller._bgManager;
     }