Changeset 2867

Timestamp:

11/24/08 06:27:53 (7 weeks ago)

Author:

ringmaster

Message:

Stack dependencies are now sorted after the fact, so you can call Stack::add() and set a value for $after when the thing that it's after hasn't yet been added. This accounts for script dependencies and variable load orders in plugins with a more reliable dependency loading order than mere insertion.

Location:

trunk/htdocs/system/classes

Files:

• adminhandler.php (modified) (2 diffs)
• stack.php (modified) (5 diffs)

trunk/htdocs/system/classes/adminhandler.php

@@ -2241 +2241 @@
             return Session::messages_get( true, 'array' );
         }
-                        
+
         if(isset($handler_vars['PasswordDigest']) || isset($handler_vars['digest'])) {
-            
+
             if(( isset($handler_vars['action']) && $handler_vars['action'] == 'add') || isset($handler_vars['newgroup'])) {
                 if(isset($handler_vars['newgroup'])) {
@@ -2717 +2717 @@
     public static function setup_stacks() {
         Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.js", 'jquery' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.core.js", 'ui.core' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.slider.js", 'ui.slider' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.tabs.js", 'ui.tabs' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.sortable.js", 'ui.sortable' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.resizable.js", 'ui.resizable' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.spinner.js", 'jquery.spinner' );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.color.js", 'jquery.color' );
-        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/humanmsg/humanmsg.js", 'humanmsg' );
-        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/hotkeys/jquery.hotkeys.js", 'jquery.hotkeys' );
-        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/media.js", 'media' );
-        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/admin.js", 'admin' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.core.js", 'ui.core', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.slider.js", 'ui.slider', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.tabs.js", 'ui.tabs', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.sortable.js", 'ui.sortable', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.resizable.js", 'ui.resizable', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.spinner.js", 'jquery.spinner', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.color.js", 'jquery.color', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/humanmsg/humanmsg.js", 'humanmsg', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/hotkeys/jquery.hotkeys.js", 'jquery.hotkeys', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/media.js", 'media', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/admin.js", 'admin', 'jquery' );
     }
 }

trunk/htdocs/system/classes/stack.php

@@ -28 +28 @@
 {
     private static $stacks = array();
+    private static $stack_sort = array();
+    private static $sorting;
 
     /**
@@ -112 +114 @@
             $stack = array();
             self::$stacks[$stack_name] = $stack;
+            self::$stack_sort[$stack_name] = array();
         }
         return self::$stacks[$stack_name];
@@ -132 +135 @@
                 $after = array($after);
             }
-            $newstack = array();
-            foreach($stack as $k => $v) {
-                $newstack[$k] = $v;
-                $inserted = false;
-                if(in_array($k, $after)) {
-                    unset($after[array_search($k, $after)]);
-                    if(count($after) == 0) {
-                        $newstack[$value_name] = $value;
-                        $inserted = true;
-                    }
+            foreach($after as $a) {
+                if(!isset(self::$stack_sort[$stack_name])) {
+                    self::$stack_sort[$stack_name] = array();
                 }
-            }
-            if(!$inserted) {
-                $newstack[$value_name] = $value;
-            }
-            $stack = $newstack;
-        }
-        else {
-            $stack[$value_name]= $value;
-        }
+                if(!isset(self::$stack_sort[$stack_name][$a])) {
+                    self::$stack_sort[$stack_name][$a] = array();
+                }
+                self::$stack_sort[$stack_name][$a][$value_name] = $value_name;
+            }
+        }
+        $stack[$value_name]= $value;
         self::$stacks[$stack_name]= $stack;
         return $stack;
@@ -172 +166 @@
     }
 
+    public static function get_sorted_stack( $stack_name )
+    {
+        self::$sorting = $stack_name;
+        $stack = self::get_named_stack($stack_name);
+
+        uksort($stack, array('Stack', 'sort_stack_cmp'));
+        return $stack;
+    }
+
+    public static function sort_stack_cmp( $a, $b )
+    {
+        $aa = isset(self::$stack_sort[self::$sorting][$a]) ? self::$stack_sort[self::$sorting][$a] : array();
+        $ba = isset(self::$stack_sort[self::$sorting][$b]) ? self::$stack_sort[self::$sorting][$b] : array();
+        $acb = isset($aa[$b]);
+        $bca = isset($ba[$a]);
+        $ac = count($aa);
+        $bc = count($ba);
+        if(($acb && $bca) || !($acb || $bca)) {
+            if($ac == $bc) {
+                return 0;
+            }
+            return $ac > $bc ? -1 : 1;
+        }
+        elseif($acb) {
+            return -1;
+        }
+        elseif($bca) {
+            return 1;
+        }
+    }
+
     /**
      * Returns all of the values of the stack
@@ -180 +205 @@
     {
         $out = '';
-        $stack = self::get_named_stack( $stack_name );
+        $stack = self::get_sorted_stack( $stack_name );
         $stack = Plugins::filter( 'stack_out', $stack, $stack_name );
         foreach( $stack as $element ) {