Changeset 1121350

Timestamp:

03/26/2015 12:38:27 PM (11 years ago)

Author:

niravmehta

Message:

Changes for 1.8.8

Location:

icegram/trunk

Files:

• assets/css/admin.css (modified) (1 diff)
• assets/js/icegram.js (modified) (1 diff)
• icegram.php (modified) (4 diffs)
• message-types/popup/default.css (modified) (1 diff)
• message-types/popup/main.js (modified) (2 diffs)
• message-types/popup/main.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

icegram/trunk/assets/css/admin.css

@@ -699 +699 @@
     vertical-align: middle;
 }
+/* chosen fix*/
+
+.message-setting-fields .chosen-container-single .chosen-single 
+{ 
+    z-index:initial!important; 
+} 
+.message-setting-fields .chosen-container-single.chosen-single div b { 
+    background: url(../images/chosen-sprite.png)no-repeat 0 2px!important; 
+} 

icegram/trunk/assets/js/icegram.js

@@ -184 +184 @@
         this.type = data.type;
         this.data.delay_time = parseInt(this.data.delay_time);
+        //add http:// to link
+        if (typeof(this.data.link) === 'string' && this.data.link != '') {
+            if (!/^https?:\/\//i.test(this.data.link)) {
+                this.data.link = "http://" + this.data.link;
+            }
+        }
         this.set_template( this.get_template_default() );
         this.init();

icegram/trunk/icegram.php

@@ -4 +4 @@
  * Plugin URI: http://www.icegram.com/
  * Description: All in one solution to inspire, convert and engage your audiences. Action bars, Popup windows, Messengers, Toast notifications and more. Awesome themes and powerful rules.
- * Version: 1.8.7
+ * Version: 1.8.8
  * Author: icegram
  * Author URI: http://www.icegram.com/
@@ -35 +35 @@
     function __construct() {
 
-        $this->version = "1.8.7";
+        $this->version = "1.8.8";
         $this->shortcode_instances = array();
         $this->mode = 'local';
@@ -583 +583 @@
             */
             // Redo the_content functionality to avoid other plugins adding extraneous code to messages
-            $content = $message_data['message'];
-               
-            $content = convert_chars( convert_smilies( wptexturize( $content ) ) );
-            if(isset($GLOBALS['wp_embed'])) {
-                $content = $GLOBALS['wp_embed']->autoembed($content);
-            }
-            $content = $this->after_wpautop( wpautop( $this->before_wpautop( $content ) ) );
-            $content = do_shortcode( shortcode_unautop( $content ) );
-            $messages[$key]['message'] = $content;
-            
+            $this->process_message_body($messages[$key]);
         }
 
@@ -664 +655 @@
         }
 
+    }
+    
+    // Process
+    function process_message_body(&$message_data){
+        $content = $message_data['message'];
+        $content = convert_chars( convert_smilies( wptexturize( $content ) ) );
+        if(isset($GLOBALS['wp_embed'])) {
+            $content = $GLOBALS['wp_embed']->autoembed($content);
+        }
+        $content = $this->after_wpautop( wpautop( $this->before_wpautop( $content ) ) );
+        $content = do_shortcode( shortcode_unautop( $content ) );
+        $message_data['message'] = $content;
+        //do_shortcode in headline
+        $message_data['headline'] = do_shortcode( shortcode_unautop( $message_data['headline'] ) );
     }
 

icegram/trunk/message-types/popup/default.css

@@ -37 +37 @@
 
 .ig_popup .ig_data {
-    overflow: hidden;
+    /*overflow: hidden;*/
     position: relative;
 }

icegram/trunk/message-types/popup/main.js

@@ -36 +36 @@
             type: 'inline'
             },
-            showCloseBtn :false
+            showCloseBtn :false,
+            callbacks: {
+                close: function() {
+                  // Will fire when popup is closed
+                    silent !== true && self.track( 'closed' );
+                }
+            }
         });
-        // jQuery('.mfp-content').removeClass().addClass('mfp-content ig_popup ' + self.data.theme);
+        
         silent !== true && this.track( 'shown' );
     };
@@ -55 +61 @@
             type: 'inline'
         }});
-        silent !== true && this.track( 'closed' );
     };
+
+
    

icegram/trunk/message-types/popup/main.php

@@ -13 +13 @@
         $this->popup_default_delay_time = 3;
         add_filter( 'icegram_data', array( $this, 'arrange_proper_delay_time' ) , 11);
-        add_filter( 'icegram_message_type_params_popup', array( $this, 'set_admin_style' ) );       
+        add_filter( 'icegram_message_type_params_popup', array( $this, 'set_admin_style' ) );   
     }
 

icegram/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.9
 Tested up to: 4.1.1
-Stable tag: 1.8.7
+Stable tag: 1.8.8
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -154 +154 @@
 
 == Upgrade Notice ==
+= 1.8.8 = 
+Improved short code handling, WishList member compatibility and other fixes.
+
 = 1.8.7 = 
 Popups now support custom background and text colors. And a handful of fixes!
@@ -210 +213 @@
 
 == Changelog ==
+= 1.8.8 =
+* New: Headlines now support shortcodes! 
+* Update: A message shown on click of another (using CTA actions addon), can now contain shortcodes
+* Fix: Compatibility with Wishlist Member plugin
+* Fix: Popup close event not triggered when clicking outside the popup - on its overlay
+* Update: Automatically adds http:// in CTA links if missing
+
 = 1.8.7 =
 * New: Can now define custom background and text colors for Popups