Changeset 2248759

Timestamp:

02/22/2020 03:21:55 PM (6 years ago)

Author:

platformlycom

Message:

Integration with Elementor plugin

Location:

platformly/trunk

Files:

• css/editor_btn.css (modified) (1 diff)
• inc/ply.btn.php (modified) (12 diffs)
• js/editor_btn.js (modified) (1 diff)
• js/ply_add_link_functions.js (modified) (6 diffs)
• js/ply_editor_btn_functions.js (modified) (2 diffs)
• platformly.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

platformly/trunk/css/editor_btn.css

@@ -133 +133 @@
     margin-right: -13px;
 }
+
+#ply-dialog-link-settings {
+    display: none;
+    padding: 5px 10px 10px 10px;
+    font-weight: bold;
+    border-top: 1px solid #dfdfdf;
+    position: relative;
+}
+#ply-dialog-link-settings table {
+    margin: 0px auto;
+}
+#ply-link-text-error,
+#ply-link-url-error {
+    display: none;
+    font-weight: 300;
+}

platformly/trunk/inc/ply.btn.php

@@ -10 +10 @@
 </div>
 <script type="text/javascript">
-    <?php if(!empty($projectCodeInclude) && !empty($projectCode)): ?>
-        var plyProjectMsg = "A code from Project '<span class='ply-project-name'></span>' is being used on this site.";
-        var plyProjectId = '<?php echo $projectCode['ply_project_id'] ?>';
-    <?php else: ?>
-        var plyProjectMsg = 'You must include a Platform.ly project code within your site, please <a href="<?php echo get_admin_url(null, 'admin.php?page=ply') ?>">"click here"</a> to do it now.';
-        var plyProjectId = 0;
-    <?php endif; ?>
+<?php if(!empty($projectCodeInclude) && !empty($projectCode)): ?>
+    var plyProjectMsg = "A code from Project '<span class='ply-project-name'></span>' is being used on this site.";
+    var plyProjectId = '<?php echo $projectCode['ply_project_id'] ?>';
+<?php else: ?>
+    var plyProjectMsg = 'You must include a Platform.ly project code within your site, please <a href="<?php echo get_admin_url(null, 'admin.php?page=ply') ?>">"click here"</a> to do it now.';
+    var plyProjectId = 0;
+<?php endif; ?>
+    var editInElementor = <?php echo isEditInElementor() ? 'true' : 'false'; ?>;
+    var siteUrl = '<?php echo home_url(); ?>';
+
     jQuery(function ($) {
         // initalise the dialog
@@ -28 +31 @@
             resizable: false,
             closeOnEscape: true,
-            maxHeight: 500,
+            maxHeight: 550,
             dialogClass: "ply-dialog-editor",
             position: {
@@ -34 +37 @@
                 at: "center",
                 of: window
+            },
+            close: function () {
+                $('#ply-dialog-link-settings').hide();
             },
             open: function () {
@@ -52 +58 @@
                 $('.ui-dialog-titlebar-close').addClass('ui-button');
                 $('.ply-dialog-editor .ui-dialog-buttonpane').before('<div id="ply-dialog-footer"></div>');
+                $('#ply-dialog-footer').after('<div id="ply-dialog-link-settings"></div>');
             },
             buttons: [{
@@ -62 +69 @@
                                     enteredUrl = jQuery('.chosenCustomLink:checked').data('mainlink') + '?' + (($("#trc1").val() != '') ? '&c1=' + $("#trc1").val() : '') + (($("#trc2").val() != '') ? '&c2=' + $("#trc2").val() : '') + (($("#trc3").val() != '') ? '&c3=' + $("#trc3").val() : '') + (($("#trc4").val() != '') ? '&c4=' + $("#trc4").val() : '');
                                 }
+
                                 if(plySelectedWord.value.start == plySelectedWord.value.end){
                                     var newElement = wp.richText.insert(plySelectedWord.value, enteredUrl);
@@ -69 +77 @@
                                         type: 'core/link',
                                         attributes: {
-                                            url: enteredUrl,
+                                            url: enteredUrl
                                         }
                                     }));
@@ -76 +84 @@
                                         type: 'core/link',
                                         attributes: {
-                                            url: enteredUrl,
+                                            url: enteredUrl
                                         }
                                     }));
