Changeset 942368

Timestamp:

07/02/2014 06:57:50 PM (12 years ago)

Author:

huntermaster

Message:

improve stdthumb formatting

Location:

image-formatr/trunk

Files:

• image-formatr.php (modified) (1 diff)
• src/class.formatr.php (modified) (7 diffs)

image-formatr/trunk/image-formatr.php

@@ -4 +4 @@
   * Plugin URI: http://warriorself.com/blog/about/image-formatr/
   * Description: Formats all content images on a page / post giving them captions and popups.
-  * Version: 1.2.4
+  * Version: 1.2.4.1
   * License: GPLv3
   * Author: Steven Almeroth

image-formatr/trunk/src/class.formatr.php

@@ -155 +155 @@
             $image_atts  = $this->get_attributes($image_tag);
 
-            // return the untouched markup if we can't find any attributes
+            // return the untouched markup if we can't find any attributes: no src?
             if (!count($image_atts)) return $orig_markup;
 
@@ -194 +194 @@
 
             // return nothing if we're not on the right page
-            // in effect this image gets deleted
+            // in effect this image gets deleted, why are we doing this?
             if ( ($image_atts['page'] == 'front'   and !is_front_page())
               or ($image_atts['page'] == 'single'  and !is_single()    )
@@ -228 +228 @@
                     $image_atts['class'] = str_replace($class, "", $image_atts['class']);
 
-            return $this->format($image_atts);
+            return $this->format($image_atts, $image_tag);
         }
 
@@ -234 +234 @@
          * Format the html output
          *
+         * @param array $param The image attributes/parameters as an associative array
          * [alt] => IMG_4308
          * [asis] =>
@@ -255 +256 @@
          * [none] =>
          *
-         * @param array $param The image attributes/parameters as an associative array
+         * @param string $image The image tag markup, with closing slash
+         * <img src="..." .../>
+         *
          * @return string The screen markup
          */
-        function format ( $param )
+        function format ( $param, $image )
         {
             // setup dimensions width & height /////////////////////////////////
@@ -313 +316 @@
                 $height = $img_height  ? "max-height: {$img_height}px;" : "";
             }
-            if ($this->get_option('stdthumb')) {
-                $image_style  = "style=\"$width $height\"";
-                $container_style = "style=\"width:{$img_width}px\"";
-            } else {
-                $image_style = "";
-                $container_style = "";
-            }
 
             // setup source & id print variables ///////////////////////
@@ -374 +370 @@
 
             $class = trim("{$this->add_class} {$param['class']}");
+            $container_style = '';
+
+            if ($this->get_option('stdthumb')) {
+                $container_style = 'style="width:{$img_width}px"';
+                $image = <<< IMAGE
+                  <img src="$src" alt="{$param['alt']}" style="$width $height" $title/>
+IMAGE;
+            }
 
             return <<< DIV_A_IMG
               <div $id class="$class" $container_style>
-                $anchor<img src="$src" alt="{$param['alt']}" $image_style $title/>$anchor_close
+                $anchor$image$anchor_close
                 $caption
               </div>