Changeset 5794

Timestamp:

07/09/2007 09:22:38 PM (18 years ago)

Author:

ryan

Message:

Don't load all includes by default. We have our own script loader. fixes #4512

Location:

trunk/wp-includes

Files:

• js/scriptaculous/scriptaculous.js (modified) (1 diff)
• js/scriptaculous/wp-scriptaculous.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/scriptaculous/scriptaculous.js

@@ -50 +50 @@
       var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
       var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+      if ( includes )
+       includes[1].split(',').each(
        function(include) { Scriptaculous.require(path+include+'.js') });
     });

trunk/wp-includes/js/scriptaculous/wp-scriptaculous.js

@@ -50 +50 @@
       var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
       var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+      if ( includes )
+       includes[1].split(',').each(
        function(include) { Scriptaculous.require(path+include+'.js') });
     });

trunk/wp-includes/script-loader.php

@@ -61 +61 @@
         ) );
 
-        $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.1-b3');
+        $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/scriptaculous.js', array('prototype'), '1.7.1-b3');
         $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.7.1-b3');
         $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.7.1-b3');