@@ -119 +127 @@
                             var action = selectedEvent.find('.existing-action span').text();
                             var eventCode = "<script type='text/javascript'>plyt('"+action.replace(/[^a-zA-Z0-9_ ]/gi, "")+"', '"+description.replace(/[^a-zA-Z0-9_ ]/gi, "")+"','"+encodeURIComponent(id)+"');<\/script>";
-                            insertedBlock = wp.blocks.createBlock('core/html', {
-                                content: eventCode,
-                            });
-                            wp.data.dispatch('core/editor').insertBlocks(insertedBlock, 0);
+
+                            if(typeof wp.richText !== 'undefined'){
+                                // Using WP blocks editor
+                                insertedBlock = wp.blocks.createBlock('core/html', {
+                                    content: eventCode
+                                });
+                                wp.data.dispatch('core/editor').insertBlocks(insertedBlock, 0);
+                            } else if(typeof window.tinymce !== 'undefined' && !tinymce.activeEditor.isHidden()) {
+                                // Using TinyMCE editor
+                                tinymce.activeEditor.insertContent(eventCode);
+                            }
                             closePlyDialog();
                         }else{
@@ -133 +148 @@
                     text: "Add on Link Click",
                     click: function() {
+                        var link_text, link_url = siteUrl;
+                        // Validate link settings
+                        if (jQuery('#ply-dialog-link-settings').css('display') !== 'none') {
+                            if (jQuery('#ply_dialog_link_text').val() === '') {
+                                jQuery('#ply-link-text-error').show();
+                                return;
+                            }
+                            if (jQuery('#ply_dialog_link_url').val() === '') {
+                                jQuery('#ply-link-url-error').show();
+                                return;
+                            }
+                            link_text = jQuery('#ply_dialog_link_text').val();
+                            link_url  = jQuery('#ply_dialog_link_url').val();
+                        }
+
                         var id = jQuery('.chosenEvent:checked').val();
                         if(typeof id !== 'undefined' && id.length > 0){
@@ -139 +169 @@
                             var action = selectedEvent.find('.existing-action span').text();
                             var eventCodeClick = "plyt('"+action.replace(/[^a-zA-Z0-9_ ]/gi, "")+"', '"+description.replace(/[^a-zA-Z0-9_ ]/gi, "")+"','"+encodeURIComponent(id)+"');";
-                            if(Object.keys(plySelectedWord).length > 0){
-                                var activeLink = wp.richText.getActiveFormat(plySelectedWord.value, 'core/link');
-                                var attributes = {
-                                        url: 'javascript:;',
+
+                            if(typeof wp.richText !== 'undefined'){
+                                if(Object.keys(plySelectedWord).length > 0){
+                                    var activeLink = wp.richText.getActiveFormat(plySelectedWord.value, 'core/link');
+                                    var attributes = {
+                                        url: link_url,
                                         onclick: eventCodeClick
-                                    }
-                                if(typeof activeLink !== 'undefined'){
-                                    attributes.url = activeLink.attributes.url;
-                                    if(typeof activeLink.attributes.target !== 'undefined'){
-                                        attributes.target = activeLink.attributes.target;
-                                    }
-                                }
-                                plySelectedWord.onChange(wp.richText.applyFormat(plySelectedWord.value, {
-                                    type: 'core/link',
-                                    attributes: attributes
-                                }));
-                            }else if(Object.keys(plyEventButton).length > 0){
-                                plyEventButton.setAttributes({onclick: eventCodeClick});
+                                    };
+
+                                    if(typeof activeLink !== 'undefined'){
+                                        attributes.url = activeLink.attributes.url;
+                                        if(typeof activeLink.attributes.target !== 'undefined'){
+                                            attributes.target = activeLink.attributes.target;
+                                        }
+                                    }
+
+                                    plySelectedWord.onChange(wp.richText.applyFormat(plySelectedWord.value, {
+                                        type: 'core/link',
+                                        attributes: attributes
+                                    }));
+                                } else if(Object.keys(plyEventButton).length > 0){
+                                    plyEventButton.setAttributes({onclick: eventCodeClick});
+                                }
+                            } else {
+                                if (typeof window.tinymce !== 'undefined' && !tinymce.activeEditor.isHidden()) {
+                                    var selectedText = tinymce.activeEditor.selection.getContent();
+                                    if (selectedText.length < 1) {
+                                        selectedText = link_text;
+                                    }
+
+                                    // Check if editing not in Elementor
+                                    if (elementor === 'undefined') {
+                                        tinymce.activeEditor.insertContent('<a href="javascript:;" onclick="eventCodeClick">' + selectedText + '</a>');
+                                    } else {
+                                        var a_id = 'a_plyt_'+id,
+                                            linkTag = '<a href="'+link_url+'" target="_blank" id="' + a_id + '">' + selectedText + '</a>',
+                                            scriptTag = '<script type="text/javascript">jQuery("#' + a_id + '").on("click", function() {' + eventCodeClick + '})<\/script>';
+                                        tinymce.activeEditor.insertContent(linkTag + scriptTag);
+                                    }
+                                } else {
+                                    var selectedText = getSelected();
+                                    if (selectedText.length < 1) {
+                                        selectedText = link_text;
+                                    }
+                                    QTags.insertContent('<a href="' + link_url + '" onclick="' + eventCodeClick + '">' + selectedText + '</a>');
+                                }
                             }
                             closePlyDialog();
@@ -197 +255 @@
                     text: "Remove Event",
                     click: function(){
-                        //console.log(plyEventButton);
                         delete plyEventButton.attributes.onclick;
                         closePlyDialog();
@@ -211 +268 @@
         });
     });
+
+<?php if (isEditInElementor()): ?>
+    elementor.hooks.addAction( 'panel/open_editor/widget/text-editor', function( panel, model, view ) {
+        setTimeout(function() {
+            elementorEditorAddButton();
+        }, 500);
+    } );
+<?php else: ?>
     QTags.addButton('platform_ly_link', 'Platform.ly', showPlyDialogOptions);
-    
+<?php endif; ?>
+
     function getBlockDOMNode(clientId){
         document.querySelector('[data-block="' + clientId + '"]');
     }
+
+    function elementorEditorAddButton() {
+        // get an instance of the editor
+        var editor = tinymce.activeEditor; //or tinymce.editors[0], or loop, whatever
+        var plyButtonName = 'platform_ly_link';
+
+        if (editor.buttons.hasOwnProperty(plyButtonName)) {
+            return;
+        }
+
+        //add a button to the editor buttons
+        editor.addButton(plyButtonName, {
+          title: 'Add Platform.ly Link',
+          icon: 'icon platform_ly_link_button',
+          onclick: function () {
+            showPlyDialogOptions();
+          }
+        });
+        //the button now becomes
+        var button=editor.buttons[plyButtonName];
+        //find the buttongroup in the toolbar found in the panel of the theme
+        var bg=editor.theme.panel.find('toolbar buttongroup')[0];
+        //without this, the buttons look weird after that
+        bg._lastRepaintRect=bg._layoutRect;
+        //append the button to the group
+        bg.append(button);
+    }
 </script>
-

platformly/trunk/js/editor_btn.js

@@ -1 +1 @@
 (function() {
     tinymce.PluginManager.add('platform_ly_link', function( editor, url ) {
+        console.log('tinymce.PluginManager.add');
+
         editor.addButton('platform_ly_link', {
             title: 'Add Platform.ly Link',

platformly/trunk/js/ply_add_link_functions.js

@@ -55 +55 @@
                 });
             });
-            jQuery('#ply-add-link-dialog').dialog({width: '600px'}).position({ my: "center", at: "center", of: window });
+            jQuery('#ply-add-link-dialog').dialog({width: '600px'}); // .position({ my: "center", at: "center", of: window });
         }
     });
