Easy Modal - Version 1.2.1

Version Description

Download this release

Release Info

Developer danieliser
Plugin Icon 128x128 Easy Modal
Version 1.2.1
Comparing to
See all releases

Code changes from version 1.2.0.9 to 1.2.1

Files changed (2) hide show
  1. easy-modal.php +58 -4
  2. readme.txt +33 -24
easy-modal.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Easy Modal
4
  Plugin URI: https://easy-modal.com
5
  Description: Easily create & style modals with any content. Theme editor to quickly style your modals. Add forms, social media boxes, videos & more.
6
  Author: Wizard Internet Solutions
7
- Version: 1.2.0.9
8
  Author URI: http://wizardinternetsolutions.com
9
  */
10
  if (!defined('EASYMODAL'))
@@ -20,7 +20,7 @@ if (!defined('EASYMODAL_URL'))
20
  define('EASYMODAL_URL', WP_PLUGIN_URL . '/' . EASYMODAL_SLUG);
21
 
22
  if (!defined('EASYMODAL_VERSION'))
23
- define('EASYMODAL_VERSION', '1.2.0.9' );
24
 
25
  class Easy_Modal {
26
  protected $api_url = 'http://easy-modal.com/api';
@@ -46,7 +46,15 @@ class Easy_Modal {
46
  add_action('admin_head', array(&$this,'editor_admin_head'));
47
  }
48
  add_filter( 'plugin_action_links', array(&$this, '_actionLinks') , 10, 2 );
49
- add_filter('mce_buttons_2', array(&$this, '_TinyMCEButtons'), 999);
 
 
 
 
 
 
 
 
50
  add_filter('tiny_mce_before_init', array(&$this, '_TinyMCEInit'),999);
51
 
52
 
@@ -66,6 +74,9 @@ class Easy_Modal {
66
  add_action('wp_footer', array(&$this, 'preload_modals'),1000);
67
  }
68
  $this->_styles_scripts();
 
 
 
69
  $all_options = wp_load_alloptions();
70
  if(array_key_exists('EasyModal_License_Status', $all_options) && $license_status = get_option('EasyModal_License_Status'))
71
  {
@@ -917,7 +928,50 @@ class Easy_Modal {
917
  }
918
  return $array1;
919
  }
920
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
921
  public function prepare_request($action, $args = array())
922
  {
923
  global $wp_version;
4
  Plugin URI: https://easy-modal.com
5
  Description: Easily create & style modals with any content. Theme editor to quickly style your modals. Add forms, social media boxes, videos & more.
6
  Author: Wizard Internet Solutions
7
+ Version: 1.2.1
8
  Author URI: http://wizardinternetsolutions.com
9
  */
10
  if (!defined('EASYMODAL'))
20
  define('EASYMODAL_URL', WP_PLUGIN_URL . '/' . EASYMODAL_SLUG);
21
 
22
  if (!defined('EASYMODAL_VERSION'))
23
+ define('EASYMODAL_VERSION', '1.2.1' );
24
 
25
  class Easy_Modal {
26
  protected $api_url = 'http://easy-modal.com/api';
46
  add_action('admin_head', array(&$this,'editor_admin_head'));
47
  }
48
  add_filter( 'plugin_action_links', array(&$this, '_actionLinks') , 10, 2 );
49
+
50
+ $row = 2;
51
+ // Ultimate MCE Compatibility Check
52
+ $ultmce = get_option('jwl_options_group1');
53
+ if(isset($ultmce['jwl_styleselect_field_id']))
54
+ {
55
+ $row = intval($ultmce['jwl_styleselect_dropdown']);
56
+ }
57
+ add_filter("mce_buttons_{$row}", array(&$this, '_TinyMCEButtons'), 999);
58
  add_filter('tiny_mce_before_init', array(&$this, '_TinyMCEInit'),999);
59
 
60
 
74
  add_action('wp_footer', array(&$this, 'preload_modals'),1000);
75
  }
76
  $this->_styles_scripts();
77
+
78
+ add_action( "in_plugin_update_message-".EASYMODAL_SLUG .'/'. EASYMODAL_SLUG .'.php', array(&$this,'your_update_message_cb'), 20, 2 );
79
+ // License Check & Updates
80
  $all_options = wp_load_alloptions();
81
  if(array_key_exists('EasyModal_License_Status', $all_options) && $license_status = get_option('EasyModal_License_Status'))
82
  {
928
  }
929
  return $array1;
930
  }
