Move loadActionsFromRegistry()

pydio · May 7, 2015 · 696aa92 · 696aa92
1 parent 56dfeba
commit 696aa92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/core/Pydio.js b/core/src/plugins/gui.ajax/res/js/core/Pydio.js
@@ -86,9 +86,6 @@ var Pydio = (function (_Observable) {
         }
 
         this.observe('registry_loaded', (function () {
-            // TODO: CAN WE REMOVE THIS? IT IS TRIGGERED TWO TIMES (in PydioUI).
-            this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
-            // END
             this.Registry.refreshExtensionsRegistry();
             this.Registry.logXmlUser(false);
             if (this.user) {
@@ -100,10 +97,12 @@ var Pydio = (function (_Observable) {
             if (this.UI.guiLoaded) {
                 this.UI.refreshTemplateParts();
                 this.Registry.refreshExtensionsRegistry();
+                this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
             } else {
                 this.observe('gui_loaded', (function () {
                     this.UI.refreshTemplateParts();
                     this.Registry.refreshExtensionsRegistry();
+                    this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
                 }).bind(this));
             }
             this.loadActiveRepository();

diff --git a/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6 b/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6
@@ -75,9 +75,6 @@ class Pydio extends Observable{
         }
 
         this.observe("registry_loaded", function(){
-            // TODO: CAN WE REMOVE THIS? IT IS TRIGGERED TWO TIMES (in PydioUI).
-            this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
-            // END
             this.Registry.refreshExtensionsRegistry();
             this.Registry.logXmlUser(false);
             if(this.user){
@@ -89,10 +86,12 @@ class Pydio extends Observable{
             if(this.UI.guiLoaded) {
                 this.UI.refreshTemplateParts();
                 this.Registry.refreshExtensionsRegistry();
+                this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
             } else {
                 this.observe("gui_loaded", function(){
                     this.UI.refreshTemplateParts();
                     this.Registry.refreshExtensionsRegistry();
+                    this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
                 }.bind(this));
             }
             this.loadActiveRepository();