@@ -86 +86 @@
                     </table>';
             jQuery('#ply-add-link-dialog').html(table);
-            jQuery('#ply-add-link-dialog').dialog('widget').position({ my: "center", at: "center", of: window });
+            jQuery('#ply-add-link-dialog').dialog('widget'); // .position({ my: "center", at: "center", of: window });
             jQuery('.ui-dialog-buttonpane button:contains("Add Link")').button().show();
         }else{
@@ -113 +113 @@
 }
 function showPlyDialogOptions(){
-    if(typeof wp.richText === 'undefined'){
+    if(typeof wp.richText === 'undefined' && typeof elementor === 'undefined'){
         jQuery('#ply-add-link-dialog').dialog('open');
         get_ply_tracking_links();
     }else{
         jQuery('#ply-add-link-dialog').dialog('open');
-        jQuery('#ply-add-link-dialog').dialog({width: '600px'}).position({ my: "center", at: "center", of: window });
+        jQuery('#ply-add-link-dialog').dialog({width: '600px'}); // .position({ my: "center", at: "center", of: window });
         var options = '<div id="ply-block-btns"><div class="ply-btn-etitor-block" onclick="get_ply_tracking_links()">Add a tracking link</div><div class="ply-btn-etitor-block" onclick="get_ply_projects()">Add an event</div></div>';
         jQuery('#ply-add-link-dialog').html(options);
@@ -188 +188 @@
                 var table = '<table id="links_table_toggle">\n\
                     <thead>\n\
-                         <th style="width: 40px;">Select</th>\n\
+                        <th style="width: 40px;">Select</th>\n\
                         <th>Date</th>\n\
                         <th>Action</th>\n\
@@ -212 +212 @@
                 jQuery('.ui-dialog-buttonpane button:contains("Add on Link Click")').button().show();
                 jQuery('.ui-dialog-buttonpane button:contains("Copy Code")').button().show();
+
+                // Check if no text selected
+                if (elementor !== 'undefined' && typeof window.tinymce !== 'undefined' && !tinymce.activeEditor.isHidden()) {
+                    var selectedText = tinymce.activeEditor.selection.getContent();
+                    if (selectedText.length === 0) {
+                        var ply_link_settings = '<div style="text-align: center;padding: 5px;">Add new link</div>\n\
+                            <table><tbody>\n\
+                            <tr><td style="padding: 5px;text-align: right;">Text</td><td style="width: 300px;"><input id="ply_dialog_link_text" type="text" onkeypress="jQuery(\'#ply-link-text-error\').hide();" placeholder="Click this one" required></td></tr>\n\
+                            <tr id="ply-link-text-error"><td></td><td style="color: red">This field is required</td></tr>\n\
+                            <tr><td style="padding: 5px;text-align: right;">URL</td><td style="width: 300px;"><input id="ply_dialog_link_url" type="text" onkeypress="jQuery(\'#ply-link-url-error\').hide();" placeholder="' + siteUrl + '" required></td></tr>\n\
+                            <tr id="ply-link-url-error"><td></td><td style="color: red">This field is required</td></tr>\n\
+                            </tbody></table>';
+                        jQuery('#ply-dialog-link-settings').html(ply_link_settings);
+                        jQuery('#ply-dialog-link-settings').show();
+                    }
+                }
             }else{
                 jQuery('#ply-add-link-dialog #ply-events-block').html("<div id='ply-default-event-msg'>You haven't created an Event for this project yet.</div>");
             }
-            jQuery('#ply-add-link-dialog').dialog({width: '600px'}).position({ my: "center", at: "center", of: window });
+            jQuery('#ply-add-link-dialog').dialog({width: '600px'}); // .position({ my: "center", at: "center", of: window });
         }
     });
