Changeset 903707

Timestamp:

04/27/2014 10:33:31 PM (12 years ago)

Author:

kcfried

Message:

2.1.3

• Fixed error with WP 3.9 tinyMCE shortcode insertion
• Deleting the plugin no longer throws an error

Location:

easy-columns/trunk

Files:

• easy-columns.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• tinymce/editor_plugin.js (modified) (2 diffs)
• tinymce/window.php (modified) (1 diff)

easy-columns/trunk/easy-columns.php

@@ -3 +3 @@
 Plugin Name: Easy Columns
 Plugin URI: http://www.patrickfriedl.com/
-Version: v2.1.2
+Version: v2.1.3
 Author: <a href="http://www.patrickfriedl.com">Pat Friedl</a>
 Description: Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages just the way you need them.  Using shortcodes for 1/4, 1/2, 1/3, 2/3, 3/4, 1/5, 2/5, and 3/5 columns, you can insert <strong>at least thirty</strong> unique variations of columns on any page and even in posts! Quickly add columns to your pages from the editor with an easy to use "pick n' click" interface! For usage and more information, visit <a href="http://www.patrickfriedl.com" target="_blank">patrickfriedl.com</a>.
@@ -96 +96 @@
             add_shortcode('ezcol_4fifth_end', array(&$this, 'four_fifth_end'));
             add_shortcode('ezdiv', array(&$this, 'div'));
+            add_shortcode('ezdiv1', array(&$this, 'div'));
+            add_shortcode('ezdiv2', array(&$this, 'div'));
+            add_shortcode('ezdiv3', array(&$this, 'div'));
+            add_shortcode('ezdiv4', array(&$this, 'div'));
+            add_shortcode('ezdiv5', array(&$this, 'div'));
             add_shortcode('ezcol_divider', array(&$this, 'add_divider'));
             add_shortcode('ezcol_end_right', array(&$this, 'end_column_right'));
@@ -457 +462 @@
         */
         function uninstall() {
-            delete_option($this->ez_columns_options_name);
+            delete_option('easycol_options');
         } // end uninstall
 

easy-columns/trunk/readme.txt

@@ -4 +4 @@
 Tags: columns, column, grid layout, box, boxes, feature box, layout, magazine, page, posts, magazine columns, magazine layout, float div
 Requires at least: 2.7
-Tested up to: 3.6.1
-Stable tag: 2.1.2
+Tested up to: 3.9
+Stable tag: 2.1.3
 
 Easy Columns provides the shortcodes to create a grid system or magazine style columns for laying out your pages (or even posts!) just the way you need them.
@@ -25 +25 @@
 [ezcol_1third]this is column 1[/ezcol_1third]
 [ezcol_1third]this is column 2[/ezcol_1third]
-[ezcol_1third_end]this is column 3[/ezcol_1third_end] 
+[ezcol_1third_end]this is column 3[/ezcol_1third_end]
 
 The result are 3 columns about 33% in width of their container.
@@ -113 +113 @@
 == Changelog ==
 
+= 2.1.3 =
+* Fixed error with WP 3.9 tinyMCE shortcode insertion
+* Deleting the plugin no longer throws an error
+
 = 2.1.2 =
 * Changed the tinyMCE window to load wp-load.php instead of wp-config.php

easy-columns/trunk/tinymce/editor_plugin.js

@@ -19 +19 @@
                 ed.windowManager.open({
                     file : url + '/window.php?',
-                    width : 764 + ed.getLang('ezColumns.delta_width', 0),
-                    height : 520 + ed.getLang('ezColumns.delta_height', 0),
+                    width : 780 + ed.getLang('ezColumns.delta_width', 0),
+                    height : 560 + ed.getLang('ezColumns.delta_height', 0),
                     inline : 1
                 }, {
@@ -49 +49 @@
             return {
                     longname  : 'Easy Columns',
-                    author    : 'PatFriedl.com',
+                    author    : 'Pat Friedl',
                     authorurl : 'http://patfriedl.com',
                     infourl   : 'http://patfriedl.com',
-                    version   : "1.0"
+                    version   : "2.1.3"
             };
         }

easy-columns/trunk/tinymce/window.php

@@ -256 +256 @@
 function insertText(){
     if(window.tinyMCE) {
-        window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, colTxt);
+        if(window.tinyMCE.execInstanceCommand){
+            window.tinyMCE.execInstanceCommand('content', 'mceInsertContent', false, colTxt);   
+        } else {
+            window.tinymce.activeEditor.execCommand('mceInsertContent', false, colTxt); 
+        }
         tinyMCEPopup.editor.execCommand('mceRepaint');
         tinyMCEPopup.close();