Changeset 1064596

Timestamp:

01/10/2015 12:33:18 PM (11 years ago)

Author:

bortpress

Message:

0.4.0.3b

Continued fix for wptexturize and page_size errors

Location:

masonry-post-gallery

Files:

• tags/0.4.0.3b (added)
• tags/0.4.0.3b/cactus-masonry-options.php (added)
• tags/0.4.0.3b/cactus-masonry.js (added)
• tags/0.4.0.3b/close.png (added)
• tags/0.4.0.3b/imagesloaded.pkgd.min.js (added)
• tags/0.4.0.3b/lightbox.css (added)
• tags/0.4.0.3b/lightbox.min.js (added)
• tags/0.4.0.3b/loading.gif (added)
• tags/0.4.0.3b/masonry-post-gallery.css (added)
• tags/0.4.0.3b/masonry-post-gallery.php (added)
• tags/0.4.0.3b/masonry.pkgd.min.js (added)
• tags/0.4.0.3b/next.png (added)
• tags/0.4.0.3b/prev.png (added)
• tags/0.4.0.3b/readme.txt (added)
• tags/0.4.0.3b/spin.min.js (added)
• trunk/masonry-post-gallery.php (modified) (8 diffs)
• trunk/readme.txt (modified) (3 diffs)

masonry-post-gallery/trunk/masonry-post-gallery.php

