Changeset 472089

Timestamp:

12/07/2011 04:48:04 PM (14 years ago)

Author:

sivel

Message:

Updates for WP 3.3, for where to enqueue and register scripts at.

Location:

shadowbox-js/trunk

Files:

• inc/frontend.php (modified) (7 diffs)
• shadowbox-js.php (modified) (3 diffs)
• shadowbox-title-push.php (modified) (1 diff)

shadowbox-js/trunk/inc/frontend.php

@@ -33 +33 @@
         // This allows for selecting to delete options from the admin page
         if ( ! empty ( $this->options ) ) {
-            add_action ( 'plugins_loaded' , array ( &$this , 'styles' ) , 7 );
-            add_action ( 'plugins_loaded' , array ( &$this , 'scripts' ) , 8 );
+            add_action ( 'init' , array ( &$this , 'styles' ) , 7 );
+            add_action ( 'init' , array ( &$this , 'scripts' ) , 8 );
             if ( $this->get_option ( 'smartLoad' ) == 'false' )
-                add_action ( 'wp_footer' , array ( &$this , 'configure' ) , 11 );
+                add_action ( 'wp_footer' , array ( &$this , 'configure' ) , 21 );
 
             // Automatically add Shadowbox to links
@@ -72 +72 @@
                 $posts[$i]->post_content = $this->add_attr_to_link ( $posts[$i]->post_content , $posts[$i] );
                 if ( preg_match ( '%(?<!\[)\[gallery[ \]]%i', $posts[$i]->post_content ) && $this->get_option ( 'smartLoad' ) == 'true' )
-                    $this->possibly_enqueue ( 'shadowbox' );
+                    add_action( 'wp_enqueue_scripts', array( &$this, 'possibly_enqueue' ) );
                 if ( ! empty ( $posts[$i]->post_excerpt ) ) {
                     $posts[$i]->post_excerpt = $this->add_attr_to_link ( $posts[$i]->post_excerpt , $posts[$i] );
                     if ( preg_match ( '%(?<!\[)\[gallery[ \]]%i', $posts[$i]->post_excerpt ) && $this->get_option ( 'smartLoad' ) == 'true' )
-                        $this->possibly_enqueue ( 'shadowbox' );
+                        add_action( 'wp_enqueue_scripts', array( &$this, 'possibly_enqueue' ) );
                 }
             }
@@ -150 +150 @@
             $shadowbox = $shadowbox_url;
         } else {
-            $shadowbox = add_query_arg ( array ( 'action' => 'shadowboxjs' , 'cache' => $md5) , admin_url ( 'admin-ajax.php' , $scheme ) );
+            $shadowbox = add_query_arg ( array ( 'action' => 'shadowboxjs' , 'cache' => $md5 ) , admin_url ( 'admin-ajax.php' , $scheme ) );
         }
 
@@ -170 +170 @@
      * @since 3.0.0.0
      */
-    function possibly_enqueue ( $script ) {
+    function possibly_enqueue ( $deprecated = '' ) {
         if ( did_action ( 'wp_head' ) )
             return;
@@ -178 +178 @@
 
         wp_enqueue_script ( $this->get_option ( 'library' ) );
-        wp_enqueue_script ( $script );
-        add_action ( 'wp_footer' , array ( &$this , 'configure' ) , 11 );
+        wp_enqueue_script ( 'shadowbox' );
+        add_action ( 'wp_footer' , array ( &$this , 'configure' ) , 21 );
     }
 
@@ -189 +189 @@
      */
     function configure () {
-        $plugin_url = $this->plugin_url();
+        $plugin_url = $this->plugin_url ();
         $library = $this->get_option ( 'library' );
         $start =  "\n<!-- Begin Shadowbox JS v{$this->version} -->\n";
@@ -345 +345 @@
         // Check to see if we need to try to load shadowbox and dependencies into the footer
         if ( preg_match ( $slbox_rel_pattern , $content ) && $this->get_option ( 'smartLoad' ) == 'true' ) {
-            $this->possibly_enqueue ( 'shadowbox' );
+            $this->possibly_enqueue ();
         }
 

shadowbox-js/trunk/shadowbox-js.php

@@ -8 +8 @@
  *
  * @author Matt Martz <matt@sivel.net>
- * @version 3.0.3.8
+ * @version 3.0.3.9
  * @package shadowbox-js
  */
@@ -16 +16 @@
 Plugin URI:   http://sivel.net/wordpress/shadowbox-js/
 Description:  A javascript media viewer similar to Lightbox and Thickbox. Supports all types of media, not just images.
-Version:      3.0.3.8
+Version:      3.0.3.9
 Author:       Matt Martz
 Author URI:   http://sivel.net/
@@ -56 +56 @@
      * @var int
      */
-    var $version = '3.0.3.8';
+    var $version = '3.0.3.9';
 
     /**

shadowbox-js/trunk/shadowbox-title-push.php

@@ -14 +14 @@
 Plugin URI:   http://sivel.net/wordpress/shadowbox-js/
 Description:  Push the title attribute from the img tag to the anchor tag
-Version:      3.0.3.8
+Version:      3.0.3.9
 Author:       Matt Martz
 Author URI:   http://sivel.net/