@@ -221 +237 @@
 function showPlyDialogOnlyEventOptions(){
     jQuery('#ply-add-link-dialog').dialog('open');
-    jQuery('#ply-add-link-dialog').dialog({width: '600px'}).position({ my: "center", at: "center", of: window });
-    //console.log(plyEventButton);
+    jQuery('#ply-add-link-dialog').dialog({width: '600px'}); // .position({ my: "center", at: "center", of: window });
     if(typeof plyEventButton.attributes.onclick !== 'undefined' && plyEventButton.attributes.onclick != ''){
         jQuery('.ui-dialog-buttonpane button:contains("Edit Event")').button().show();
         jQuery('.ui-dialog-buttonpane button:contains("Remove Event")').button().show();
         jQuery('#ply-add-link-dialog').html("There's existing event for this button. Choose one of the following action.");
-        jQuery('#ply-add-link-dialog').dialog({width: '600px'}).position({ my: "center", at: "center", of: window });
+        jQuery('#ply-add-link-dialog').dialog({width: '600px'}); // .position({ my: "center", at: "center", of: window });
     }else{
         get_ply_projects();

platformly/trunk/js/ply_editor_btn_functions.js

@@ -5 +5 @@
       );
  */
-  var iconEl = el('span',{className: 'platform_ly_link_button_new'},
-            el('i',{
-                className: 'platform_ly_link_button',
-            })
-        );
+    var iconEl = el('span',{className: 'platform_ly_link_button_new'},
+        el('i',{
+            className: 'platform_ly_link_button'
+        })
+    );
  
     wp.richText.registerFormatType('platform-ly/link', {
-    title: 'Platform Link',
-    tagName: 'a',
-    attributes: {
-            url: 'href',
-            onclick: 'onclick',
-            target: 'target',
-    },
-    className: 'platform-ly-link',
-    edit: function( props ) {
+        title: 'Platform Link',
+        tagName: 'a',
+        attributes: {
+                url: 'href',
+                onclick: 'onclick',
+                target: 'target'
+        },
+        className: 'platform-ly-link',
+        edit: function( props ) {
             var selectedBlock = wp.data.select("core/editor").getSelectedBlock();
             if(selectedBlock.name != 'core/button'){
-        return wp.element.createElement(wp.editor.RichTextToolbarButton, {
-            icon: iconEl,
-            title: 'Add Platform.ly Link',
-            onClick: function() {
-                            plySelectedWord = props;
-                            plyEventButton = {};
-                            showPlyDialogOptions();
-                            //add_platform_ly_link();
-                /*props.onChange( wp.richText.toggleFormat( props.value, {type: 'platform-ly/link', attributes: {
-                    url: '#test',
-                } } ) );*/
-            },
-            isActive: props.isActive,
-        });
+                return wp.element.createElement(wp.editor.RichTextToolbarButton, {
+                    icon: iconEl,
+                    title: 'Add Platform.ly Link',
+                    onClick: function() {
+                        plySelectedWord = props;
+                        plyEventButton = {};
+                        showPlyDialogOptions();
+                        //add_platform_ly_link();
+                        /*props.onChange( wp.richText.toggleFormat( props.value, {type: 'platform-ly/link', attributes: {
+                            url: '#test',
+                        } } ) );*/
+                    },
+                    isActive: props.isActive
+                });
             }else{
                return []; 
             }
-    },
+        }
     });
 function withClientIdClassName(settings, name){
@@ -49 +49 @@
             source: "attribute",
             type: "string"
-        }
+        };
     }
     return settings;

