Have HordeCore handle loading of javascript files

horde · Oct 9, 2013 · 69f84ee · 69f84ee
1 parent ea5480e
commit 69f84ee
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/horde/js/topbar.js b/horde/js/topbar.js
@@ -5,7 +5,6 @@ var HordeTopbar = {
 
     // Vars used and defaulting to null/false:
     //   conf, searchGhost
-    jsfiles: $H(),
 
     /**
      * Updates the date in the sub bar.
@@ -33,14 +32,7 @@ var HordeTopbar = {
     onUpdateTopbar: function(r)
     {
         $('horde-navigation').update();
-
         this._renderTree(r.nodes, r.root_nodes);
-        r.files.each(function(file) {
-            if (!this.jsfiles.get(file)) {
-                $$('head')[0].insert(new Element('script', { src: file }));
-                this.jsfiles.set(file, 1);
-            }
-        }.bind(this));
     },
 
     _renderTree: function(nodes, root_nodes)

diff --git a/horde/lib/Ajax/Application/Handler.php b/horde/lib/Ajax/Application/Handler.php
@@ -25,17 +25,30 @@ class Horde_Ajax_Application_Handler extends Horde_Core_Ajax_Application_Handler
     /**
      * AJAX action: Update topbar.
      *
-     * @return object  See Horde_Tree_Renderer_Menu#renderNodeDefinitions().
+     * @return Horde_Core_Ajax_Response_HordeCore  Response object.
      */
     public function topbarUpdate()
     {
-        $GLOBALS['registry']->pushApp($this->vars->app);
-        return $GLOBALS['injector']
-            ->getInstance('Horde_Core_Factory_Topbar')
+        global $injector, $registry;
+
+        $registry->pushApp($this->vars->app);
+        $node_defs = $injector->getInstance('Horde_Core_Factory_Topbar')
             ->create('Horde_Tree_Renderer_Menu', array('nosession' => true))
             ->getTree()
             ->renderNodeDefinitions();
-        $GLOBALS['registry']->popApp();
+        $registry->popApp();
+
+        if (isset($node_defs->files)) {
+            $jsfiles = $node_defs->files;
+            unset($node_defs->files);
+        } else {
+            $jsfiles = array();
+        }
+
+        $ob = new Horde_Core_Ajax_Response_HordeCore($node_defs);
+        $ob->jsfiles = $jsfiles;
+
+        return $ob;
     }
 
     /**

diff --git a/horde/package.xml b/horde/package.xml
@@ -1630,7 +1630,7 @@
    <package>
     <name>Horde_Core</name>
     <channel>pear.horde.org</channel>
-    <min>2.7.0</min>
+    <min>2.10.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>