Changeset 193382

Timestamp:

01/12/2010 09:45:44 PM (16 years ago)

Author:

malcalevak

Message:

Dropped JSON and uses wp_localize_script
Addition of Mobile phone check (no option set yet)

Location:

wp-slimbox2/trunk

Files:

• adminpage.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• javascript/slimbox2_autoload.js (modified) (6 diffs)

wp-slimbox2/trunk/adminpage.php

@@ -8 +8 @@
     //choose caption source
     //combine selection of lightbox and any non-lightboxed images into single selector
-    //fix break regarding admin-ajax.php location...
 ?>
 <div class="wrap">

wp-slimbox2/trunk/index.php

@@ -51 +51 @@
         if($options->get_option('resizeEasing') != 'swing') wp_enqueue_script('jquery_easing');
         wp_enqueue_script('slimbox2_autoload');
-    }
+        wp_localize_script( 'slimbox2_autoload', 'slimbox2_options', array(
+            'autoload' => $options->get_option('autoload'),
+            'overlayColor' => $options->get_option('overlayColor'),
+            'loop' => (($options->get_option('loop') == 'on')?true:false),
+            'overlayOpacity' => $options->get_option('overlayOpacity'),
+            'overlayFadeDuration' => $options->get_option('overlayFadeDuration'),
+            'resizeDuration' => $options->get_option('resizeDuration'),
+            'resizeEasing' => $options->get_option('resizeEasing'),
+            'initialWidth' => $options->get_option('initialWidth'),
+            'initialHeight' => $options->get_option('initialHeight'),
+            'imageFadeDuration' => $options->get_option('imageFadeDuration'),
+            'captionAnimationDuration' => $options->get_option('captionAnimationDuration'),
+            'counterText' => $options->get_option('counterText'),
+            'closeKeys' => $options->get_option('closeKeys'),
+            'previousKeys' => $options->get_option('previousKeys'),
+            'nextKeys' => $options->get_option('nextKeys'),
+            'prev' => WP_PLUGIN_URL.'/wp-slimbox2/images/'.__('default/prevlabel.gif', 'wp-slimbox2'),
+            'next' => WP_PLUGIN_URL.'/wp-slimbox2/images/'.__('default/nextlabel.gif', 'wp-slimbox2'),
+            'close' => WP_PLUGIN_URL.'/wp-slimbox2/images/'.__('default/closelabel.gif', 'wp-slimbox2'),
+            'LTR' => __('LTR', 'wp-slimbox2'),
+            'picasaweb' => $options->get_option('picasaweb'),
+            'flickr' => $options->get_option('flickr'),
+            'mobile' => false
+        ));
+
+
+        }
 }
 
@@ -83 +109 @@
     die();
 }
-add_action( 'wp_ajax_nopriv_get_slimbox_options', 'get_slimbox_options' );
-add_action( 'wp_ajax_get_slimbox_options', 'get_slimbox_options' );
+add_action( 'wp_ajax_get_slimbox_options', 'get_slimbox_options',1 );
+add_action( 'wp_ajax_nopriv_get_slimbox_options', 'get_slimbox_options',1 );
+

wp-slimbox2/trunk/javascript/slimbox2_autoload.js

@@ -1 +1 @@
 //accomodate infinite scroll...clear and reset slimbox function
