Changeset 2235095

Timestamp:

01/29/2020 09:53:33 AM (6 years ago)

Author:

anyclip

Message:

Updated version

Location:

anyclip-media/trunk

Files:

• anyclip-media.php (modified) (2 diffs)
• css/anyclip-media.css (modified) (1 diff)
• inc/anyclip-media-block.php (modified) (2 diffs)
• inc/anyclip-media-classic-editor.php (modified) (6 diffs)
• js/anyclip-editor-plugin.js (modified) (4 diffs)
• js/anyclip-media-classic.js (modified) (4 diffs)
• js/anyclip-media.js (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

anyclip-media/trunk/anyclip-media.php

@@ -5 +5 @@
  * Description: Anyclip media plugin inserts playlists.
  * Author: Anyclip R&D team
- * Version: 1.0.1
+ * Version: 1.0.3
  * Author URI:  https://anyclip.com
  * Text Domain: inserts
@@ -17 +17 @@
 require_once(plugin_dir_path(__FILE__) . 'inc/anyclip-media-const.php');
 require_once(plugin_dir_path(__FILE__) . 'inc/anyclip-media-block.php');
+require_once(plugin_dir_path(__FILE__) . 'inc/anyclip-video-block.php');
 require_once(plugin_dir_path(__FILE__) . 'inc/anyclip-media-classic-editor.php');
+require_once(plugin_dir_path(__FILE__) . 'inc/anyclip-video-classic-editor.php');

anyclip-media/trunk/css/anyclip-media.css

@@ -10 +10 @@
 }
 
+.video-playlist-title-wrapper {
+    display: flex;
+    margin-top: 9px;
+}
+
+.title {
+    margin-left: 16px;
+}
+
 span[data-mce-p-class="anyclip-media"] {
     width: 100%;

anyclip-media/trunk/inc/anyclip-media-block.php

@@ -13 +13 @@
     );
     wp_localize_script('anyclip-media-block', 'constants', array(
-        'ANYCLIP_EDITORIAL_URL' => ANYCLIP_EDITORIAL_URL
+        'ANYCLIP_EDITORIAL_URL' => ANYCLIP_EDITORIAL_URL,
+        'ANYCLIP_ASSETS_URL' => plugin_dir_url(__FILE__) . '../assets',
     ));
     wp_enqueue_style(
@@ -42 +43 @@
 }
 
-add_action( 'init', 'anyclip_gutenberg_media_init' );
+add_action('init', 'anyclip_gutenberg_media_init');

anyclip-media/trunk/inc/anyclip-media-classic-editor.php