931
+ public function your_update_message_cb( $plugin_data, $r )
932
+ {
933
+ // readme contents
934
+ $data = file_get_contents( 'http://plugins.trac.wordpress.org/browser/easy-modal/trunk/readme.txt?format=txt' );
935
+ // assuming you've got a Changelog section
936
+ // @example == Changelog ==
937
+ $changelog = stristr( $data, '== Changelog ==' );
938
+ // assuming you've got a Screenshots section
939
+ // @example == Screenshots ==
940
+ //$changelog = stristr( $changelog, '== Screenshots ==', true );
941
+ // only return for the current & later versions
942
+ // assuming you use "= v" to prepend your version numbers
943
+ // @example = v0.2.1 =
944
+ $changelog = stristr( $changelog, "= ".EASYMODAL_VERSION );
945
+
946
+ $changelog = explode( "\r\n", $changelog);
947
+ $v = false;
948
+ $output = '';
949
+ foreach($changelog as $row)
950
+ {
951
+ if(strpos($row,"=") !== false && strpos($row,"=") <= 2)
952
+ {
953
+ if($v)
954
+ {
955
+ break;
956
+ }
957
+ else $v = true;
958
+ }
959
+ if(strpos($row,"*") !== false && strpos($row,"*") <= 2)
960
+ {
961
+ $row = explode('*', $row);
962
+ $output .= "<li style='margin:0; padding:0;'>".ltrim(trim($row[1]))."</li>";
963
+ }
964
+ }
965
+ if($output != '')
966
+ {
967
+ // uncomment the next line to var_export $var contents for dev:
968
+ echo "<p style='margin-bottom:0'>This update includes the following:</p>";
969
+ echo "<ul style='padding-left:15px;margin:0;line-height:1;list-style:disc;font-size:.85em;'>";
970
+ echo $output;
971
+ echo "</ul>";
972
+ }
973
+ return;
974
+ }
975
  public function prepare_request($action, $args = array())
