Changeset 1036989

Timestamp:

12/02/2014 08:26:23 PM (11 years ago)

Author:

FoolsRun

Message:

Version 3.3.4

Location:

bootstrap-3-shortcodes/trunk

Files:

• README.md (modified) (2 diffs)
• bootstrap-shortcodes.php (modified) (6 diffs)
• includes/help/README.html (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

bootstrap-3-shortcodes/trunk/README.md

@@ -549 +549 @@
 ### Media Objects
     [media]
-      [media-object pull="right"]
+      [media-object media="left"]
         ...
       [/media-object]
@@ -566 +566 @@
 Parameter | Description | Required | Values | Default
 --- | --- | --- | --- | ---
-pull | Whether the image pulls to the left or right | optional | left, right | right
+media | Whether the image pulls to the left or right | optional | left, right | right
+pull | Whether the image pulls to the left or right *Deprecated, use only if your theme uses Bootstrap 3.2 or earlier* | optional | left, right | right
 xclass | Any extra classes you want to add | optional | any text | none
 data | Data attribute and value pairs separated by a comma. Pairs separated by pipe (see example at [Button Dropdowns](#button-dropdowns)). | optional | any text | none

bootstrap-3-shortcodes/trunk/bootstrap-shortcodes.php

@@ -4 +4 @@
 Plugin URI: http://wp-snippets.com/freebies/bootstrap-shortcodes or https://github.com/filipstefansson/bootstrap-shortcodes
 Description: The plugin adds a shortcodes for all Bootstrap elements.
-Version: 3.3.3
+Version: 3.3.4
 Author: Filip Stefansson, Simon Yeldon, and Michael W. Delaney
 Author URI: 
@@ -1308 +1308 @@
     $collapse_class = 'panel-collapse';
     $collapse_class .= ( $atts['active'] == 'true' )  ? ' in' : ' collapse';
+      
+    $a_class = '';
+    $a_class .= ( $atts['active'] == 'true' )  ? '' : 'collapsed';
 
     $parent = 'custom-collapse-'. $GLOBALS['collapsibles_count'];
@@ -1318 +1321 @@
         <div class="panel-heading">
           <h4 class="panel-title">
-            <a class="accordion-toggle" data-toggle="collapse" data-parent="#%3$s" href="#%4$s">%5$s</a>
+            <a class="%3$s" data-toggle="collapse" data-parent="#%4$s" href="#%5$s">%6$s</a>
           </h4>
         </div>
-        <div id="%4$s" class="%6$s">
-          <div class="panel-body">%7$s</div>
+        <div id="%5$s" class="%7$s">
+          <div class="panel-body">%8$s</div>
         </div>
       </div>',
       esc_attr( $panel_class ),
       ( $data_props ) ? ' ' . $data_props : '',
+      $a_class,
       $parent,
       $current_collapse,
@@ -1548 +1552 @@
 
     $atts = shortcode_atts( array(
-      "pull"   => "left",
+      "pull"   => false,
+      "media"  => "left",
       "xclass" => false,
       "data"   => false
@@ -1555 +1560 @@
     $class = "media-object img-responsive";
     $class .= ($atts['xclass']) ? ' ' . $atts['xclass'] : '';
+      
+    $media_class ='';
+    $media_class = ($atts['media']) ? 'media-' . $atts['media'] : '';
+    $media_class = ($atts['pull'])  ? 'pull-' . $atts['pull'] : $media_class;     
       
     $return = '';
@@ -1561 +1570 @@
     $content = do_shortcode(preg_replace('/(<br>)+$/', '', $content));
     $return .= $this->scrape_dom_element($tag, $content, $class, '', $atts['data']);
-    $return = '<span class="media-' . esc_attr($atts['pull']) . '">' . $return . '</span>';
+    $return = '<span class="' . $media_class . '">' . $return . '</span>';
     return $return;
   }

bootstrap-3-shortcodes/trunk/includes/help/README.html

@@ -1518 +1518 @@
 <h3 id="media-objects">Media Objects</h3>
 <pre><code>[media]
-  [media-object pull=&quot;right&quot;]
+  [media-object media=&quot;left&quot;]
     ...
   [/media-object]
@@ -1566 +1566 @@
 <tbody>
 <tr>
+<td>media</td>
+<td>Whether the image pulls to the left or right</td>
+<td>optional</td>
+<td>left, right</td>
+<td>right</td>
+</tr>
+<tr>
 <td>pull</td>
-<td>Whether the image pulls to the left or right</td>
+<td>Whether the image pulls to the left or right <em>Deprecated, use only if your theme uses Bootstrap 3.2 or earlier</em></td>
 <td>optional</td>
 <td>left, right</td>

bootstrap-3-shortcodes/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.8
 Tested up to: 4.0
-Stable tag: 3.3.3
+Stable tag: 3.3.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -71 +71 @@
 
 == Changelog ==
+
+= 3.3.4 =
+* Restore Bootstrap 3.2 backwards compatibility for [media-object] shortcode, updated documentation to use Bootstrap 3.3 example, but offer 3.2 options.
+* Add "collapsed" class to non-active [collapse] elements (thanks, Artem!) 
 
 = 3.3 =