Changeset 1297629

Timestamp:

11/30/2015 07:18:26 PM (10 years ago)

Author:

luizrw

Message:

fixed version

File:

• lrw-photoswipe-gallery/branches/1.0.1/lrw-photoswipe-gallery.php (modified) (2 diffs)

lrw-photoswipe-gallery/branches/1.0.1/lrw-photoswipe-gallery.php

@@ -61 +61 @@
             add_filter( 'wp_get_attachment_link', array( &$this, 'data_size' ), 10, 6 );
             add_filter( 'post_gallery', array( &$this, 'photoswipe_gallery' ), 10, 2 );
-
-            if ( get_option('photoswipe_settings') == 1 ) {
-                if ( is_singular() ) {
-                    add_filter( 'wp_enqueue_scripts', array( &$this, 'setup_scripts' ) );
-                    add_filter( 'wp_footer', array( &$this, 'photoswipe_ui_options' ) );
-                    add_filter( 'wp_footer', array( &$this, 'photoswipe_html_footer' ) );
-                }
-            } else {
-                add_filter( 'wp_enqueue_scripts', array( &$this, 'setup_scripts' ) );
-                add_filter( 'wp_footer', array( &$this, 'photoswipe_ui_options' ) );
-                add_filter( 'wp_footer', array( &$this, 'photoswipe_html_footer' ) );
-            }
+            add_filter( 'wp_enqueue_scripts', array( &$this, 'setup_scripts' ) );
+            add_filter( 'wp_footer', array( &$this, 'photoswipe_html_footer' ) );
+            add_filter( 'wp_footer', array( &$this, 'photoswipe_ui_options' ) );
         }
 
@@ -333 +324 @@
          */
         function setup_scripts() {
-            wp_enqueue_script( 'photoswipe-lib', plugin_dir_url( __FILE__ ) . 'assets/js/photoswipe.min.js', array() );
-            wp_enqueue_script( 'photoswipe', plugin_dir_url( __FILE__ ) . 'assets/js/photoswipe-init.js', array( 'photoswipe-lib', 'jquery' ) );
-            wp_enqueue_style( 'photoswipe-lib', plugin_dir_url( __FILE__ ) . 'assets/css/photoswipe.css', false );
-            wp_enqueue_style( 'photoswipe-default-skin', plugin_dir_url( __FILE__ ) . 'assets/css/default-skin/default-skin.css ', false );
+            $options = get_option('photoswipe_settings');
+
+            if ( $options['active_conditional'] == 1 ) {
+                if ( is_singular() ) {
+                    wp_enqueue_script( 'photoswipe-lib', plugin_dir_url( __FILE__ ) . 'assets/js/photoswipe.min.js', array() );
+                    wp_enqueue_script( 'photoswipe', plugin_dir_url( __FILE__ ) . 'assets/js/photoswipe-init.js', array( 'photoswipe-lib', 'jquery' ) );
+                    wp_enqueue_style( 'photoswipe-lib', plugin_dir_url( __FILE__ ) . 'assets/css/photoswipe.css', false );
+                    wp_enqueue_style( 'photoswipe-default-skin', plugin_dir_url( __FILE__ ) . 'assets/css/default-skin/default-skin.css ', false );
+                }
+            }
         }