@@ -2 +2 @@
 /**
  * @package Cactus Masonry
- * @version 0.4.0.2b
+ * @version 0.4.0.3b
  */
 /*
@@ -8 +8 @@
  * Plugin URI: http://cactuscomputers.com.au/masonry
  * Description: A highly customizable masonry styled gallery of post thumbnails.  Please refer to the <a href="http://cactuscomputers.com.au/masonry">plugin Home Page</a> for detailed instructions.
- * Version: 0.4.0.2b
+ * Version: 0.4.0.3b
  * Author: N. E - Cactus Computers
  * Author URI: http://www.cactuscomputers.com.au/masonry
@@ -123 +123 @@
             'post_category'             =>  "", 
             'post_order'                =>  "DESC", 
-            'post_orderby'              =>  "post_date", 
-            'gallery_align'             =>  "center",
-            'image_background_color'    =>  "#ffffff", 
-            'hover_color'               =>  "#ffffff", 
-            'hover_intensity'           =>  "0.5",
-            'upscale_narrow_images'     => 0, 
-            'upscale_short_images'      => 0, 
-            'max_upscale_quality'       => "large",
-            'noscript_width'            => "auto", 
-            'noscript_height'           => "auto",
-            'noscript_max_width'        => "none",
-            'noscript_max_height'       => "none",
-            'upscale_max_width'         => "none", 
-            'upscale_max_height'        => "none",
-            'link_location'             => "post", 
-            'show_lightbox'             => false,
-            'browse_with_lightbox'      => false, 
-            'show_lightbox_title'       => false, 
-            'soft_gutter'               => 0,
-            'infinite_scroll'           => true, 
-            'posts_per_page'            => 30,
-            'show_loader'               => true, 
-            'search_start'              => 0, 
-            'page_size'                 => 1000, 
-            'test_mode'                 => false, 
-            'default_image_id'          => false, 
-            'show_posts'                => true,
-            'show_pages'                => false,
-            'require_javascript'        => false,
-            'javascript_error_message'  => 'Please enable JavaScript to properly view this page.',
-            'infinite_scroll_buffer'    => 400,
-            'display_post_titles'       => false,
-            'display_post_excerpts'     => false,
-            'custom_post_types'         => "",
-            'load_js'                   => true,
-            'force_auto_width'          => false,
-            'crop_images'               => false,
-            'ajax_mode'                 => false,
-            'link_custom_class'         => ''
+            'post_orderby'              =>  "post_date", 
+            'gallery_align'             =>  "center",
+            'image_background_color'    =>  "#ffffff", 
+            'hover_color'               =>  "#ffffff", 
+            'hover_intensity'           =>  "0.5",
+            'upscale_narrow_images'     =>  0, 
+            'upscale_short_images'      =>  0, 
+            'max_upscale_quality'       =>  "large",
+            'noscript_width'            =>  "auto", 
+            'noscript_height'           =>  "auto",
+            'noscript_max_width'        =>  "none",
+            'noscript_max_height'       =>  "none",
+            'upscale_max_width'         =>  "none", 
+            'upscale_max_height'        =>  "none",
+            'link_location'             =>  "post", 
+            'show_lightbox'             =>  false,
+            'browse_with_lightbox'      =>  false, 
+            'show_lightbox_title'       =>  false, 
+            'soft_gutter'               =>  0,
+            'infinite_scroll'           =>  true, 
+            'posts_per_page'            =>  30,
+            'show_loader'               =>  true, 
+            'search_start'              =>  0, 
+            'page_size'                 =>  1000, 
+            'test_mode'                 =>  false, 
+            'default_image_id'          =>  false, 
+            'show_posts'                =>  true,
+            'show_pages'                =>  false,
+            'require_javascript'        =>  false,
+            'javascript_error_message'  =>  'Please enable JavaScript to properly view this page.',
+            'infinite_scroll_buffer'    =>  400,
+            'display_post_titles'       =>  false,
+            'display_post_excerpts'     =>  false,
+            'custom_post_types'         =>  "",
+            'load_js'                   =>  true,
+            'force_auto_width'          =>  false,
+            'crop_images'               =>  false,
+            'ajax_mode'                 =>  false,
+            'link_custom_class'         =>  ''
             ), $atts);
         
@@ -228 +228 @@
             if(has_post_thumbnail($post->ID) || !(self::$a['default_image_id'] === false))
             {   
-                if($post_count >= self::$a['search_start'] && $post_count < self::$a['page_size']) $script_text .= self::render_post();
-                $post_count++;
+                if(self::$post_count >= self::$a['search_start'] && self::$post_count < self::$a['search_start']+self::$a['page_size']) $script_text .= self::render_post();
+                self::$post_count++;
             }   
         }
@@ -313 +313 @@
         $link_class = "masonry_brick_a";
         if(self::$a['link_custom_class'] != '') $link_class .= " " . self::$a['link_custom_class'];
-        $link_class = "class=\"{$link_class}\"";
-        $lightbox_text = " data-lightbox=\"";
-        if(self::$a['browse_with_lightbox'] === true) $lightbox_text .= "thispage\"";
-        else $lightbox_text .= $post->ID . "\"";
-        if(self::$a['show_lightbox_title'] === true) $lightbox_text .= " data-title=\"" . $tit . "\"";
+        $lightbox_text = " data-lightbox='";
+        if(self::$a['browse_with_lightbox'] === true)
+        {
+            $lightbox_text .= "thispage'";
+            $data_lightbox = "thispage";
+        }
+        else 
+        {
+            $lightbox_text .= $post->ID . "'";
+            $data_lightbox = $post->ID;
+        }
+        if(self::$a['show_lightbox_title'] === true) $lightbox_text .= " data-title='" . $tit . "'";
         //Set where each image links and handle any interference with the show_lightbox parameter
         if(has_post_thumbnail())
@@ -382 +389 @@
                 self::$a['show_lightbox'] = false;
         }
-        if(!(self::$a['show_lightbox'] === true)) $lightbox_text = "";
+        if(!(self::$a['show_lightbox'] === true)) 
+        {
+            $lightbox_text = "";
+            $data_lightbox = "";
+        }
         //Sort out databox
         if($show_databox)
         {
-            $data_text = "<div class=\"cactus_masonry_databox\">";
-            if(self::$a['display_post_titles'] && strlen($tit) > 0) $data_text .= "<div class=\"cm_title\">{$tit}</div>";
-            if(self::$a['display_post_excerpts'] && strlen($excerpt) > 0) $data_text .= "<div class=\"cm_exerpt\">{$excerpt}</div>";
+            $data_text = "<div class='cactus_masonry_databox'>";
+            if(self::$a['display_post_titles'] && strlen($tit) > 0) $data_text .= "<div class='cm_title'>{$tit}</div>";
+            if(self::$a['display_post_excerpts'] && strlen($excerpt) > 0) $data_text .= "<div class='cm_exerpt'>{$excerpt}</div>";
             $data_text .= "</div>"; 
         }
@@ -435 +446 @@
             //Write the JavaScript
             //Start with the innerHTML of the masonry_brick DIVs
-            $output .= "                s = '<{$link_type} {$lightbox_text} {$link_class} style=\"display: block;\" href=\"{$lnk}\"><img class=\"masonry_brick_img size-thumbnail\" src=\"{$thumbnail[0]}\" alt=\"{$tit}\" style=\"";
+            $output .= "                s = \"<img class='masonry_brick_img size-thumbnail' src='{$thumbnail[0]}' alt='{$tit}' style='";
             if(!($thumbnail[5] && strpos(self::$a['upscale_max_width'], '%') !== false) && (self::$a['width'] != 'auto')) $output .= "width: 100%; ";
             $output .= "height: " . self::$a['height'] . "; ";      
             $output .= "max-height: " . self::$a['max_height'] . "; ";
             if(self::$a['crop_images']) $output .= "visibility: hidden; ";
-            $output .= "\"/>";
-            if(self::$a['crop_images']) $output .= "<div class=\"cactus_masonry_cropped\" style=\"background-image: url({$thumbnail[0]});\"></div>";
+            $output .= "'/>";
+            if(self::$a['crop_images']) $output .= "<div class='cactus_masonry_cropped' style='background-image: url({$thumbnail[0]});'></div>";
             //Add the databox containing the title and excerpt
             if($show_databox) $output .= $data_text;
-            $output .= "</{$link_type}>';";
             //Create DOM Element for masonry_brick DIV
+            $output .= "\";
+                lk = document.createElement('{$link_type}');
+                lk.className = '{$link_class}';
+                lk.style.display = 'block';
+                lk.href = \"{$lnk}\";";
+            if($data_lightbox != "")
+                $output .= "
+                lk.setAttribute('data-lightbox', '{$data_lightbox}');";
+            if(self::$a['show_lightbox_title'] === true)
+                $output .= "
+                lk.setAttribute('data-title', \"{$tit}\");";
             $output .= "
+                lk.innerHTML = s;
                 el = document.createElement('div');
-                el.innerHTML = s;
                 el.className = 'masonry_brick';
                 el.style.opacity = '0';
                 el.style.display = 'inline-block';
-                el.style.height = '" . $norm_height . "';\n";
+                el.style.height = '" . $norm_height . "';
+                el.appendChild(lk);\n";
             //Set width
             if($thumbnail[5] && strpos(self::$a['upscale_max_width'], '%') !== false) $output .= "          el.style.width = 'auto';\n";
@@ -467 +489 @@
                 self::$noscript_text .= "       
                     <div class='masonry_brick' style='height: " . self::$a['noscript_height'] . "; width: " . self::$a['noscript_width'] . ";   max-height: " . self::$a['noscript_max_height'] . "; max-width: " . self::$a['noscript_max_width'] . ";'>
-                        <{$link_type} {$link_class} style='display: block; height: 100%; width: 100%' href='{$lnk}'>
+                        <{$link_type} class='{$link_class}' style='display: block; height: 100%; width: 100%' href='{$lnk}'>
                             <img class='masonry_brick_img' style='display: block; height: 100%; width: 100%' src='{$thumbnail[0]}' alt='{$tit}'/>
                         </{$link_type}>

masonry-post-gallery/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.9.1
 Tested up to: 4.1
-Stable tag: 0.4.0.2b
+Stable tag: 0.4.0.3b
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 
 == Changelog ==
+
+= 0.4.0.3b =
+* Further fixes for the wptexturize bug which should no longer interfere with other plugins
+* Fixed an error with the page_size parameter
 
 = 0.4.0.2b =
@@ -262 +266 @@
 == Upgrade Notice ==
 
+= 0.4.0.3b =
+WARNING: The 0.4 updates change the #masonry_post_gallery to div.masonry_post_gallery which could affect your custom CSS.  Fixed a major bug caused by an interaction with wptexturize.
+
 = 0.4.0.2b =
 WARNING: The 0.4 updates change the #masonry_post_gallery to div.masonry_post_gallery which could affect your custom CSS.  Fixed a major bug caused by an interaction with wptexturize.