Magee Shortcodes - Version 1.5.4

Version Description

  • 31/05/2016 =
  • Compatible with magee theme
Download this release

Release Info

Developer magictheme
Plugin Icon 128x128 Magee Shortcodes
Version 1.5.4
Comparing to
See all releases

Code changes from version 1.5.3 to 1.5.4

Files changed (5) hide show
  1. Magee.php +3 -2
  2. assets/css/admin.css +6 -0
  3. assets/js/admin.js +1 -1
  4. assets/js/magee-shortcodes.js +23 -23
  5. readme.txt +3 -0
Magee.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Magee Shortcodes
4
  Plugin URI: http://www.mageewp.com/magee-shortcode.html
5
  Description: Magee Shortcodes is WordPress plugin that provides a pack of shortcodes. With Magee Shortcodes, you can easily create accordion, buttons, boxes, columns, social and much more. They allow you to create so many different page layouts. You could quickly and easily built your own custom pages using all the various shortcodes that Magee Shortcodes includes.
6
- Version: 1.5.3
7
  Author: MageeWP
8
  Author URI: http://www.mageewp.com
9
  Text Domain: magee-shortcodes
@@ -14,10 +14,11 @@ if ( ! defined( 'ABSPATH' ) ) return;
14
  if(!class_exists('Magee_Core') && !defined( 'MAGEE_SHORTCODE_LIB_DIR') ):
15
  define( 'MAGEE_SHORTCODES_PATH', __FILE__ );
16
  define( 'MAGEE_SHORTCODES_DIR_PATH', plugin_dir_path( __FILE__ ));
17
- define( 'MAGEE_SHORTCODES_VER', '1.5.3' );
18
 
19
  require_once 'inc/core.php';
20
  //require_once 'inc/options.php';
 
21
  require_once 'inc/magee-slider.php';
22
  new Magee_Core;
23
 
3
  Plugin Name: Magee Shortcodes
4
  Plugin URI: http://www.mageewp.com/magee-shortcode.html
5
  Description: Magee Shortcodes is WordPress plugin that provides a pack of shortcodes. With Magee Shortcodes, you can easily create accordion, buttons, boxes, columns, social and much more. They allow you to create so many different page layouts. You could quickly and easily built your own custom pages using all the various shortcodes that Magee Shortcodes includes.
6
+ Version: 1.5.4
7
  Author: MageeWP
8
  Author URI: http://www.mageewp.com
9
  Text Domain: magee-shortcodes
14
  if(!class_exists('Magee_Core') && !defined( 'MAGEE_SHORTCODE_LIB_DIR') ):
15
  define( 'MAGEE_SHORTCODES_PATH', __FILE__ );
16
  define( 'MAGEE_SHORTCODES_DIR_PATH', plugin_dir_path( __FILE__ ));
17
+ define( 'MAGEE_SHORTCODES_VER', '1.5.4' );
18
 
19
  require_once 'inc/core.php';
20
  //require_once 'inc/options.php';
21
+ if( !function_exists('magee_slider_register') )
22
  require_once 'inc/magee-slider.php';
23
  new Magee_Core;
24
 
assets/css/admin.css CHANGED
@@ -44,6 +44,7 @@
44
 
45
  img.uploaded-image{
46
  display:none;
 
47
  }
48
 
49
  .magee-form-textarea{
@@ -434,6 +435,11 @@ a#TB_closeWindowButton .tb-close-icon:before {
434
  #TB_ajaxWindowTitle a.link-forum {
435
  margin-right: 10px;
436
  }
 
 
 
 
 
437
 
438
  .param-item {
439
  background-color: #eee;
44
 
45
  img.uploaded-image{
46
  display:none;
47
+ max-width:100%;
48
  }
49
 
50
  .magee-form-textarea{
435
  #TB_ajaxWindowTitle a.link-forum {
436
  margin-right: 10px;
437
  }
438
+ #TB_ajaxWindowTitle a.link-pro{
439
+ margin-right: 10px;
440
+ background-color: #d54e21;
441
+ color: #fff;
442
+ }
443
 