-//if (!/android|iphone|ipod|series60|symbian|windows ce|blackberry/i.test(navigator.userAgent)) {
-jQuery(function($) {
-    $.post("wp-admin/admin-ajax.php",{ action: 'get_slimbox_options'},load_slimbox, "json");
-    function load_slimbox(wp_slimbox_options) {
-        $("#lbOverlay").css("background-color",String(wp_slimbox_options[0]['overlayColor']));
-        
-        var options = {
-                    loop: (wp_slimbox_options[0]['loop'] == 'on')?'true':'false',
-                    overlayOpacity: wp_slimbox_options[0]['overlayOpacity'],
-                    overlayFadeDuration: parseInt(wp_slimbox_options[0]['overlayFadeDuration']),
-                    resizeDuration: parseInt(wp_slimbox_options[0]['resizeDuration']),
-                    resizeEasing: String(wp_slimbox_options[0]['resizeEasing']),
-                    initialWidth: parseInt(wp_slimbox_options[0]['initialWidth']),
-                    initialHeight: parseInt(wp_slimbox_options[0]['initialHeight']),
-                    imageFadeDuration: parseInt(wp_slimbox_options[0]['imageFadeDuration']),
-                    captionAnimationDuration: parseInt(wp_slimbox_options[0]['captionAnimationDuration']),
-                    counterText: String(wp_slimbox_options[0]['counterText']),
-                    closeKeys: wp_slimbox_options[0]['closeKeys'].split(',').map(Number),
-                    previousKeys: wp_slimbox_options[0]['previousKeys'].split(',').map(Number),
-                    nextKeys: wp_slimbox_options[0]['nextKeys'].split(',').map(Number) 
-                }
+//add support to trigger on links?
+jQuery(document).ready(function($) {
+    if(slimbox2_options['mobile'] || !/android|iphone|ipod|series60|symbian|windows ce|blackberry/i.test(navigator.userAgent)){
+        slimbox_CSS();
+        load_slimbox();
+    }
 
-        if(wp_slimbox_options[1][3]=="RTL") {
+    function slimbox_CSS() {
+        $("#lbOverlay").css("background-color",String(slimbox2_options['overlayColor']));
+
+        if(slimbox2_options['LTR']=="RTL") {
             $("#lbPrevLink").addClass("next");
             $("#lbNextLink").addClass("prev");
@@ -31 +19 @@
         $("#lbPrevLink").hover(
             function () {
-                $(this).css("background-image","url("+wp_slimbox_options[1][0]+")");
+                $(this).css("background-image","url("+slimbox2_options["prev"]+")");
             },
             function () {
@@ -39 +27 @@
         $("#lbNextLink").hover(
             function () {
-                $(this).css("background-image","url("+wp_slimbox_options[1][1]+")");
+                $(this).css("background-image","url("+slimbox2_options["next"]+")");
             },
             function () {
@@ -45 +33 @@
             }
         );
-        $("#lbCloseLink").css("background","transparent url("+wp_slimbox_options[1][2]+") no-repeat center");
+        $("#lbCloseLink").css("background","transparent url("+slimbox2_options["close"]+") no-repeat center");
+    }
 
-        if(wp_slimbox_options[0]['autoload']=="on") {
+    function load_slimbox() {
+        var options = {
+                    loop: slimbox2_options['loop'],
+                    overlayOpacity: slimbox2_options['overlayOpacity'],
+                    overlayFadeDuration: parseInt(slimbox2_options['overlayFadeDuration']),
+                    resizeDuration: parseInt(slimbox2_options['resizeDuration']),
+                    resizeEasing: String(slimbox2_options['resizeEasing']),
+                    initialWidth: parseInt(slimbox2_options['initialWidth']),
+                    initialHeight: parseInt(slimbox2_options['initialHeight']),
+                    imageFadeDuration: parseInt(slimbox2_options['imageFadeDuration']),
+                    captionAnimationDuration: parseInt(slimbox2_options['captionAnimationDuration']),
+                    counterText: String(slimbox2_options['counterText']),
+                    closeKeys: slimbox2_options['closeKeys'].split(',').map(Number),
+                    previousKeys: slimbox2_options['previousKeys'].split(',').map(Number),
+                    nextKeys: slimbox2_options['nextKeys'].split(',').map(Number) 
+                }
+
+        if(slimbox2_options['autoload']=="on") {
             $("a[href]").filter(function() {
                     return /\.(jpeg|bmp|jpg|png|gif)(\?[\d\w=&]*)?$/i.test(this.href);
@@ -58 +64 @@
             });
         }
-        if(wp_slimbox_options[0]['picasaweb']=="on") {
+        if(slimbox2_options['picasaweb']=="on") {
             $("a[href^='http://picasaweb.google.'] > img:first-child[src]").parent().slimbox(options, function(el) {
                 return [el.firstChild.src.replace(/\/s\d+(?:\-c)?\/([^\/]+)$/, "/s640/$2"),
@@ -64 +70 @@
             });
         }
-        if(wp_slimbox_options[0]['flickr']=="on") {
+        if(slimbox2_options['flickr']=="on") {
             $("a[href^='http://www.flickr.com/photos/'] > img:first-child[src]").parent().slimbox(options, function(el) {
                 return [el.firstChild.src.replace(/_[mts]\.(\w+)$/, ".$1"),