Changeset 939811

Timestamp:

06/27/2014 07:26:25 PM (12 years ago)

Author:

timmcdaniels

Message:

version 1.9

Location:

combine-js

Files:

• tags/1.9 (added)
• tags/1.9/classes (added)
• tags/1.9/classes/combine-js-class.php (added)
• tags/1.9/classes/jsmin.php (added)
• tags/1.9/combine-js.php (added)
• tags/1.9/js.php (added)
• tags/1.9/lang (added)
• tags/1.9/readme.txt (added)
• tags/1.9/screenshot-1.png (added)
• tags/1.9/views (added)
• tags/1.9/views/admin_settings_form.php (added)
• trunk/classes/combine-js-class.php (modified) (7 diffs)
• trunk/combine-js.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

combine-js/trunk/classes/combine-js-class.php

@@ -8 +8 @@
     const nspace = 'combine-js';
     const pname = 'Combine JS';
-    const version = 1.8;
+    const version = 1.9;
 
     protected $_plugin_file;
@@ -30 +30 @@
     var $settings_data = array();
     var $js_files_ignore = array( 'admin-bar.js', 'admin-bar.min.js' );
+
     var $js_handles_found = array();
+    var $js_handles_count_first = 0;
+    var $js_handles_count_last = 0;
+    var $js_handles_order = array();
     var $js_footer_handles_found = array();
-    var $debug = false;
     var $footer = false;
-    var $move_to_footer_top = array();
-    var $move_to_footer_bottom = array();
+    var $move_to_footer = array();
+
     var $combined = false;
     var $paths_set = false;
+    var $debug = false;
 
     /**
@@ -281 +285 @@
 
         global $wp_scripts;
+        $handle_count = 0;
         foreach ( $to_do as $key => $handle ) {
+
+            // keep order of all handles
+
+            $this->js_handles_order[$handle] = $handle_count++;
 
             // keep track of footer files
@@ -322 +331 @@
                 $this->js_handles_found[$handle] = $js_src;
                 unset( $to_do[$key] );
+                if ( ! $this->js_handles_count_first ) $this->js_handles_count_first = $handle_count;
+                $this->js_handles_count_last = $handle_count;
             }
             elseif ( $this->footer && @strlen( $wp_scripts->registered[$handle]->src ) ) {
@@ -327 +338 @@
                 // keep track of external and/or ignored js files to move to footer
 
-                if ( array_keys( $this->js_handles_found ) ) $this->move_to_footer_bottom[$handle] = $wp_scripts->registered[$handle]->src;
-                else $this->move_to_footer_top[$handle] = $wp_scripts->registered[$handle]->src;
+                $this->move_to_footer[$handle] = $wp_scripts->registered[$handle]->src;
             }
         }
@@ -623 +633 @@
         }
 
-        foreach ( $this->move_to_footer_top as $handle => $src ) {
+        // if move to footer set to yes,
+        // figure out what js should be above or below our combined file
+
+        $top = $bottom = array();
+        if ( $this->footer && array_keys( $this->move_to_footer ) ) {
+            foreach ( $this->move_to_footer as $handle => $src ) {
+                if ( $this->js_handles_order[$handle] < $this->js_handles_count_first ) $top[$handle] = $src;
+                else $bottom[$handle] = $src;
+            }
+        }
+
+        // add js above combined file
+
+        foreach ( $top as $handle => $src ) {
             echo "\t\t" . '<script type="text/javascript" src="' . $src . '"></script>' . "\n";
         }
@@ -635 +658 @@
         }
 
-        foreach ( $this->move_to_footer_bottom as $handle => $src ) {
+        // add js below combined file
+
+        foreach ( $bottom as $handle => $src ) {
             echo "\t\t" . '<script type="text/javascript" src="' . $src . '"></script>' . "\n";
         }

combine-js/trunk/combine-js.php

@@ -5 +5 @@
 Description: WordPress plugin that attempts to combine, minify, and compress JS.
 Author: Convoy
-Version: 1.8
+Version: 1.9
 Author URI: http://www.weareconvoy.com
 Requires at least: 3.0.0

combine-js/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 3.9.1
-Stable tag: 1.8
+Stable tag: 1.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -38 +38 @@
 
 == Changelog ==
+
+= 1.9 =
+* Continued improving of javascript ordering when "Move all JS to footer?" is set to yes.
 
 = 1.8 =