444
  .param-item {
445
  background-color: #eee;
assets/js/admin.js CHANGED
@@ -7,7 +7,7 @@ $('.magee_shortcodes,.magee_shortcodes_textarea').click(function(){
7
  popup = params.identifier;
8
  }
9
 
10
- var magee = "Magee Shortcodes<span class='shortcode_show_name'></span><a class='link-doc' target='_blank' href='https://www.mageewp.com/magee-shortcode-guide.html'>Document</a><a class='link-forum' target='_blank' href='https://www.mageewp.com/forums/magee-shortcode/'>Forums</a>";
11
  // load thickbox
12
  var height = $(window).height()-150;
13
  tb_show(magee, ajaxurl + "?action=magee_shortcodes_popup&popup=" + popup + "&width=800&height="+height);
7
  popup = params.identifier;
8
  }
9
 
10
+ var magee = "Magee Shortcodes<span class='shortcode_show_name'></span><a class='link-doc' target='_blank' href='https://www.mageewp.com/magee-shortcode-guide.html'>Document</a><a class='link-forum' target='_blank' href='https://www.mageewp.com/forums/magee-shortcode/'>Forums</a><a class='link-pro' target='_blank' href='https://www.mageewp.com/magee-shortcode.html'>Pro Version</a>";
11
  // load thickbox
12
  var height = $(window).height()-150;
13
  tb_show(magee, ajaxurl + "?action=magee_shortcodes_popup&popup=" + popup + "&width=800&height="+height);
assets/js/magee-shortcodes.js CHANGED
@@ -182,7 +182,7 @@ jQuery(document).ready(function($) {
182
 
183
  $('.magee-flipbox-wrap').each(function(){
184
  var front_height = $(this).find('.flipbox-front').outerHeight();
185
- var back_height = $(this).find('.flipbox-back').outerHeight();
186
  var height = front_height>back_height?front_height:back_height;
187
  $(this).css({'height':height});
188
  });
@@ -198,49 +198,49 @@ jQuery(document).ready(function($) {
198
  /* animation */
199
  /* ------------------------------------------------------------------------ */
200
 
201
- jQuery('.magee-animated').each(function(){
202
- if(jQuery(this).data('imageanimation')==="yes"){
203
- jQuery(this).find("img,i.fa").css("visibility","hidden");
204
  }
205
  else{
206
- jQuery(this).css("visibility","hidden");
207
  }
208
 
209
  });
210
 
211
  if(jQuery().waypoint) {
212
- jQuery('.magee-animated').waypoint(function() {
213
 
214
- jQuery(this).css({'visibility':'visible'});
215
- jQuery(this).find("img,i.fa").css({'visibility':'visible'});
216
 
217
 
218
  // this code is executed for each appeared element
219
- var animation_type = jQuery(this).data('animationtype');
220
- var animation_duration = jQuery(this).data('animationduration');
221
- var image_animation = jQuery(this).data('imageanimation');
222
  if(image_animation === "yes"){
223
 
224
- jQuery(this).find("img,i.fa").addClass("animated "+animation_type);
225
 
226
  if(animation_duration) {
227
- jQuery(this).find("img,i.fa").css('-moz-animation-duration', animation_duration+'s');
228
- jQuery(this).find("img,i.fa").css('-webkit-animation-duration', animation_duration+'s');
229
- jQuery(this).find("img,i.fa").css('-ms-animation-duration', animation_duration+'s');
230
- jQuery(this).find("img,i.fa").css('-o-animation-duration', animation_duration+'s');
231
- jQuery(this).find("img,i.fa").css('animation-duration', animation_duration+'s');
232
  }
233
 
234
 
235
  }else{
236
- jQuery(this).addClass("animated "+animation_type);
237
 
238
  if(animation_duration) {
239
- jQuery(this).css('-moz-animation-duration', animation_duration+'s');
240
- jQuery(this).css('-webkit-animation-duration', animation_duration+'s');
241
- jQuery(this).css('-ms-animation-duration', animation_duration+'s');
242
- jQuery(this).css('-o-animation-duration', animation_duration+'s');
243
- jQuery(this).css('animation-duration', animation_duration+'s');
244
  }
245
  }
246
 
182
 
183
  $('.magee-flipbox-wrap').each(function(){
184
  var front_height = $(this).find('.flipbox-front').outerHeight();
185
+ var back_height = $(this).find('.flipbox-back').outerHeight();
186
  var height = front_height>back_height?front_height:back_height;
187
  $(this).css({'height':height});
188
  });
198
  /* animation */
199
  /* ------------------------------------------------------------------------ */
200
 
201
+ $('.magee-animated').each(function(){
202
+ if($(this).data('imageanimation')==="yes"){
203
+ $(this).find("img,i.fa").css("visibility","hidden");
204
  }
205
  else{
206
+ $(this).css("visibility","hidden");
207
  }
208
 
209
  });
210
 
211
  if(jQuery().waypoint) {
212
+ $('.magee-animated').waypoint(function() {
213
 
214
+ $(this).css({'visibility':'visible'});
215
+ $(this).find("img,i.fa").css({'visibility':'visible'});
216
 
217
 
218
  // this code is executed for each appeared element
219
+ var animation_type = $(this).data('animationtype');
220
+ var animation_duration = $(this).data('animationduration');
221
+ var image_animation = $(this).data('imageanimation');
222
  if(image_animation === "yes"){
223
 
224
+ $(this).find("img,i.fa").addClass("animated "+animation_type);
225
 
226
  if(animation_duration) {
227
+ $(this).find("img,i.fa").css('-moz-animation-duration', animation_duration+'s');
228
+ $(this).find("img,i.fa").css('-webkit-animation-duration', animation_duration+'s');
229
+ $(this).find("img,i.fa").css('-ms-animation-duration', animation_duration+'s');
230
+ $(this).find("img,i.fa").css('-o-animation-duration', animation_duration+'s');
231
+ $(this).find("img,i.fa").css('animation-duration', animation_duration+'s');
232
  }
233
 
234
 
235
  }else{
236
+ $(this).addClass("animated "+animation_type);
237
 
238
  if(animation_duration) {
239
+ $(this).css('-moz-animation-duration', animation_duration+'s');
240
+ $(this).css('-webkit-animation-duration', animation_duration+'s');
241
+ $(this).css('-ms-animation-duration', animation_duration+'s');
242
+ $(this).css('-o-animation-duration', animation_duration+'s');
243
+ $(this).css('animation-duration', animation_duration+'s');
244
  }
245
  }
246
 
readme.txt CHANGED
@@ -68,6 +68,9 @@ Activate plugin at "Plugins" administration page.
68
 
69
  == Changelog ==
70
 
 
 
 
71
  = 1.5.3 - 16/05/2016 =
72
  * Fix - Fixed animation issue
73
 
68
 
69
  == Changelog ==
70
 
71
+ = 1.5.4 - 31/05/2016 =
72
+ * Compatible with magee theme
73
+
74
  = 1.5.3 - 16/05/2016 =
75
  * Fix - Fixed animation issue
76