Changeset 1246508

Timestamp:

09/16/2015 08:59:58 AM (11 years ago)

Author:

woorockets

Message:

Fix Visual editor and imagesize image

Location:

wr-pagebuilder/trunk

Files:

• README.txt (modified) (1 diff)
• assets/woorockets/js/handle_setting.js (modified) (2 diffs)
• core/core.php (modified) (1 diff)
• shortcodes/image/image.php (modified) (1 diff)
• shortcodes/testimonial/testimonial.php (modified) (1 diff)
• shortcodes/text/assets/js/text.js (modified) (1 diff)
• wr-pagebuilder.php (modified) (1 diff)

wr-pagebuilder/trunk/README.txt

@@ -135 +135 @@
 
  * Updated Polish translation
+ 
+ = 2.5.3 =
+
+ * Fixed Some minor bugs

wr-pagebuilder/trunk/assets/woorockets/js/handle_setting.js

@@ -506 +506 @@
         return tmp_content;
     }
-
+    
     // Load preview iframe
     $.HandleSetting.loadIframe = function(curr_iframe, url, tmp_content) {
@@ -527 +527 @@
 
             $('#wr_previewing').val('0');
+
+            // Set global variable when iframe has loaded
+            iframe_load_completed = true;
+            //console.log(iframe_load_completed)
         });
 

wr-pagebuilder/trunk/core/core.php

@@ -164 +164 @@
 
         do_action( 'wr_pb_custom_hook' );
+
+        // global variable iframe_load_completed to use in checking load iframe in Text Element Editor
+        add_action( 'admin_head', array( &$this, 'add_custom_global_variable' ) );
+    }
+
+
+    /**
+    * use global variable for Text Element Editor in loading iframe
+    */
+
+    function add_custom_global_variable () { 
+    ?>
+
+        <script type="text/javascript">
+            //alert("ss");
+            var iframe_load_completed = false;
+
+        </script>
+
+    <?php 
     }
 

wr-pagebuilder/trunk/shortcodes/image/image.php

@@ -220 +220 @@
             $image_id       = WR_Pb_Helper_Functions::get_image_id( $image_file );
             $attachment     = wp_prepare_attachment_for_js( $image_id );
-            $image_file     = ( ! empty( $attachment['sizes'][$image_size]['url'] ) ) ? $attachment['sizes'][$image_size]['url'] : $image_file;
-            $data = getimagesize( $image_file );
-            $width = $data[0];
-            $height = $data[1];
+            $image_file     = ( ! empty( $attachment['sizes'][$image_size]['url'] ) ) ? $attachment['sizes'][$image_size]['url'] : $image_file;         
+            
+            $width = $attachment['sizes'][$image_size]['width'];
+            $height = $attachment['sizes'][$image_size]['height'];
+            
             $html_elemments .= "<img width='{$width}' height='{$height}' src='{$image_file}'{$alt_text}{$class_img} />";
             $script         = '';

wr-pagebuilder/trunk/shortcodes/testimonial/testimonial.php

@@ -222 +222 @@
             }
 
-            if ( isset ( $item['image_file'] ) && ! empty( $item['image_file'] ) ) {
-                $data = getimagesize( $item['image_file'] );
-                $width = $data[0];
-                $height = $data[1];
+            if ( isset ( $item['image_file'] ) && ! empty( $item['image_file'] ) ) {                
+                $width = $attachment['sizes'][$image_size]['width'];
+                $height = $attachment['sizes'][$image_size]['height'];
                 $img = "<div class='wr-testimonial-avatar'><img width='{$width}' height='{$height}' class='$image_container_style' src='{$item['image_file']}' /></div>";
             } else {

wr-pagebuilder/trunk/shortcodes/text/assets/js/text.js

@@ -29 +29 @@
     };
 
-    $(document).ready(function () {
+    $(document).ready(function () {        
         $.WR_Text();
+        $('#content-html').click();        
+        var intTimeout = 5000;
+        var intAmount = 100;
+        var isInit = false;
+        $('#param-text-tmce').removeAttr('onclick');
+        $('#param-text-tmce').off('click');
+        var ifLoadedInt = setInterval(function(){
+            if (iframe_load_completed || intAmount >= intTimeout) {                
+                initContentEditor = tinyMCEPreInit.mceInit['param-text'];              
+               intAmount += 100;
+                initContentEditor.setup = function(ed){
+                    ed.on('blur', function(){
+                        if ( $('.mce-tinymce').length > 1) {
+                            $('.mce-tinymce').first().hide();    
+                        }                        
+                         tinyMCE.triggerSave();
+                         jQuery('.wr_pb_editor').first().trigger('change');
+                    });
+                }
+                // Visual Tab
+                $('#param-text-tmce').click(function(){                    
+                    setTimeout( function(){
+                         if ( $('.mce-tinymce').length > 1) {
+                            $('.mce-tinymce').first().hide();    
+                        }
+                    },500);                   
+                    tinymce.remove(tinymce.get('param-text'));
+                    tinymce.init(initContentEditor);                     
+                    isInit = true;
+                    $('#wp-content-wrap').removeClass('html-active');
+                    $('#wp-content-wrap').addClass('tmce-active');
+                });
 
-        // Fix conflict script when create new tinymce editor
-        $('#content-html').click();
-        tinymce.remove(tinymce.get('param-text'));
+                // Text tab
+                $('#param-text-html').click(function(){
+                    setTimeout( function(){
+                         if ( $('.mce-tinymce').length > 1) {
+                            $('.mce-tinymce').first().hide();    
+                        }
+                    },500);                    
+                    tinymce.remove(tinymce.get('param-text'));
+                    tinymce.init(initContentEditor); 
+                    $('#wp-content-wrap').removeClass('tmce-active');
+                    $('#wp-content-wrap').addClass('html-active');
+                });
+                iframe_load_completed = false;
+                window.clearInterval(ifLoadedInt);
+            }                
+        },
+        intAmount
+        );    
 
-        // Re-init content editor
-        if (initContentEditor == null) {
-            initContentEditor = tinyMCEPreInit.mceInit['content'];
-        }
-        $('#content-tmce').removeAttr('onclick');
-        $('#content-tmce').off('click');
-        $('#content-tmce').click(function() {
-            tinymce.remove(tinymce.get('content'));
-            tinymce.init(initContentEditor);
-            $('#wp-content-wrap').removeClass('html-active');
-            $('#wp-content-wrap').addClass('tmce-active');
-        });
+
     });
 })(jQuery);

wr-pagebuilder/trunk/wr-pagebuilder.php

@@ -4 +4 @@
  * Plugin URI:  http://www.woorockets.com
  * Description: Awesome content builder for Wordpress websites
- * Version:     2.5.2
+ * Version:     2.5.3
  * Author:      WooRockets Team <[email protected]>
  * Author URI:  http://www.wordpress.org/plugins/wr-pagebuilder