976
  {
977
  global $wp_version;
readme.txt CHANGED
@@ -6,11 +6,13 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
6
  Tags: modal,modal box,modal form,modal window,popup,popup box,popup form,popup window,ajax forms
7
  Requires at least: 3.2
8
  Tested up to: 3.6
9
- Stable tag: 1.2.0.9
10
  Easily create & style modals with any content. Theme editor to quickly style your modals. Add forms, social media boxes, videos, slideshows & more.
11
 
12
  == Description ==
13
  This plugin allows you to easily add unlimited Modal windows with just about any content. It accepts shortcodes and has been tested to work with Contact Form 7 custom forms using ajax submission.
 
 
14
 
15
  = Core Features =
16
  * Unlimited Customizable Modals
@@ -37,14 +39,14 @@ This plugin allows you to easily add unlimited Modal windows with just about any
37
  * Expedited Feature Requests
38
  * Setup Assistance
39
 
40
-
41
- If you like the plugin please rate it.
42
 
43
  [Easy Modal Page](https://easy-modal.com "Easy Modal Page - Info, Demo and Discussion") - Info, Demo and Feature Discussion
44
 
45
  [Wizard Internet Solutions](http://wizardinternetsolutions.com "Website Design & Development") - Developers Site
46
 
47
- To be notified of plugin updates, [follow us on Twitter](http://twitter.com/EasyModal "Wizard Internet Solutions on Twitter")!
48
 
49
  == Installation ==
50
  1. Upload `Easy-Modal` folder to the `/wp-content/plugins/` directory
@@ -54,64 +56,71 @@ To be notified of plugin updates, [follow us on Twitter](http://twitter.com/Easy
54
  5. Copy and Add ``eModal-#` class from the modals settings page to the object you want to make activate the modal window. Will work on divs, links, list elements and just about anything else.
55
 
56
  == Changelog ==
57
- = 1.2.0.9=
 
 
 
 
58
  * Fixed CSS z-index issues ( set modal z-index to 999, and overlay to 998 to make sure they are above other elements )
59
  * Fixed an issue with upgrading from previous versions.
60
 
61
- = 1.2.0.4 =
62
  * Fixed data migration issue ( wasn't setting sites to sitewide )
63
  * Added filters for modal content. Use add_filter('em_modal_content', 'your_custom_function'); function your_custom_function($content);
64
- = 1.2.0.2 =
65
  * Fixed issue of undefined array key.
66
- = 1.2.0.1 =
67
  * Fixed issue that caused wp editor to not load with certain themes.
68
- = 1.2 =
69
  * Code has been rewritten from ground up, JS, admin panels etc.
70
  * Added animations
71
  * Added responsive modals
72
  * Added several additional settings.
73
- = 1.0.2 =
74
  * Fix for installation glitch.
75
- = 1.0.0 =
76
  * Release v1.0.0 Is a was rebuilt from the ground up. Features Include:
77
  * Unlimited Modals
78
  * Lighter Filesizes for Faster Loading
79
  * Auto Centers no matter what the content
80
  * Recenters on window resize/move
81
- = 0.9.0.11 =
82
  * Bug Fix in Settings page color picker.
83
- = 0.9.0.10 =
84
  * Bug Fix in CSS Fixes Form scrolling only when needed.
85
- = 0.9.0.9 =
86
  * Bug Fix in CSS Fixes Form scrolling.
87
- = 0.9.0.8 =
88
  * Bug Fix in JS (Missing " fixed)
89
- = 0.9.0.7 =
90
  * Bug Fix in JS (Affected loading of content into window)
91
- = 0.9.0.6 =
92
  * Bug Fix in JS (Affected WordPress versions below 3.1)
93
  = 0.9.0.5 =
94
  * Bug Fix in JS (Affected IE7).
95
- = 0.9.0.4 =
96
  * Added "Default" Theme for Modal windows. Includes CF7 Styles and Inline AJAX Styleing. See Screenshots.
97
  * Default Options Tweaked for better OOB Experience.
98
  * Added Version to WP Options table to provide better update functionality.
99
- = 0.9.0.3 =
100
  * Overlay Click to Close Option
101
  * Auto Position Option
102
  * Position Top Option
103
  * Position Left Option
104
  * Auto Resize Option
105
- = 0.9.0.2 =
106
  * Added Overlay Color Picker.
107
- = 0.9.0.1 =
108
  * Added Height & Width options.
109
- = 0.9 =
110
  * Initial Release
 
111
  == Upgrade Notice ==
112
- = 1.0.0 =
 
 
113
  * This is a new build your settings will be reset.
114
- = 0.9.0.4 =
115
  * Options will be overwritten with default options.
116
  = 0.9 =
117
  * Initial Release
6
  Tags: modal,modal box,modal form,modal window,popup,popup box,popup form,popup window,ajax forms
7
  Requires at least: 3.2
8
  Tested up to: 3.6
9
+ Stable tag: 1.2.1
10
  Easily create & style modals with any content. Theme editor to quickly style your modals. Add forms, social media boxes, videos, slideshows & more.
11
 
12
  == Description ==
13
  This plugin allows you to easily add unlimited Modal windows with just about any content. It accepts shortcodes and has been tested to work with Contact Form 7 custom forms using ajax submission.
14
+
15
+ Make Pop Ups, Lightboxes & Modals that look like they match your site.
16
 
17
  = Core Features =
18
  * Unlimited Customizable Modals
39
  * Expedited Feature Requests
40
  * Setup Assistance
41
 
42
+ = If you love it, Rate It =
43
+ If you like the plugin please [rate it](http://wordpress.org/support/view/plugin-reviews/easy-modal "Easy Modal Ratings & Reviews").
44
 
45
  [Easy Modal Page](https://easy-modal.com "Easy Modal Page - Info, Demo and Discussion") - Info, Demo and Feature Discussion
46
 
47
  [Wizard Internet Solutions](http://wizardinternetsolutions.com "Website Design & Development") - Developers Site
48
 
49
+ To be notified of plugin updates, [follow us on Twitter](http://twitter.com/EasyModal "Easy Modal on Twitter")!
50
 
51
  == Installation ==
52
  1. Upload `Easy-Modal` folder to the `/wp-content/plugins/` directory
56
  5. Copy and Add ``eModal-#` class from the modals settings page to the object you want to make activate the modal window. Will work on divs, links, list elements and just about anything else.
57
 
58
  == Changelog ==
59
+ = v1.2.1 =
60
+ * Fixes compatibility issues with Ultimate TinyMCE Plugin.
61
+ * Added plugin update notes to plugin page when updates are available.
62
+
63
+ = v1.2.0.9 =
64
  * Fixed CSS z-index issues ( set modal z-index to 999, and overlay to 998 to make sure they are above other elements )
65
  * Fixed an issue with upgrading from previous versions.
66
 
67
+ = v1.2.0.4 =
68
  * Fixed data migration issue ( wasn't setting sites to sitewide )
69
  * Added filters for modal content. Use add_filter('em_modal_content', 'your_custom_function'); function your_custom_function($content);
70
+ = v1.2.0.2 =
71
  * Fixed issue of undefined array key.
72
+ = v1.2.0.1 =
73
  * Fixed issue that caused wp editor to not load with certain themes.
74
+ = v1.2 =
75
  * Code has been rewritten from ground up, JS, admin panels etc.
76
  * Added animations
77
  * Added responsive modals
78
  * Added several additional settings.
79
+ = v1.0.2 =
80
  * Fix for installation glitch.
81
+ = v1.0.0 =
82
  * Release v1.0.0 Is a was rebuilt from the ground up. Features Include:
83
  * Unlimited Modals
84
  * Lighter Filesizes for Faster Loading
85
  * Auto Centers no matter what the content
86
  * Recenters on window resize/move
87
+ = v0.9.0.11 =
88
  * Bug Fix in Settings page color picker.
89
+ = v0.9.0.10 =
90
  * Bug Fix in CSS Fixes Form scrolling only when needed.
91
+ = v0.9.0.9 =
92
  * Bug Fix in CSS Fixes Form scrolling.
93
+ = v0.9.0.8 =
94
  * Bug Fix in JS (Missing " fixed)
95
+ = v0.9.0.7 =
96
  * Bug Fix in JS (Affected loading of content into window)
97
+ = v0.9.0.6 =
98
  * Bug Fix in JS (Affected WordPress versions below 3.1)
99
  = 0.9.0.5 =
100
  * Bug Fix in JS (Affected IE7).
101
+ = v0.9.0.4 =
102
  * Added "Default" Theme for Modal windows. Includes CF7 Styles and Inline AJAX Styleing. See Screenshots.
103
  * Default Options Tweaked for better OOB Experience.
104
  * Added Version to WP Options table to provide better update functionality.
105
+ = v0.9.0.3 =
106
  * Overlay Click to Close Option
107
  * Auto Position Option
108
  * Position Top Option
109
  * Position Left Option
110
  * Auto Resize Option
111
+ = v0.9.0.2 =
112
  * Added Overlay Color Picker.
113
+ = v0.9.0.1 =
114
  * Added Height & Width options.
115
+ = v0.9 =
116
  * Initial Release
117
+
118
  == Upgrade Notice ==
119
+ = v1.2.1 =
120
+ * Fixes compatibility issues with Ultimate TinyMCE Plugin.
121
+ = v1.0.0 =
122
  * This is a new build your settings will be reset.
123
+ = v0.9.0.4 =
124
  * Options will be overwritten with default options.
125
  = 0.9 =
126
  * Initial Release