Changeset 18480

Timestamp:

07/28/2011 06:24:00 PM (13 years ago)

Author:

azaozz

Message:

Introduce WP_Dependencies::get_data() method, change scripts and styles priority to follow the "natural" order in HTML, i.e. the last one wins, props scribu, see #11520

Location:

trunk/wp-includes

Files:

• class.wp-dependencies.php (modified) (1 diff)
• class.wp-scripts.php (modified) (4 diffs)
• class.wp-styles.php (modified) (3 diffs)
• functions.wp-scripts.php (modified) (1 diff)
• functions.wp-styles.php (modified) (1 diff)

trunk/wp-includes/class.wp-dependencies.php

@@ -135 +135 @@
      * Adds extra data
      *
-     * Adds data only if script has already been added
+     * Adds data only if script has already been added.
      *
      * @param string $handle Script name
-     * @param string $data_name Name of object in which to store extra data
-     * @param array $data Array of extra data
+     * @param string $key
+     * @param mixed $value
      * @return bool success
      */
-    function add_data( $handle, $data_name, $data ) {
-        if ( !isset($this->registered[$handle]) )
-            return false;
-        return $this->registered[$handle]->add_data( $data_name, $data );
+    function add_data( $handle, $key, $value ) {
+        if ( !isset( $this->registered[$handle] ) )
+            return false;
+
+        return $this->registered[$handle]->add_data( $key, $value );
+    }
+
+    /**
+     * Get extra data
+     *
+     * Gets data associated with a certain handle.
+     *
+     * @since WP 3.3
+     *
+     * @param string $handle Script name
+     * @param string $key
+     * @return mixed
+     */
+    function get_data( $handle, $key ) {
+        if ( !isset( $this->registered[$handle] ) )
+            return false;
+
+        if ( !isset( $this->registered[$handle]->extra[$key] ) )
+            return false;
+
+        return $this->registered[$handle]->extra[$key];
     }
 

trunk/wp-includes/class.wp-scripts.php

@@ -55 +55 @@
 
     function print_script_data( $handle, $echo = true, $_l10n = false ) {
-        if ( empty($this->registered[$handle]->extra['data']) )
-            return false;
-
         if ( $_l10n ) {
-            $name = $this->registered[$handle]->extra['l10n'][0];
-            $data = $this->registered[$handle]->extra['l10n'][1];
+            list( $name, $data ) = $this->get_data( $handle, 'l10n' );
             $after = '';
 
@@ -69 +65 @@
             $output = "var $name = " . json_encode($data) . "; $after\n";
         } else {
-            foreach ( (array) $this->registered[$handle]->extra['data'] as $name => $data ) {
+            $data = $this->get_data( $handle, 'data' );
+
+            if ( empty( $data ) )
+                return false;
+
+            foreach ( (array) $data as $name => $data ) {
                 $output = "var $name = " . json_encode($data) . ";\n";
             }
@@ -143 +144 @@
      * Localizes only if script has already been added
      *
-     * @since 
      * @deprecated WP 3.3
      */
@@ -158 +158 @@
      * @param string $handle Script name
      * @param string $name Name of JS object to hold the data
-     * @param array $data Associative array of JS name => value
+     * @param array $args Associative array of JS object attributes
      * @return bool Successful or not
      */
-    function add_script_data( $handle, $name, $data ) {
-        if ( !$name || !is_array($data) )
-            return false;
-
-        if ( !empty( $this->registered[$handle]->extra['data'][$name] ) )
-            $data = array_merge( $data, (array) $this->registered[$handle]->extra['data'][$name] );
-
-        return $this->add_data( $handle, 'data', array( $name => $data ) );
+    function add_script_data( $handle, $name, $args ) {
+        if ( !$name || !is_array( $args ) )
+            return false;
+
+        $data = $this->get_data( $handle, 'data' );
+
+        if ( !empty( $data[$name] ) )
+            $args = array_merge( $data[$name], $args );
+
+        return $this->add_data( $handle, 'data', array( $name => $args ) );
     }
 
     function set_group( $handle, $recursion, $group = false ) {
-        $grp = isset($this->registered[$handle]->extra['group']) ? (int) $this->registered[$handle]->extra['group'] : 0;
+        $grp = (int) $this->get_data( $handle, 'group' );
+
         if ( false !== $group && $grp > $group )
             $grp = $group;

trunk/wp-includes/class.wp-styles.php

@@ -47 +47 @@
 
         if ( $this->do_concat ) {
-            if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+            if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
                 $this->concat .= "$handle,";
                 $this->concat_version .= "$handle$ver";
 
-                if ( !empty($this->registered[$handle]->extra['data']) )
-                    $this->print_code .= $this->registered[$handle]->extra['data'];
+                $this->print_code .= $this->get_data( $handle, 'after' );
 
                 return true;
@@ -98 +97 @@
     }
 
-    function add_inline_style( $handle, $data ) {
-        if ( !$data )
+    function add_inline_style( $handle, $code ) {
+        if ( !$code )
             return false;
 
-        if ( !empty( $this->registered[$handle]->extra['data'] ) )
-            $data .= "\n" . $this->registered[$handle]->extra['data'];
+        $after = $this->get_data( $handle, 'after' );
+        if ( !$after )
+            $after = array();
 
-        return $this->add_data( $handle, 'data', $data );
+        $after[] = $code;
+
+        return $this->add_data( $handle, 'after', $after );
     }
 
     function print_inline_style( $handle, $echo = true ) {
-        if ( empty($this->registered[$handle]->extra['data']) )
+        $output = $this->get_data( $handle, 'after' );
+
+        if ( empty( $output ) )
             return false;
 
-        $output = $this->registered[$handle]->extra['data'];
+        $output = implode( "\n", $output );
 
         if ( !$echo )
@@ -152 +156 @@
         return false;
     }
-    
+
     function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
         $this->do_items(false, 1);

trunk/wp-includes/functions.wp-scripts.php

@@ -67 +67 @@
  * }
  * The $name is passed directly so it should be qualified JS variable /[a-zA-Z0-9_]+/
- * The $data array is JSON encoded. If called more than once for the same $handle, with the same $name,
+ * The $data array is JSON encoded. If called more than once for the same $handle with the same $name,
  * the object would contain all values. In that case if two or more keys are the same,
- * the first value is kept and subsequent values are ignored.
+ * the last value overwrites the previous.
  * 
  * @since 3.3

trunk/wp-includes/functions.wp-styles.php

@@ -38 +38 @@
  *
  * Works only if the stylesheet has already been added.
- * Accepts a string $data containing the CSS.
+ * Accepts a string $data containing the CSS. If two or more CSS code blocks are
+ * added to the same stylesheet $handle, they will be printed in the order
+ * they were added, i.e. the latter added styles can redeclare the previous.
  * 
  * @since 3.3