platformly/trunk/platformly.php

@@ -4 +4 @@
 Plugin Name: Platform.ly Official
 Description: Platform.ly plugin is the easiest way to setup your optins and pages that your created with Platform.ly. After building your optin or page with our interactive WYSIWYG builders, you can set them up to show on your site with just a couple of clicks.
-Version: 1.6
+Version: 1.6.1
 Author: Platform.ly
 Author URI: https://www.platform.ly/
@@ -387 +387 @@
 }
 
-add_action('admin_head', 'add_mce_platform_ly_link');
-
 function platform_ly_editor_css(){
     wp_enqueue_style('ply_styles', plugin_dir_url(__FILE__) . "css/ply_styles.css");
@@ -394 +392 @@
 }
 
-add_action('admin_enqueue_scripts', 'platform_ly_editor_css');
+function add_mce_platform_ly_link_to_elementor_editor(){
+    platform_ly_editor_css();
+    add_mce_platform_ly_link();
+}
+
+/**
+ * Check if the user is currently editing using Elementor
+ * @return boolean
+ */
+function isEditInElementor() {
+    $path = parse_url($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], PHP_URL_PATH);
+    if (strpos($path, 'post.php') !== false && isset($_GET['action']) && $_GET['action'] === 'elementor') {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+if (isEditInElementor()) {
+    add_action('elementor/editor/before_enqueue_scripts', 'add_mce_platform_ly_link_to_elementor_editor');
+} else {
+    add_action('admin_enqueue_scripts', 'platform_ly_editor_css');
+    add_action('admin_head', 'add_mce_platform_ly_link');
+}
 
 function platform_ly_set_project_code(){

platformly/trunk/readme.txt

@@ -78 +78 @@
 == Upgrade Notice ==
 
+= 1.6.1 =
+- Integration with Elementor plugin
+
 = 1.6 =
 - Fixed jQuery issues