@@ -12 +12 @@
     
     
-    if ( preg_match_all( '/'. $pattern .'/s', $post->post_content, $matches ) ) {
+    if (preg_match_all('/'. $pattern .'/s', $post->post_content, $matches)) {
         $keys = array();
         $result = array();
-        foreach( $matches[0] as $key => $value) {
+        foreach($matches[0] as $key => $value) {
             // $matches[3] return the shortcode attribute as string
             // replace space with '&' for parse_str() function
-            $get = str_replace(" ", "&" , $matches[3][$key] );
+            $get = str_replace(" ", "&" , $matches[3][$key]);
             parse_str($get, $output);
     
             //get all shortcode attribute keys
-            $keys = array_unique( array_merge(  $keys, array_keys($output)) );
+            $keys = array_unique(array_merge($keys, array_keys($output)));
             $result[] = $output;
-    
         }
         //var_dump($result);
-        if ( $keys && $result ) {
+        if ($keys && $result) {
             // Loop the result array and add the missing shortcode attribute key
             foreach ($result as $key => $value) {
                 // Loop the shortcode attribute key
                 foreach ($keys as $attr_key) {
-                    $result[$key][$attr_key] = isset( $result[$key][$attr_key] ) ? $result[$key][$attr_key] : NULL;
+                    $result[$key][$attr_key] = isset($result[$key][$attr_key]) ? $result[$key][$attr_key] : NULL;
                 }
                 //sort the array key
-                ksort( $result[$key]);              
+                ksort($result[$key]);              
             }
         }
@@ -63 +62 @@
         </div>
 
-        <a href="/?TB_inline&width=600&height=550&inlineId=my-modal-id" class="thickbox button">
+        <a href="/?TB_inline&width=1024&height=550&inlineId=my-modal-id" class="thickbox button">
             <span class="dashicons dashicons-playlist-video" style="vertical-align: text-top"></span>
             AnyClip Playlist
@@ -72 +71 @@
         add_thickbox();
         $template = <<<acm
-    <div id="anyclip-meida-content" style="display:none;">
+    <div id="anyclip-media-content" style="display:none;">
     </div>
-    <a href="%s&TB_iframe=true&width=900&inlineId=anyclip-meida-content" class="thickbox button">
+    <a href="%s&TB_iframe=true&width=1024&inlineId=anyclip-media-content" class="thickbox button">
         <span class="dashicons dashicons-playlist-video" style="vertical-align: text-top"></span>
         AnyClip Playlist
@@ -91 +90 @@
 
 function anyclip_js($plugins) {
-    if ( !function_exists('has_blocks') || !has_blocks() ) {
+    if (!function_exists('has_blocks') || !has_blocks()) {
         wp_enqueue_script('anyclip_media', plugins_url('../js/anyclip-media-classic.js', __FILE__), array('jquery', 'jquery-ui-core', 'jquery-ui-dialog'));
     };
@@ -97 +96 @@
     wp_localize_script('anyclip_media', 'constants', array(
         'ANYCLIP_EDITORIAL_URL' => ANYCLIP_EDITORIAL_URL,
+        'ANYCLIP_ASSETS_URL' => plugin_dir_url(__FILE__) . '../assets',
         'pluginsUrl' => plugins_url()
     ));
 
-    add_editor_style(plugins_url( '../css/anyclip-media.css' , __FILE__ ) );    
+    add_editor_style(plugins_url('../css/anyclip-media.css' , __FILE__ ));    
 }
 
-add_filter( 'anyclip_mce_external_plugins', 'anyclip_mce_external_plugins' );
+add_filter('anyclip_mce_external_plugins', 'anyclip_mce_external_plugins');
 
-function anyclip_mce_external_plugins( $plugin_array ) {
+function anyclip_mce_external_plugins($plugin_array) {
     return $array_merge($plugin_array, [
-        'anyclip-media' => plugins_url( '../js/anyclip-editor-plugin.js' , __FILE__ )
+        'anyclip-media' => plugins_url('../js/anyclip-editor-plugin.js', __FILE__)
     ]);
 }
@@ -123 +123 @@
     );
 
-    return $content?base64_decode($content) : '';
+    return $content ? base64_decode($content) : '';
 }
 

anyclip-media/trunk/js/anyclip-editor-plugin.js

@@ -2 +2 @@
     let currentAttrs;
 
-    tinymce.PluginManager.add('anyclip-media', function( editor, url ) {
+    tinymce.PluginManager.add('anyclip-media', function(editor, url) {
         var sh_tag = 'anyclip-media';
  
-        function replaceShortcodes( content ) {
-            return content.replace( /\[anyclip-media([^\]]*)\]([^\]]*)\[\/anyclip-media\]/g, function( all,attr,con) {
+        function replaceShortcodes(content) {
+            return content.replace(/\[anyclip-media([^\]]*)\]([^\]]*)\[\/anyclip-media\]/g, function(all, attr, con) {
                 currentAttrs = attr;
                 return '<iframe class="anyclip-media" scrolling="no" id="anyclip-media" data-content="'+ btoa(attr) +'" ></iframe>';
@@ -12 +12 @@
         }
  
-        function restoreShortcodes( content ) {
-            return content.replace( /\<iframe.*anyclip\-media.*\<\/iframe\>/g, function( match ) {
-                return '[anyclip-media '+currentAttrs+'][/anyclip-media]';
+        function restoreShortcodes(content) {
+            return content.replace(/\<iframe.*anyclip\-media.*\<\/iframe\>/g, function(match) {
+                return '[anyclip-media ' + currentAttrs + '][/anyclip-media]';
             });
         }
@@ -20 +20 @@
         //replace from shortcode to an image placeholder
         editor.on('BeforeSetcontent', function(event){
-            event.content = replaceShortcodes( event.content );
+            event.content = replaceShortcodes(event.content);
         });
 
@@ -32 +32 @@
                 });
 
-                let acLogo = '<img style="position:absolute; top:5px; left:5px; opacity: 0.7;" src="'+url+'/../css/AnyClip-graystyle.png"/>';
+                let acLogo = '<img style="position:absolute; top:5px; left:5px; opacity: 0.7;" src="' + url + '/../css/AnyClip-graystyle.png"/>';
 
-                let acContent = acLogo + "<img style=\"width: 100%;\" src="+params.thumbnail+"/>";
+                let acContent = acLogo + "<img style=\"width: 100%;\" src=" + params.thumbnail + "/>";
 
                 const iframeElement = document.querySelector('iframe#content_ifr').contentDocument.body.querySelector('iframe.anyclip-media');

anyclip-media/trunk/js/anyclip-media-classic.js

@@ -1 +1 @@
 jQuery(document).ready(function ($) {
     window.addEventListener("message", (msg) => {
-        if (msg && msg.data) {
+        if (msg && msg.data && msg.data.embed) {
             doInsert({
                 embedCode: msg.data.embed.embedCode,
@@ -16 +16 @@
         let editorContent = getMceContent();
         
-        if(editorContent.match(acRegEx)) {
+        if (editorContent.match(acRegEx)) {
             editorContent = editorContent.replace(acRegEx, () => generateSortCode(data));
     
-            var activeEditor = tinymce.activeEditor ? tinymce.activeEditor:null;
-            if(activeEditor!==null){
+            var activeEditor = tinymce.activeEditor ? tinymce.activeEditor : null;
+            if (activeEditor !== null) {
                 activeEditor.setContent(editorContent);
             } else {
@@ -42 +42 @@
         if (jQuery("#wp-content-wrap").hasClass("tmce-active")){
             return tinyMCE.activeEditor.getContent();
-        }else{
+        } else {
             return jQuery('textarea.wp-editor-area#content').val();
         }
@@ -51 +51 @@
 
     window.eduResModalShow = function(that){
-        tb_show( 'AnyClip Media', constants.ANYCLIP_EDITORIAL_URL+'/?TB_iframe&width=700&height=500' );
+        tb_show( 'AnyClip Media', constants.ANYCLIP_EDITORIAL_URL+'?TB_iframe&width=1024&height=500' );
         return false;
     }

anyclip-media/trunk/js/anyclip-media.js

@@ -9 +9 @@
 
 wp.blocks.registerBlockType('anyclip/media-box', {
-    title: 'Anyclip Media',
+    title: 'AnyClip Playlist',
     description: 'Block inserts anyclip player',
-    icon: 'format-video',
+    icon: 'playlist-video',
     category: 'common',
     supports: {
-        multiple: false,
+        multiple: true,
         html: true,
         reusable: false,
@@ -46 +46 @@
         const { attributes: { contentHTML, thumbnail, playlistId }, setAttributes } = props;
         const postTitle = wp.data.select('core/editor').getCurrentPostAttribute('title');
-        const msgEventListner = (msg) => {
-            if (msg && msg.data) {
+        const msgEventListener = (msg) => {
+            if (msg && msg.data && msg.data.embed) {
                 doInsert({
                     embedCode: msg.data.embed.embedCode,
-                    thumbnail: msg.data.thumbnail,
+                    thumbnail: msg.data.thumbnail || '',
                     playlistId: msg.data.playlistId
                 })
@@ -84 +84 @@
             });
 
-            window.removeEventListener("message", msgEventListner, false);
+            window.removeEventListener("message", msgEventListener, false);
 
             updateContent(data);
@@ -104 +104 @@
             wp.element.createElement(
                 'div', 
-                {className: "components-placeholder"},
-            // props.attributes.content?
-                thumbnail && thumbnail.length ?
-                    wp.element.createElement('img', {
-                        src: thumbnail
-                    })
-                    : wp.element.createElement(wp.components.Icon, {
+                {
+                    className: "components-placeholder",
+                },
+
+                thumbnail && thumbnail.length
+                ?
+                wp.element.createElement('img', {
+                    src: thumbnail,
+                })
+                :
+                wp.element.createElement(wp.components.Icon, {
                     icon: 'format-video',
                     size: 320,
-                    }, '')
-            // :null,
-                ,wp.element.createElement(wp.components.IconButton, {
-                    icon: "media-video",
+                },
+                    ''
+                ),
+                wp.element.createElement(wp.components.IconButton, {
+                    icon: "playlist-video",
                     onClick: openModal,
-                    isLarge: !0
-                }, contentHTML ? __('Edit', 'anyclip-media') : __("Anyclip Media", "anyclip-media"))
-                , props.attributes.isModalOpen ?
-                    window.removeEventListener("message", msgEventListner) ||
-                    window.addEventListener("message", msgEventListner, false) ||
+                    isLarge: !0,
+                },
+                    contentHTML ? __('Edit', 'anyclip-media') : __("AnyClip Playlist", "anyclip-media")
+                ),
 
-                    React.createElement(wp.components.Modal, {
-                        shouldCloseOnEsc: true,
-                        isDefault: true,
-                        shouldCloseOnClickOutside: false,
-                        onRequestClose: closeModal,
-                        title: `Insert AnyClip Playlist`,
-                    },
-                    React.createElement("iframe", {
-                        src: `${constants.ANYCLIP_EDITORIAL_URL}?playlist=${playlistId}&mode=wp&title=${postTitle}`,
-                        className: 'anyclip-media-iframe'
-                    }),)
+                props.attributes.isModalOpen
+                ?
+                window.removeEventListener("message", msgEventListener)
+                ||
+                window.addEventListener("message", msgEventListener, false)
+                ||
+                React.createElement(wp.components.Modal, {
+                    shouldCloseOnEsc: true,
+                    isDefault: true,
+                    shouldCloseOnClickOutside: false,
+                    onRequestClose: closeModal,
+                    title: wp.element.createElement(
+                        'div',
+                        { className: 'video-playlist-title-wrapper' },
+                        wp.element.createElement('img', {
+                            src: `${window.constants.ANYCLIP_ASSETS_URL}/anyclip-logo-transparent.png`,
+                            width: '40px',
+                        }),
+                        wp.element.createElement('span', { className: 'title' }, 'Insert AnyClip Playlist')
+                    ),
+                },
+                React.createElement("iframe", {
+                    src: `${constants.ANYCLIP_EDITORIAL_URL}?playlist=${playlistId}&mode=wp&title=${postTitle}`,
+                    className: 'anyclip-media-iframe'
+                }),
+                )
                 : null,
 

anyclip-media/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.2.5
 Tested up to: 5.2.5
-Stable tag: 1.0.1
+Stable tag: 1.0.3
 Requires PHP: 7.2
 License: GPLv2
@@ -33 +33 @@
 == Changelog ==
 
-= 1.0.1 =
+= 1.0.3 =
 * AnyClip video platform plugin for WordPress
-* Insert AnyClip video player into post/page by the block AnyClip Media
-* Search video library on AnyClip
-* Create a playlist by adding videos 
-* Insert playlist into post/page
-* Preview and publish post/page with AnyClip player and playlist
+* Insert AnyClip video into post/page by the new block AnyClip Video
+* Support for multiple insert into post
+* Bug fixes