Changeset 1363759

Timestamp:

03/04/2016 03:19:36 AM (10 years ago)

Author:

woorockets

Message:

Release version 2.5.4

Location:

wr-pagebuilder/trunk

Files:

• README.txt (modified) (1 diff)
• assets/woorockets/css/page_builder.css (modified) (1 diff)
• core/core.php (modified) (1 diff)
• core/helper/type.php (modified) (2 diffs)
• shortcodes/text/assets/js/text.js (modified) (1 diff)
• shortcodes/text/text.php (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
+
+ = 2.5.4 =
+
+ * Fixed Bug editor in text element

wr-pagebuilder/trunk/assets/woorockets/css/page_builder.css

@@ -126 +126 @@
 #modalOptions .wp-switch-editor {
     height: 27px !important;
+}
+#modalOptions #wp-param-text-media-buttons #wr_pb_button {
+    display: none;
 }
 

wr-pagebuilder/trunk/core/core.php

@@ -167 +167 @@
         // 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' ) );
-    }
-
+
+        // Add wp editor html
+        add_action( 'wr_pb_footer', array( __CLASS__, 'text_html_wp_editor' ) );
+
+    }
+
+    /**
+    * Render html wp editor
+    */
+    public static function text_html_wp_editor() {
+        echo "<script type='text/html' id='tmpl-wr-editor'>";
+            wp_editor( '_WR_CONTENT_', 'param-text', array(
+                                        'textarea_name' => 'param-text',
+                                        'textarea_rows' => 15,
+                                        'editor_class' => 'wr_pb_editor'
+                                    )
+            );
+        echo '</script>';
+    }
 
     /**

wr-pagebuilder/trunk/core/helper/type.php

@@ -735 +735 @@
          */
         static function get_single_by_post_types( $posttype = '' ) {
+            global $wpdb;
+            
             $posttypes = self::get_post_types();
             $results   = array();
@@ -740 +742 @@
                 if ( ! isset( $results[$slug] ) )
                 $results[$slug] = array();
-                // query post by post type
-                $args = array( 'post_type' => $slug, 'posts_per_page' => -1, 'post_status' => ($slug == 'attachment' ) ? 'inherit' : 'publish' );
-                $query = new WP_Query( $args );
-                while ( $query->have_posts() ) {
-                    $query->the_post();
-                    $results[$slug][get_the_ID()] = __( get_the_title(), WR_PBL );
-                }
-                wp_reset_postdata();
+            
+                $list_post = $wpdb->get_results( "SELECT ID, post_title FROM $wpdb->posts  WHERE post_type = '" . $slug . "' AND post_status = '" . ( ( $slug == 'attachment' ) ? 'inherit' : 'publish' ) . "'  ORDER BY post_date DESC", ARRAY_A );
+                
+                if( $list_post ) {
+                    foreach( $list_post as $val ) {
+                        $results[ $slug ][ $val['ID'] ] = __( $val['post_title'], WR_PBL );
+                    }
+                }
+                
             }
             if ( $posttype )
-            return $results[$posttype];
+                return $results[$posttype];
+            
             return $results;
         }

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

@@ -31 +31 @@
     $(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 intAmount  = 100;
+
         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');
-                });
+            if (iframe_load_completed || intAmount >= intTimeout) {
 
-                // 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');
-                });
+                var text_content = $( '#param-text.form-control' ).html();
+
+                var wr_editor = $( '#tmpl-wr-editor' ).html();
+
+                wr_editor = wr_editor.replace( '_WR_CONTENT_', text_content );
+
+                $( '#param-text' ).after( wr_editor );
+
+                $( '#param-text.form-control' ).remove();
+
+                ( function() {
+                    var init, id, $wrap;
+
+                    // Render Visual Tab
+                    for ( id in tinyMCEPreInit.mceInit ) {
+                        if ( id != 'param-text' )
+                            continue;
+
+                        init  = tinyMCEPreInit.mceInit[id];
+                        $wrap = tinymce.$( '#wp-' + id + '-wrap' );
+
+                        tinymce.remove(tinymce.get('param-text'));
+                        tinymce.init( init );
+
+                        setTimeout( function(){
+                            $( '#wp-param-text-wrap' ).removeClass( 'html-active' );
+                            $( '#wp-param-text-wrap' ).addClass( 'tmce-active' );
+                        }, 10 );
+
+                        if ( ! window.wpActiveEditor )
+                                window.wpActiveEditor = id;
+
+                        break;
+                    }
+
+                    // Render Text tab
+                    for ( id in tinyMCEPreInit.qtInit ) {
+                        if ( id != 'param-text' )
+                            continue;
+
+                        quicktags( tinyMCEPreInit.qtInit[id] );
+
+                        // Re call inset quicktags button
+                        QTags._buttonsInit();
+
+                        if ( ! window.wpActiveEditor )
+                            window.wpActiveEditor = id;
+
+                        break;
+                    }
+                }());
+
                 iframe_load_completed = false;
                 window.clearInterval(ifLoadedInt);
-            }                
+            }
         },
         intAmount
-        );    
-
+        );
 
     });

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

@@ -75 +75 @@
                     'desc' => __( 'Enter some content for this textblock', WR_PBL ),
                     'id'   => 'text',
-                    'type' => 'tiny_mce',
+                    'type' => 'text_area',
                     'role' => 'content',
                     'std'  => WR_Pb_Helper_Type::lorem_text(),

wr-pagebuilder/trunk/wr-pagebuilder.php

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