Changeset 1993190 for tinymce-advanced

Timestamp:

12/13/2018 12:18:14 AM (7 years ago)

Author:

azaozz

Message:

TinyMCE Advanced 4.8.1

Location:

tinymce-advanced/trunk

Files:

• block-editor (added)
• block-editor/block-editor.css (added)
• block-editor/block-register.js (added)
• block-editor/classic-paragraph.css (added)
• css/tadv-styles.css (modified) (13 diffs)
• js/tadv.js (modified) (2 diffs)
• mce/importcss/plugin.js (modified) (1 diff)
• mce/importcss/plugin.min.js (modified) (1 diff)
• mce/wptadv/plugin.js (modified) (2 diffs)
• mce/wptadv/plugin.min.js (modified) (1 diff)
• readme.txt (modified) (10 diffs)
• screenshot-1.png (modified) (previous)
• screenshot-2.png (modified) (previous)
• screenshot-3.png (modified) (previous)
• screenshot-4.png (modified) (previous)
• screenshot-5.png (modified) (previous)
• screenshot-6.png (added)
• tadv_admin.php (modified) (16 diffs)
• tinymce-advanced.php (modified) (32 diffs)

tinymce-advanced/trunk/css/tadv-styles.css

@@ -5 +5 @@
  * Copyright (c) 2007-2016 Andrew Ozz. All rights reserved.
  */
+
+.wrap.tinymce-advanced {
+    max-width: 900px;
+    margin: 10px 20px 0 10px;
+}
+
+#block-editor {
+    margin-bottom: 45px;
+    max-width: 672px;
+}
+
+#classic-editor,
+.tadv-submit-top {
+    margin-bottom: 45px;
+    width: 92%;
+}
+
+.rtl #classic-editor,
+.rtl .tadv-submit-top {
+    margin: 0 0 35px 280px;
+}
  
 .tadv-more-plugins label {
@@ -16 +37 @@
 
 .advanced-options {
-    margin: 20px 0;
-    border: 1px solid #ccc;
-    padding: 0 15px;
+    margin: 40px 0;
 }
 
@@ -28 +47 @@
     margin-left: 22px;
     margin-top: 5px;
+}
+
+.advanced-options .tadv-help {
+    margin: 1em 0;
 }
 
@@ -70 +93 @@
 
 ul.container,
-#unused {
+.unused {
     position: relative;
 }
@@ -105 +128 @@
 }
 
-#tadv-mce-menu {
+.tadv-mce-menu.mce-menubar {
     margin-bottom: 0;
     background: #fff;
@@ -114 +137 @@
 }
 
-#tadv-mce-menu.enabled {
+.tadv-mce-menu.enabled {
     opacity: 1;
     filter: alpha(opacity=100);
 }
 
-#tadv-mce-menu.mce-menubar .mce-menubtn:hover {
+.tadv-mce-menu.mce-menubar .mce-menubtn:hover {
     background: transparent;
 }
 
-#tadv-mce-menu .mce-btn .mce-caret {
+.tadv-mce-menu .mce-btn .mce-caret {
     margin-top: 9px;
     margin-left: 1px;
 }
 
-#tadv-mce-menu * {
+.tadv-mce-menu * {
     cursor: default;
 }
 
 #tadvzones,
-#unused {
+.unused {
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -146 +169 @@
 #tadvadmin #save {
     float: right;
-}
-
-#tadvzones {
-    margin: 25px 280px 0 0;
 }
 
@@ -159 +178 @@
 }
 
-#unuseddiv.highlighted,
+.unuseddiv .highlighted,
 .tadvdropzone.highlighted {
-    background-color: #efefe9;
+    background-color: #e4f2fd;
+    color: #000;
     border-color: #aaa;
 }
@@ -210 +230 @@
 }
 
-#unuseddiv {
+.unuseddiv {
     padding: 10px;
     border: 1px solid #ccc;
 }
 
-#unuseddiv h3 {
+.unuseddiv h4 {
     margin: 5px 5px 12px;
-}
-
-#unused li,
+    font-size: 1.2em;
+}
+
+.unused li,
 .tadvdropzone li {
     margin: 0;
@@ -229 +250 @@
 }
 
-#unused li {
+.unused li {
     margin: 4px;
 }
 
-#unused {
+.unused {
     margin: 0;
     min-height: 36px;
 }
 
-#unused .tadvmodule .tadvitem {
+.unused .tadvmodule .tadvitem {
     display: block;
-    height: 22px;
+    height: 24px;
     width: 140px;
     border: 1px solid #bbb;
@@ -255 +276 @@
 }
 
-#unused .tadvmodule .descr {
+.unused .tadvmodule .descr {
     display: inline;
     font-size: 12px;
@@ -261 +282 @@
 }
 
-#unused .tadvmodule .the-button .descr {
+.unused .tadvmodule .the-button .descr {
     padding: 0 4px;
     font-size: 13px;
@@ -302 +323 @@
 .tadv-error {
     color: #d54e21;
-    font-weight: bold;
-}
+}
+
+.tadv-block-editor .mce-menubtn {
+    margin: 6px 0;
+}
+
+#tadvadmin label {
+    vertical-align: text-bottom;
+}
+
+.tadv-block-editor.tadvdropzone {
+    height: 60px;
+}

tinymce-advanced/trunk/js/tadv.js

@@ -34 +34 @@
     });
 
+    $('.container-classic-block' ).sortable({
+        connectWith: '.container-classic-block',
+        items: '> li',
+        cursor: 'move',
+        stop: function( event, ui ) {
+            var toolbar_id;
+
+            if ( ui && ( toolbar_id = ui.item.parent().attr( 'id' ) ) ) {
+                ui.item.find( 'input.tadv-button' ).attr( 'name', toolbar_id + '[]' );
+            }
+        },
+        activate: function( event, ui ) {
+            $(this).parent().addClass( 'highlighted' );
+        },
+        deactivate: function( event, ui ) {
+            $(this).parent().removeClass( 'highlighted' );
+        },
+        revert: 300,
+        opacity: 0.7,
+        placeholder: 'tadv-placeholder',
+        forcePlaceholderSize: true,
+        containment: 'document'
+    });
+    
+
     $( '#menubar' ).on( 'change', function() {
-        $( '#tadv-mce-menu' ).toggleClass( 'enabled', $(this).prop('checked') );
+        $( '.tadv-mce-menu.tadv-classic-editor' ).toggleClass( 'enabled', $(this).prop('checked') );
+    });
+
+    $( '#menubar_block' ).on( 'change', function() {
+        $( '.tadv-mce-menu.tadv-block-editor' ).toggleClass( 'enabled', $(this).prop('checked') );
     });
 
@@ -86 +115 @@
         });
 
-        $( '#tadv-mce-menu .tadv-translate' ).each( function( i, element ) {
+        $( '.tadv-mce-menu .tadv-translate' ).each( function( i, element ) {
             var $element = $( element ),
                 text = $element.text();

tinymce-advanced/trunk/mce/importcss/plugin.js

@@ -75 +75 @@
     function append(styleSheet, imported) {
       var href = styleSheet.href, rules;
-      href = removeCacheSuffix(href);
+
+        if ( editor.settings.classic_block_editor ) {
+            // Attempt to import the CSS rules from the style tag.
+            tinymce.$( 'style' ).each( function( i, node ) {
+                var css = node.textContent || '';
+
+                if ( /theme name: /i.test( css ) || css.indexOf( 'TinyMCE' ) > -1 ) {
+                    try{
+                        rules = node.sheet.cssRules;
+                    } catch ( er ) {}
+                }
+            });
+
+            if ( rules ) {
+                tinymce.each( rules, function ( cssRule ) {
+                    if ( cssRule.selectorText ) {
+                        tinymce.each( cssRule.selectorText.split(','), function ( selector ) {
+                            selector = selector.replace( /^\.editor-styles-wrapper/, '' );
+
+                            if ( selector ) {
+                                selectors.push( tinymce.trim( selector ) );
+                            }
+                        });
+                    }
+                });
+
+                return;
+            }
+        }
+
+      href = removeCacheSuffix(href);
       if (!href || !fileFilter(href, imported) || isSkinContentCss(editor, href)) {
         return;

tinymce-advanced/trunk/mce/importcss/plugin.min.js

@@ -1 @@
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),d=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),v=tinymce.util.Tools.resolve("tinymce.EditorManager"),h=tinymce.util.Tools.resolve("tinymce.Env"),y=tinymce.util.Tools.resolve("tinymce.util.Tools"),o=function(e){return e.getParam("importcss_merge_classes")},n=function(e){return e.getParam("importcss_exclusive")},_=function(e){return e.getParam("importcss_selector_converter")},r=function(e){return e.getParam("importcss_selector_filter")},i=function(e){return e.getParam("importcss_groups")},u=function(e){return e.getParam("importcss_append")},l=function(e){return e.getParam("importcss_file_filter")},a=function(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t},f=function(f,e,m){var g=[],n={};function p(e,t){var n,r,i,c=e.href;if(r=c,i=h.cacheSuffix,"string"==typeof r&&(r=r.replace("?"+i,"").replace("&"+i,"")),(c=r)&&m(c,t)&&(o=c,u=(s=f).settings,!(l=!1!==u.skin&&(u.skin||"lightgray"))||o!==(u.skin_url?s.documentBaseURI.toAbsolute(u.skin_url):v.baseURL+"/skins/"+l)+"/content"+(s.inline?".inline":"")+".min.css")){var s,o,u,l;y.each(e.imports,function(e){p(e,!0)});try{n=e.cssRules||e.rules}catch(a){}y.each(n,function(e){e.styleSheet?p(e.styleSheet,!0):e.selectorText&&y.each(e.selectorText.split(","),function(e){g.push(y.trim(e))})})}}y.each(f.contentCSS,function(e){n[e]=!0}),m||(m=function(e,t){return t||n[e]});try{y.each(e.styleSheets,function(e){p(e)})}catch(t){}return g},x=function(e,t){var n,r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(r){var i=r[1],c=r[2].substr(1).split(".").join(" "),s=y.makeMap("a,img");return r[1]?(n={title:t},e.schema.getTextBlockElements()[i]?n.block=i:e.schema.getBlockElements()[i]||s[i.toLowerCase()]?n.selector=i:n.inline=i):r[2]&&(n={inline:"span",title:t.substr(1),classes:c}),!1!==o(e)?n.classes=c:n.attributes={"class":c},n}},T=function(e,t){return null===t||!1!==n(e)},c=x,t=function(h){h.on("renderFormatsMenu",function(e){var t,p={},c=a(r(h)),v=e.control,s=(t=i(h),y.map(t,function(e){return y.extend({},e,{original:e,selectors:{},filter:a(e.filter),item:{text:e.title,menu:[]}})})),o=function(e,t){if(f=e,g=p,!(T(h,m=t)?f in g:f in m.selectors)){u=e,a=p,T(h,l=t)?a[u]=!0:l.selectors[u]=!0;var n=(c=(i=h).plugins.importcss,s=e,((o=t)&&o.selector_converter?o.selector_converter:_(i)?_(i):function(){return x(i,s)}).call(c,s,o));if(n){var r=n.name||d.DOM.uniqueId();return h.formatter.register(r,n),y.extend({},v.settings.itemDefaults,{text:n.title,format:r})}}var i,c,s,o,u,l,a,f,m,g;return null};u(h)||v.items().remove(),y.each(f(h,e.doc||h.getDoc(),a(l(h))),function(n){if(-1===n.indexOf(".mce-")&&(!c||c(n))){var e=(r=s,i=n,y.grep(r,function(e){return!e.filter||e.filter(i)}));if(0<e.length)y.each(e,function(e){var t=o(n,e);t&&e.item.menu.push(t)});else{var t=o(n,null);t&&v.add(t)}}var r,i}),y.each(s,function(e){0<e.item.menu.length&&v.add(e.item)}),e.control.renderNew()})},s=function(t){return{convertSelectorToFormat:function(e){return c(t,e)}}};e.add("importcss",function(e){return t(e),s(e)})}();
+!function(){(function(){"use strict";function a(){}var b=tinymce.util.Tools.resolve("tinymce.PluginManager"),c=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),d=tinymce.util.Tools.resolve("tinymce.EditorManager"),e=tinymce.util.Tools.resolve("tinymce.Env"),f=tinymce.util.Tools.resolve("tinymce.util.Tools"),g=function(a){return a.getParam("importcss_merge_classes")},h=function(a){return a.getParam("importcss_exclusive")},i=function(a){return a.getParam("importcss_selector_converter")},j=function(a){return a.getParam("importcss_selector_filter")},k=function(a){return a.getParam("importcss_groups")},l=function(a){return a.getParam("importcss_append")},m=function(a){return a.getParam("importcss_file_filter")},n={shouldMergeClasses:g,shouldImportExclusive:h,getSelectorConverter:i,getSelectorFilter:j,getCssGroups:k,shouldAppend:l,getFileFilter:m},o=function(a){var b=e.cacheSuffix;return"string"==typeof a&&(a=a.replace("?"+b,"").replace("&"+b,"")),a},p=function(a,b){var c=a.settings,e=c.skin!==!1&&(c.skin||"lightgray");if(e){var f=c.skin_url?a.documentBaseURI.toAbsolute(c.skin_url):d.baseURL+"/skins/"+e;return b===f+"/content"+(a.inline?".inline":"")+".min.css"}return!1},q=function(a){return"string"==typeof a?function(b){return b.indexOf(a)!==-1}:a instanceof RegExp?function(b){return a.test(b)}:a},r=function(a,b,c){function d(b,g){var h,i=b.href;if(a.settings.classic_block_editor&&(tinymce.$("style").each(function(a,b){var c=b.textContent||"";if(/theme name: /i.test(c)||c.indexOf("TinyMCE")>-1)try{h=b.sheet.cssRules}catch(d){}}),h))return void tinymce.each(h,function(a){a.selectorText&&tinymce.each(a.selectorText.split(","),function(a){a=a.replace(/^\.editor-styles-wrapper/,""),a&&e.push(tinymce.trim(a))})});if(i=o(i),i&&c(i,g)&&!p(a,i)){f.each(b.imports,function(a){d(a,!0)});try{h=b.cssRules||b.rules}catch(j){}f.each(h,function(a){a.styleSheet?d(a.styleSheet,!0):a.selectorText&&f.each(a.selectorText.split(","),function(a){e.push(f.trim(a))})})}}var e=[],g={};f.each(a.contentCSS,function(a){g[a]=!0}),c||(c=function(a,b){return b||g[a]});try{f.each(b.styleSheets,function(a){d(a)})}catch(h){}return e},s=function(a,b){var c,d=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(b);if(d){var e=d[1],g=d[2].substr(1).split(".").join(" "),h=f.makeMap("a,img");return d[1]?(c={title:b},a.schema.getTextBlockElements()[e]?c.block=e:a.schema.getBlockElements()[e]||h[e.toLowerCase()]?c.selector=e:c.inline=e):d[2]&&(c={inline:"span",title:b.substr(1),classes:g}),n.shouldMergeClasses(a)!==!1?c.classes=g:c.attributes={"class":g},c}},t=function(a,b){return f.grep(a,function(a){return!a.filter||a.filter(b)})},u=function(a){return f.map(a,function(a){return f.extend({},a,{original:a,selectors:{},filter:q(a.filter),item:{text:a.title,menu:[]}})})},v=function(a,b){return null===b||n.shouldImportExclusive(a)!==!1},w=function(a,b,c,d){return!(v(a,c)?b in d:b in c.selectors)},x=function(a,b,c,d){v(a,c)?d[b]=!0:c.selectors[b]=!0},y=function(a,b,c,d){var e;return e=d&&d.selector_converter?d.selector_converter:n.getSelectorConverter(a)?n.getSelectorConverter(a):function(){return s(a,c)},e.call(b,c,d)},z=function(a){a.on("renderFormatsMenu",function(b){var d={},e=q(n.getSelectorFilter(a)),g=b.control,h=u(n.getCssGroups(a)),i=function(b,e){if(w(a,b,e,d)){x(a,b,e,d);var h=y(a,a.plugins.importcss,b,e);if(h){var i=h.name||c.DOM.uniqueId();return a.formatter.register(i,h),f.extend({},g.settings.itemDefaults,{text:h.title,format:i})}}return null};n.shouldAppend(a)||g.items().remove(),f.each(r(a,b.doc||a.getDoc(),q(n.getFileFilter(a))),function(a){if(a.indexOf(".mce-")===-1&&(!e||e(a))){var b=t(h,a);if(b.length>0)f.each(b,function(b){var c=i(a,b);c&&b.item.menu.push(c)});else{var c=i(a,null);c&&g.add(c)}}}),f.each(h,function(a){a.item.menu.length>0&&g.add(a.item)}),b.control.renderNew()})},A={defaultConvertSelectorToFormat:s,setup:z},B=function(a){var b=function(b){return A.defaultConvertSelectorToFormat(a,b)};return{convertSelectorToFormat:b}},C={get:B};return b.add("importcss",function(a){return A.setup(a),C.get(a)}),a})()}();

tinymce-advanced/trunk/mce/wptadv/plugin.js

@@ -66 +66 @@
         if ( noAutop ) {
             editor.on( 'beforeSetContent', function( event ) {
-                var autop = typeof window.wp !== 'undefined' && window.wp.editor && window.wp.editor.autop;
+                var autop;
+                var wp = window.wp;
+                
+                if ( ! wp ) {
+                    return;
+                }
+
+                autop = wp.editor && wp.editor.autop;
+
+                if ( ! autop ) {
+                    autop = wp.oldEditor && wp.oldEditor.autop;
+                }
 
                 if ( event.load && autop && event.content && event.content.indexOf( '\n' ) > -1 && ! /<p>/i.test( event.content ) ) {
@@ -72 +83 @@
                 }
             }, true );
+
+            if ( editor.settings.classic_block_editor ) {
+                editor.on( 'beforeGetContent', function( event ) {
+                    // Mark all paragraph tags so they are not stripped by the Block Editor...
+                    if ( event.format !== 'raw' ) {
+                        editor.$( 'p' ).each( function ( i, node ) {
+                            if ( ! node.hasAttributes() ) {
+                                editor.$( node ).attr( 'data-tadv-p', 'keep' );
+                            }
+                        } )
+                    }
+                }, true );
+            }
         }
 

tinymce-advanced/trunk/mce/wptadv/plugin.min.js

@@ -1 @@
-!function(a){a.PluginManager.add("wptadv",function(b){function c(b){var c="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary";return b=b.replace(new RegExp("<(?:"+c+")(?: [^>]*)?>","gi"),"\n$&"),b=b.replace(new RegExp("</(?:"+c+")>","gi"),"$&\n"),b=b.replace(/(<br(?: [^>]*)?>)[\r\n\t]*/gi,"$1\n"),b=b.replace(/>\n[\r\n\t]+</g,">\n<"),b=b.replace(/^<li/gm,"   <li"),b=b.replace(/<td>\u00a0<\/td>/g,"<td>&nbsp;</td>"),a.trim(b)}var d=b.settings.tadv_oembed_regex||[new RegExp("https?://(www\\.)?youtube\\.com/(watch|playlist).*","i"),new RegExp("https?://youtu.be/.*","i"),new RegExp("https?://blip.tv/.*","i"),new RegExp("https?://(www\\.)?vimeo\\.com/.*","i"),new RegExp("https?://(www\\.)?dailymotion\\.com/.*","i"),new RegExp("https?://dai.ly/.*","i"),new RegExp("https?://(www\\.)?flickr\\.com/.*","i"),new RegExp("https?://flic.kr/.*","i"),new RegExp("https?://(.+\\.)?smugmug\\.com/.*","i"),new RegExp("https?://(www\\.)?hulu\\.com/watch/.*","i"),new RegExp("https?://(www\\.)?viddler\\.com/.*","i"),new RegExp("https?://qik.com/.*","i"),new RegExp("https?://revision3.com/.*","i"),new RegExp("https?://i*.photobucket.com/albums/.*","i"),new RegExp("https?://gi*.photobucket.com/groups/.*","i"),new RegExp("https?://(www\\.)?scribd\\.com/.*","i"),new RegExp("https?://wordpress.tv/.*","i"),new RegExp("https?://(.+\\.)?polldaddy\\.com/.*","i"),new RegExp("https?://poll\\.fm/.*","i"),new RegExp("https?://(www\\.)?funnyordie\\.com/videos/.*","i"),new RegExp("https?://(www\\.)?twitter\\.com/.+?/status(es)?/.*","i"),new RegExp("https?://vine\\.co/v/.*","i"),new RegExp("https?://(www\\.)?soundcloud\\.com/.*","i"),new RegExp("https?://(www\\.)?slideshare\\.net/.*","i"),new RegExp("https?://instagr(\\.am|am\\.com)/p/.*","i"),new RegExp("https?://(www\\.)?rdio\\.com/.*","i"),new RegExp("https?://rd\\.io/x/.*","i"),new RegExp("https?://(open|play)\\.spotify\\.com/.*","i"),new RegExp("https?://(.+\\.)?imgur\\.com/.*","i"),new RegExp("https?://(www\\.)?meetu(\\.ps|p\\.com)/.*","i"),new RegExp("https?://(www\\.)?issuu\\.com/.+/docs/.*","i"),new RegExp("https?://(www\\.)?collegehumor\\.com/video/.*","i"),new RegExp("https?://(www\\.)?mixcloud\\.com/.*","i"),new RegExp("https?://(www\\.|embed\\.)?ted\\.com/talks/.*","i"),new RegExp("https?://(www\\.)(animoto|video214)\\.com/play/.*","i"),new RegExp("https?://(.+).tumblr.com/post/.*","i"),new RegExp("https?://(www.)?kickstarter.com/projects/.*","i"),new RegExp("https?://kck.st/.*","i")],e=!b.settings.wpautop&&b.settings.tadv_noautop;return b.on("init",function(){e&&b.on("SaveContent",function(a){b.settings.tadv_noautop2&&(a.content=a.content.replace(/<p>\s*(https?:\/\/[^<>\s]+)\s*<\/p>/gi,function(a,b){for(var c in d)if(d[c].test(b))return b+"\n\n";return a})),a.content=a.content.replace(/caption\](\s|<br[^>]*>|<p>&nbsp;<\/p>)*\[caption/g,"caption] [caption"),a.content=a.content.replace(/<(object|audio|video)[\s\S]+?<\/\1>/g,function(a){return a.replace(/[\r\n\t ]+/g," ")}),a.content=a.content.replace(/<pre( [^>]*)?>[\s\S]+?<\/pre>/g,function(a){return a=a.replace(/<br ?\/?>(\r\n|\n)?/g,"\n"),a.replace(/<\/?p( [^>]*)?>(\r\n|\n)?/g,"\n")}),a.content=c(a.content)});try{b.plugins.searchreplace&&!b.controlManager.buttons.searchreplace&&b.shortcuts.remove("meta+f")}catch(a){}}),e&&b.on("beforeSetContent",function(a){var b="undefined"!=typeof window.wp&&window.wp.editor&&window.wp.editor.autop;a.load&&b&&a.content&&a.content.indexOf("\n")>-1&&!/<p>/i.test(a.content)&&(a.content=b(a.content))},!0),b.on("beforeGetContent",function(a){"raw"!==a.format&&b.$('img[id="__wp-temp-img-id"]').attr("id",null)}),{addLineBreaks:c}})}(window.tinymce);
+!function(a){a.PluginManager.add("wptadv",function(b){function c(b){var c="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary";return b=b.replace(new RegExp("<(?:"+c+")(?: [^>]*)?>","gi"),"\n$&"),b=b.replace(new RegExp("</(?:"+c+")>","gi"),"$&\n"),b=b.replace(/(<br(?: [^>]*)?>)[\r\n\t]*/gi,"$1\n"),b=b.replace(/>\n[\r\n\t]+</g,">\n<"),b=b.replace(/^<li/gm,"\t<li"),b=b.replace(/<td>\u00a0<\/td>/g,"<td>&nbsp;</td>"),a.trim(b)}var d=!b.settings.wpautop&&b.settings.tadv_noautop;return b.addCommand("Tadv_Mark",function(){b.formatter.toggle("mark")}),b.addButton("tadv_mark",{icon:"backcolor",tooltip:"Mark",cmd:"Tadv_Mark",stateSelector:"mark"}),b.on("init",function(){d&&b.on("SaveContent",function(a){a.content=a.content.replace(/caption\](\s|<br[^>]*>|<p>&nbsp;<\/p>)*\[caption/g,"caption] [caption"),a.content=a.content.replace(/<(object|audio|video)[\s\S]+?<\/\1>/g,function(a){return a.replace(/[\r\n\t ]+/g," ")}),a.content=a.content.replace(/<pre( [^>]*)?>[\s\S]+?<\/pre>/g,function(a){return a=a.replace(/<br ?\/?>(\r\n|\n)?/g,"\n"),a.replace(/<\/?p( [^>]*)?>(\r\n|\n)?/g,"\n")}),a.content=c(a.content)});try{b.plugins.searchreplace&&!b.controlManager.buttons.searchreplace&&b.shortcuts.remove("meta+f")}catch(a){}b.formatter.register({mark:{inline:"mark"}})}),d&&(b.on("beforeSetContent",function(a){var b,c=window.wp;c&&(b=c.editor&&c.editor.autop,b||(b=c.oldEditor&&c.oldEditor.autop),a.load&&b&&a.content&&a.content.indexOf("\n")>-1&&!/<p>/i.test(a.content)&&(a.content=b(a.content)))},!0),b.settings.classic_block_editor&&b.on("beforeGetContent",function(a){"raw"!==a.format&&b.$("p").each(function(a,c){c.hasAttributes()||b.$(c).attr("data-tadv-p","keep")})},!0)),{addLineBreaks:c}})}(window.tinymce);

tinymce-advanced/trunk/readme.txt

@@ -1 +1 @@
 === TinyMCE Advanced ===
 Contributors: azaozz
-Tags: wysiwyg, formatting, tinymce, write, editor
+Tags: block editor, classic editor, editor, Gutenberg, formatting, tinymce, write
 Requires at least: 4.9.8
-Tested up to: 4.9
+Tested up to: 5.0
 Stable tag: 4.8.0
+Requires PHP: 5.2
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Extends and enhances TinyMCE, the WordPress Visual Editor.
+Extends and enhances TinyMCE, the visual editor used in both the Classic Editor and the new Block Editor in WordPress.
 
 == Description ==
 
-This plugin will let you add, remove and arrange the buttons that are shown on the Visual Editor toolbar. You can configure up to four rows of buttons including Font Sizes, Font Family, text and background colors, tables, etc. It will also let you enable the editor menu, see the [screenshots](screenshots).
-
-It includes 15 plugins for [TinyMCE](https://tinymce.com/) that are automatically enabled or disabled depending on the buttons you have chosen. In addition this plugin adds some commonly used options as keeping the paragraph tags in the Text editor and importing the CSS classes from the theme's editor-style.css.
+For WordPress version 5.0 and newer the TinyMCE Advanced plugin introduces a "Hybrid Mode" for the new Block Editor (Gutenberg). 
+It brings the best of both editors together, enhances the Classic Block and adds a new Classic Paragraph Block that replaces the default Paragraph Block. 
+
+If you are not quite ready to switch to the Block Editor, or have plugins that cannot be used there (yet), using Hybrid Mode is your best option. 
+It lets you to continue to use the familiar "Classic" editor inside the Classic Block, and at the same time gives you access to all blocks and new features in the Block Editor. 
+
+If you want to continue to use the previous editor in WordPress 5.0 and newer, this plugin has an option to replace the new editor with the previous one. If you prefer to have access to both editors side by side or to allow your users to switch editors, it would be better to install the [Classic Editor plugin](https://wordpress.org/plugins/classic-editor/). TinyMCE Advanced is fully compatible with the Classic Editor plugin and similar plugins that restore use of the previous WordPress editor.
+
+As always this plugin will let you add, remove and arrange the buttons that are shown on the Visual Editor toolbar in the Classic Block in the new Block Editor, and in the Classic Editor (when enabled by a plugin). You can configure up to four rows of buttons including Font Sizes, Font Family, text and background colors, tables, etc. It will also let you enable the editor menu, see the [screenshots](screenshots). 
+
+It includes 15 plugins for [TinyMCE](https://tinymce.com/) that are automatically enabled or disabled depending on the buttons you have chosen.
+In addition this plugin adds some commonly used options as keeping the paragraph tags in the Text editor and importing the CSS classes from the theme's editor-style.css.
 
 = Some of the features added by this plugin =
 
-* Support for creating and editing tables.
-* More options when inserting lists.
-* Search and Replace in the editor.
-* Ability to set Font Family and Font Sizes.
+* Hybrid mode that lets you use the best of both editors.
+* Support for creating and editing tables in the Classic Block or the Classic Editor.
+* More options when inserting lists in the Classic Block or the Classic Editor.
+* Search and Replace in the Classic Block or the Classic Editor.
+* Ability to set Font Family and Font Sizes in the Classic Block or the Classic Editor.
 * And many others.
 
-With this plugin you can also enable the TinyMCE menu above the toolbars. This will make the editor even more powerful and convenient.
-
 = Privacy =
 
@@ -37 +46 @@
 
 == Changelog ==
+
+= 4.8.1 =
+* Updated for WordPress 5.0.
+* Added Hybrid Mode for the Block Editor. Includes a Classic Paragraph Block that replaces the default Paragraph Block.
+* Added option to replace the Block Editor with the Classic Editor.
+* Added another settings section for configuring the toolbars in the Classic Block and the Classic Paragraph Block.
+* Added some CSS fixed for the Classic Block.
+* Fixed (removed) setting of inline CSS for table cells when inserting a table. Inline CSS is still added when a table is resized by dragging.
 
 = 4.8.0 =
@@ -69 +86 @@
 
 = 4.3.10.1 =
-* Fixed adding paragraph tags when loading posts that were saved before turning autop off.
+* Fixed adding paragraph tags when loading posts that were saved before turning `wpautop` off.
 * Disabled the (new) inline toolbar for tables as it was overlapping the table in some cases.
 
@@ -91 +108 @@
 
 = 4.2.3.1 =
-* Fix error with removing the 'textpattern' plugin.
+* Fix error with removing the `textpattern` plugin.
 
 = 4.2.3 =
 * Updated for WordPress 4.3 and TinyMCE 4.2.3.
-* Removed the 'textpattern' plugin as WordPress 4.3 includes similar functionality by default.
+* Removed the `textpattern` plugin as WordPress 4.3 includes similar functionality by default.
 * French translation by Nicolas Schneider.
 
@@ -113 +130 @@
 = 4.1 =
 * Updated for WordPress 4.0 and TinyMCE 4.1.
-* Add the 'textpattern' plugin that supports some of the markdown syntax while typing, [(more info)](http://www.tinymce.com/wiki.php/Configuration:textpattern_patterns).
+* Add the `textpattern` plugin that supports some of the markdown syntax while typing, [(more info)](http://www.tinymce.com/wiki.php/Configuration:textpattern_patterns).
 * Add the updated 'table' plugin that supports background and border color.
 
 = 4.0.2 =
 * Fix showing of the second, third and forth button rows when the Toolbar Toggle button is not used.
-* Fix adding the ''directionality'' plugin when RTL or LTR button is selected.
+* Fix adding the `directionality` plugin when RTL or LTR button is selected.
 * Show the ''Advanced Options'' to super admins on multisite installs.
-* Add the ''link'' plugin including link rel setting. Replaces the Insert/Edit Link dialog when enabled.
+* Add the `link` plugin including link rel setting. Replaces the Insert/Edit Link dialog when enabled.
 * Include updated ''table'' plugin that has support for vertical align for cells.
 
@@ -156 +173 @@
 Added advanced options: stop removing iframes, stop removing HTML 5.0 elements, moved the support for custom editor styles to editor-style.css in the current theme.
 
-Attention: if you have a customized tadv-mce.css file and your theme doesn't have editor-style.css, please download tadv-mce.css, rename it to editor-style.css and upload it to your current theme directory. Alternatively you can add there the editor-style.css from the Twenty Ten theme. If your theme has editor-style.css you can add any custom styles there.
+Attention: if you have a customized `tadv-mce.css` file and your theme doesn't have editor-style.css, please download `tadv-mce.css`, rename it to editor-style.css and upload it to your current theme directory. Alternatively you can add there the editor-style.css from the Twenty Ten theme. If your theme has editor-style.css you can add any custom styles there.
 
 = 3.3.9 =
@@ -171 +188 @@
 
 = 3.1 =
-Compatibility with WordPress 2.6 and TinyMCE 3.1, keeps empty paragraphs when disabling the removal of P and BR tags, the buttons for MCImageManager and MCFileManager can be arranged (if installed).
+Compatibility with WordPress 2.6 and TinyMCE 3.1, keeps empty paragraphs when disabling the removal of P and BR tags, the buttons for `MCImageManager` and `MCFileManager` can be arranged (if installed).
 
 = 3.0.1 =
-Compatibility with WordPress 2.5.1 and TinyMCE 3.0.7, added option to disable the removal of P and BR tags when saving and in the HTML editor (autop), added two more buttons to the HTML editor: autop and undo, fixed the removal of non-default TinyMCE buttons.
+Compatibility with WordPress 2.5.1 and TinyMCE 3.0.7, added option to disable the removal of P and BR tags when saving and in the HTML editor (wpautop), added two more buttons to the HTML editor: `wpautop` and undo, fixed the removal of non-default TinyMCE buttons.
 
 = 3.0 =
@@ -197 +214 @@
 
 = 4.1 =
-Includes the 'textpattern' plugin that supports some of the markdown syntax while typing, and the updated 'table' plugin that supports background and border color for tables.
+Includes the `textpattern` plugin that supports some of the markdown syntax while typing, and the updated 'table' plugin that supports background and border color for tables.
 
 == Frequently Asked Questions ==
@@ -207 +224 @@
 = I have just installed this plugin, but it does not do anything. =
 
-Change some buttons on one of the toolbars, save your changes, clear your browser cache, and try again. If that does not work try reloding the Edit page several times while holding down Shift or Ctrl. There may also be a network cache somewhere between you and your host. You may need to wait for a few hours until this cache expires.
+Change some buttons on one of the toolbars, save your changes, clear your browser cache, and try again. If that does not work try reloading the Edit page several times while holding down Shift. There may also be a network cache somewhere between you and your host. You may need to wait for a few hours until this cache expires.
 
 = When I add "Smilies", they do not show in the editor. =
@@ -225 +242 @@
 Please post on the support forum or visit the homepage for [TinyMCE Advanced](http://www.laptoptips.ca/projects/tinymce-advanced/).
 
-
 == Screenshots ==
 
-1. The WordPress editor after installing this plugin (default plugin settings).
-2. The TinyMCE Advanced settings page, toolbars options.
-3. The TinyMCE Advanced settings page, user options.
-4. The TinyMCE Advanced settings page, advanced options.
-5. The TinyMCE Advanced settings page, admin options.
+1. Classic Paragraph Block.
+2. The Classic Editor (TinyMCE) toolbars settings.
+3. The Classic Block (Block Editor) toolbars settings.
+4. Editor options.
+5. Advanced plugin options.
+6. Administration options.
+
+== Upgrade Notice ==
+
+= 4.8.1 =
+Updated for WordPress 5.0 and the Block Editor (Gutenebrg). Adds a "Classic Paragraph Block" with TinyMCE that replaces the default Paragraph Block.

tinymce-advanced/trunk/tadv_admin.php

@@ -13 +13 @@
 // TODO
 if ( ! current_user_can( 'manage_options' ) ) {
-    wp_die('Access denied');
+    wp_die( 'Invalid request' );
 }
 
@@ -22 +22 @@
 $tadv_options_updated = false;
 $settings = $admin_settings = array();
-
- 
 
 if ( isset( $_POST['tadv-save'] ) ) {
@@ -50 +48 @@
 
     ?>
-    <div class="wrap">
+    <div class="wrap tinymce-advanced">
     <h2><?php _e( 'TinyMCE Advanced Settings Export', 'tinymce-advanced' ); ?></h2>
 
@@ -75 +73 @@
     // TODO: all users
     ?>
-    <div class="wrap">
+    <div class="wrap tinymce-advanced">
     <h2><?php _e( 'TinyMCE Advanced Settings Import', 'tinymce-advanced' ); ?></h2>
 
@@ -126 +124 @@
 
 ?>
-<div class="wrap" id="contain">
+<div class="wrap tinymce-advanced" id="contain">
 <h2><?php _e( 'Editor Settings', 'tinymce-advanced' ); ?></h2>
 <?php
@@ -142 +140 @@
 <form id="tadvadmin" method="post" action="">
 
-<p class="tadv-submit">
-    <input class="button-primary button-large" type="submit" name="tadv-save" value="<?php _e( 'Save Changes', 'tinymce-advanced' ); ?>" />
+<p class="tadv-submit tadv-submit-top">
+    <input class="button-primary button-large top-button" type="submit" name="tadv-save" value="<?php _e( 'Save Changes', 'tinymce-advanced' ); ?>" />
 </p>
 
+<div id="classic-editor">
+<h3><?php _e( 'Toolbars for the Classic Editor (TinyMCE)', 'tinymce-advanced' ); ?></h3>
+
 <div id="tadvzones">
-
-<p><label>
-<input type="checkbox" name="options[]" id="menubar" value="menubar" <?php if ( $this->check_user_setting( 'menubar' ) ) { echo ' checked="checked"'; } ?>>
-<?php _e( 'Enable the editor menu.', 'tinymce-advanced' ); ?>
-</label></p>
-
-<div id="tadv-mce-menu" class="mce-container mce-menubar mce-toolbar mce-first mce-stack-layout-item
+<p>
+    <input type="checkbox" name="options[]" id="menubar" value="menubar" <?php if ( $this->check_user_setting( 'menubar' ) ) { echo ' checked="checked"'; } ?>>
+    <label for="menubar"><?php _e( 'Enable the editor menu.', 'tinymce-advanced' ); ?></label>
+</p>
+
+<div class="tadv-mce-menu tadv-classic-editor mce-container mce-menubar mce-toolbar mce-first mce-stack-layout-item
     <?php if ( $this->check_user_setting( 'menubar' ) ) { echo ' enabled'; } ?>">
     <div class="mce-container-body mce-flow-layout">
@@ -204 +204 @@
 
 $mce_text_buttons = array( 'styleselect', 'formatselect', 'fontselect', 'fontsizeselect' );
+$all_buttons_classic = $all_buttons;
 
 for ( $i = 1; $i < 5; $i++ ) {
@@ -218 +219 @@
         }
 
-        if ( isset( $all_buttons[$button] ) ) {
-            $name = $all_buttons[$button];
-            unset( $all_buttons[$button] );
+        if ( isset( $all_buttons_classic[ $button ] ) ) {
+            $name = $all_buttons_classic[ $button ];
+            unset( $all_buttons_classic[ $button ] );
         } else {
-            // error?..
             continue;
         }
 
-        ?><li class="tadvmodule" id="<?php echo $button; ?>">
+        ?>
+        <li class="tadvmodule" id="<?php echo $button; ?>">
             <?php
 
@@ -250 +251 @@
 
             ?>
-        </li><?php
+        </li>
+        <?php
 
     }
@@ -262 +264 @@
 </div>
 
-<p><?php _e( 'Drag buttons from the unused buttons below and drop them in the toolbars above, or drag the buttons in the toolbars to rearrange them.', 'tinymce-advanced' ); ?></p>
-
-<div id="unuseddiv">
-<h3><?php _e( 'Unused Buttons', 'tinymce-advanced' ); ?></h3>
-<ul id="unused" class="container">
-<?php
-
-foreach( $all_buttons as $button => $name ) {
-    if ( strpos( $button, 'separator' ) !== false ) {
-        continue;
+<p><?php _e( 'Drop buttons in the toolbars, or drag the buttons to rearrange them.', 'tinymce-advanced' ); ?></p>
+
+<div class="unuseddiv">
+    <h4><?php _e( 'Unused Buttons', 'tinymce-advanced' ); ?></h4>
+    <div>
+        <ul id="unused" class="unused container">
+        <?php
+
+        foreach( $all_buttons_classic as $button => $name ) {
+            if ( strpos( $button, 'separator' ) !== false ) {
+                continue;
+            }
+
+            ?>
+            <li class="tadvmodule" id="<?php echo $button; ?>">
+                <?php
+
+                if ( in_array( $button, $mce_text_buttons, true ) ) {
+                    ?>
+                    <div class="tadvitem mce-widget mce-btn mce-menubtn mce-fixed-width mce-listbox">
+                        <div class="the-button">
+                            <span class="descr"><?php echo $name; ?></span>
+                            <i class="mce-caret"></i>
+                            <input type="hidden" class="tadv-button" name="unused[]" value="<?php echo $button; ?>" />
+                        </div>
+                    </div>
+                    <?php
+                } else {
+                    ?>
+                    <div class="tadvitem">
+                        <i class="mce-ico mce-i-<?php echo $button; ?>" title="<?php echo $name; ?>"></i>
+                        <span class="descr"><?php echo $name; ?></span>
+                        <input type="hidden" class="tadv-button" name="unused[]" value="<?php echo $button; ?>" />
+                    </div>
+                    <?php
+                }
+
+                ?>
+            </li>
+            <?php
+        }
+
+        ?>
+        </ul>
+    </div><!-- /highlighted -->
+</div>
+</div><!-- /classic-editor -->
+
+<div id="block-editor">
+<h3><?php _e( 'Toolbars for the Classic Blocks in the Block Editor (Gutenberg)', 'tinymce-advanced' ); ?></h3>
+
+<p>
+    <?php _e( 'The toolbars in the Classic Block are narrower and show on focus.', 'tinymce-advanced' ); ?>
+    <?php _e( 'For best results enable the menu and add only essential buttons.', 'tinymce-advanced' ); ?>
+    <?php _e( 'The buttons will wrap around depending on the width of the toolbar.', 'tinymce-advanced' ); ?>
+</p>
+
+<p>
+    <input type="checkbox" name="options[]" id="menubar_block" value="menubar_block" <?php if ( $this->check_user_setting( 'menubar_block' ) ) { echo ' checked'; } ?>>
+    <label for="menubar_block"><?php _e( 'Enable the editor menu (recommended).', 'tinymce-advanced' ); ?></label>
+</p>
+
+<div class="tadv-mce-menu tadv-block-editor mce-container mce-menubar mce-toolbar mce-first mce-stack-layout-item
+    <?php if ( $this->check_user_setting( 'menubar' ) ) { echo ' enabled'; } ?>">
+    <div class="mce-container-body mce-flow-layout">
+        <div class="mce-widget mce-btn mce-menubtn mce-first mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">File</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">Edit</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">Insert</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-flow-layout-item mce-toolbar-item">
+            <button type="button">
+                <span class="tadv-translate">View</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">Format</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">Table</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+        <div class="mce-widget mce-btn mce-menubtn mce-last mce-flow-layout-item">
+            <button type="button">
+                <span class="tadv-translate">Tools</span>
+                <i class="mce-caret"></i>
+            </button>
+        </div>
+    </div>
+</div>
+
+<div class="tadvdropzone tadv-block-editor mce-toolbar">
+    <ul id="toolbar_classic_block" class="container-classic-block">
+    <?php
+
+    $all_buttons_block = $all_buttons;
+
+    // Remove the toolbar-toggle
+    unset( $all_buttons_block['wp_adv'] );
+
+    foreach( $this->toolbar_classic_block as $button_id ) {
+        $name = '';
+
+        if ( strpos( $button, 'separator' ) !== false || in_array( $button, array( 'moveforward', 'movebackward', 'absolute' ) ) ) {
+            continue;
+        }
+
+        if ( isset( $all_buttons_block[ $button_id ] ) ) {
+            $name = $all_buttons_block[ $button_id ];
+            unset( $all_buttons_block[ $button_id ] );
+        } else {
+            continue;
+        }
+
+        ?>
+        <li class="tadvmodule" id="<?php echo $button_id; ?>">
+            <?php
+
+            if ( in_array( $button_id, $mce_text_buttons, true ) ) {
+                ?>
+                <div class="tadvitem mce-widget mce-btn mce-menubtn mce-fixed-width mce-listbox">
+                    <div class="the-button">
+                        <span class="descr"><?php echo $name; ?></span>
+                        <i class="mce-caret"></i>
+                        <input type="hidden" class="tadv-button" name="toolbar_classic_block[]" value="<?php echo $button_id; ?>" />
+                    </div>
+                </div>
+                <?php
+            } else {
+                ?>
+                <div class="tadvitem">
+                    <i class="mce-ico mce-i-<?php echo $button_id; ?>" title="<?php echo $name; ?>"></i>
+                    <span class="descr"><?php echo $name; ?></span>
+                    <input type="hidden" class="tadv-button" name="toolbar_classic_block[]" value="<?php echo $button_id; ?>" />
+                </div>
+                <?php
+            }
+
+            ?>
+        </li>
+        <?php
     }
 
-    ?><li class="tadvmodule" id="<?php echo $button; ?>">
+    ?>
+    </ul>
+</div>
+
+<p><?php _e( 'Drop buttons in the toolbars, or drag the buttons to rearrange them.', 'tinymce-advanced' ); ?></p>
+
+<div class="unuseddiv">
+    <h4><?php _e( 'Unused Buttons for the Classic Block', 'tinymce-advanced' ); ?></h4>
+    <div>
+        <ul id="unused-classic-block" class="unused container-classic-block">
         <?php
 
-        if ( in_array( $button, $mce_text_buttons, true ) ) {
+        foreach( $all_buttons_block as $button_id => $name ) {
+            if ( strpos( $button, 'separator' ) !== false ) {
+                continue;
+            }
+
             ?>
-            <div class="tadvitem mce-widget mce-btn mce-menubtn mce-fixed-width mce-listbox">
-                <div class="the-button">
-                    <span class="descr"><?php echo $name; ?></span>
-                    <i class="mce-caret"></i>
-                    <input type="hidden" class="tadv-button" name="unused[]" value="<?php echo $button; ?>" />
-                </div>
-            </div>
+            <li class="tadvmodule" id="<?php echo $button_id; ?>">
+                <?php
+
+                if ( in_array( $button_id, $mce_text_buttons, true ) ) {
+                    ?>
+                    <div class="tadvitem mce-widget mce-btn mce-menubtn mce-fixed-width mce-listbox">
+                        <div class="the-button">
+                            <span class="descr"><?php echo $name; ?></span>
+                            <i class="mce-caret"></i>
+                            <input type="hidden" class="tadv-button" name="unused-classic-block[]" value="<?php echo $button_id; ?>" />
+                        </div>
+                    </div>
+                    <?php
+                } else {
+                    ?>
+                    <div class="tadvitem">
+                        <i class="mce-ico mce-i-<?php echo $button_id; ?>" title="<?php echo $name; ?>"></i>
+                        <span class="descr"><?php echo $name; ?></span>
+                        <input type="hidden" class="tadv-button" name="unused-classic-block[]" value="<?php echo $button_id; ?>" />
+                    </div>
+                    <?php
+                }
+
+                ?>
+            </li>
             <?php
-        } else {
-            ?>
-            <div class="tadvitem">
-                <i class="mce-ico mce-i-<?php echo $button; ?>" title="<?php echo $name; ?>"></i>
-                <span class="descr"><?php echo $name; ?></span>
-                <input type="hidden" class="tadv-button" name="unused[]" value="<?php echo $button; ?>" />
-            </div>
-            <?php
         }
 
         ?>
-    </li><?php
-
-}
-
-?>
-</ul>
-</div>
+        </ul>
+    </div><!-- /highlight -->
+</div><!-- /unuseddiv -->
+</div><!-- /block-editor -->
 
 <div class="advanced-options">
     <h3><?php _e( 'Options', 'tinymce-advanced' ); ?></h3>
-    <div>
-        <label><input type="checkbox" name="options[]" value="advlist" id="advlist" <?php if ( $this->check_user_setting('advlist') ) echo ' checked="checked"'; ?> />
-        <?php _e( 'List Style Options', 'tinymce-advanced' ); ?></label>
+
+    <div>
+        <input type="checkbox" name="options[]" value="no_merge_toolbars" id="merge_toolbars" <?php if ( ! $this->check_user_setting('no_merge_toolbars') ) echo ' checked'; ?> />
+        <label for="merge_toolbars"><?php _e( 'Append all buttons to the top toolbar in the Classic and Classic Paragraph blocks.', 'tinymce-advanced' ); ?></label>
+        <p><?php _e( 'This affects buttons that are added by other plugins. These buttons will be appended to the top toolbar row instead of forming second, third, and forth rows.', 'tinymce-advanced' ); ?></p>
+    </div>
+
+    <div>
+        <input type="checkbox" name="options[]" value="advlist" id="advlist" <?php if ( $this->check_user_setting('advlist') ) echo ' checked'; ?> />
+        <label for="advlist"><?php _e( 'List Style Options', 'tinymce-advanced' ); ?></label>
         <p>
             <?php _e( 'Enable more list options: upper or lower case letters for ordered lists, disk or square for unordered lists, etc.', 'tinymce-advanced' ); ?>
         </p>
     </div>
-    <div>
-        <label><input type="checkbox" name="options[]" value="contextmenu" id="contextmenu" <?php if ( $this->check_user_setting('contextmenu') ) echo ' checked="checked"'; ?> />
-        <?php _e( 'Context Menu', 'tinymce-advanced' ); ?></label>
-        <p>
-            <?php _e( 'Replace the browser context (right-click) menu.', 'tinymce-advanced' ); ?>
-        </p>
-    </div>
-    <div>
-        <label><input type="checkbox" name="options[]" value="advlink" id="advlink" <?php if ( $this->check_user_setting('advlink') ) echo ' checked="checked"'; ?> />
-        <?php _e( 'Alternative link dialog', 'tinymce-advanced' ); ?></label>
-        <p>
-            <?php _e( 'Open the TinyMCE link dialog when using the link button on the toolbar or the link menu item.', 'tinymce-advanced' ); ?>
-        </p>
-    </div>
-    <div>
-        <label><input type="checkbox" name="options[]" value="fontsize_formats" id="fontsize_formats" <?php if ( $this->check_user_setting( 'fontsize_formats' ) ) echo ' checked="checked"'; ?> />
-        <?php _e( 'Font sizes', 'tinymce-advanced' ); ?></label>
+
+    <div>
+        <input type="checkbox" name="options[]" value="contextmenu" id="contextmenu" <?php if ( $this->check_user_setting('contextmenu') ) echo ' checked'; ?> />
+        <label for="contextmenu"><?php _e( 'Context Menu', 'tinymce-advanced' ); ?></label>
+        <p><?php _e( 'Replace the browser context (right-click) menu.', 'tinymce-advanced' ); ?></p>
+    </div>
+
+    <div>
+        <input type="checkbox" name="options[]" value="advlink" id="advlink" <?php if ( $this->check_user_setting('advlink') ) echo ' checked'; ?> />
+        <label for="advlink"><?php _e( 'Alternative link dialog', 'tinymce-advanced' ); ?></label>
+        <p><?php _e( 'Open the TinyMCE link dialog when using the link button on the toolbar or the link menu item.', 'tinymce-advanced' ); ?></p>
+    </div>
+
+    <div>
+        <input type="checkbox" name="options[]" value="fontsize_formats" id="fontsize_formats" <?php if ( $this->check_user_setting( 'fontsize_formats' ) ) echo ' checked="checked"'; ?> />
+        <label for="fontsize_formats"><?php _e( 'Font sizes', 'tinymce-advanced' ); ?></label>
         <p><?php printf( __( 'Replace the size setting available for fonts with: %s.', 'tinymce-advanced' ), $this->fontsize_formats ); ?></p>
     </div>
@@ -338 +516 @@
 
 if ( ! is_multisite() || current_user_can( 'manage_sites' ) ) {
+    $preselect = function_exists( 'use_block_editor_for_post_type' ) ? '' : '<p>' . __( 'You can pre-select this option. It will be enabled as soon as you upgrade to WordPress 5.0 or later.', 'tinymce-advanced' ) . '</p>';
+
     ?>
     <div class="advanced-options">
     <h3><?php _e( 'Advanced Options', 'tinymce-advanced' ); ?></h3>
+    <div>
+        <input type="checkbox" name="admin_options[]" value="no_hybrid_mode" id="no_hybrid_mode" <?php if ( ! $this->check_admin_setting( 'no_hybrid_mode' ) ) echo ' checked'; ?> />
+        <label for="no_hybrid_mode"><?php _e( 'Hybrid Block Editor Mode', 'tinymce-advanced' ); ?></label>
+        <p><strong><?php _e( 'Brings the best of both editors together!', 'tinymce-advanced' ); ?></strong></p>
+        <p>
+            <?php _e( 'You can continue to use the familiar TinyMCE Editor in the (new and improved) &#8220;Classic&#8221; Paragraph Block, and at the same time have access to all blocks and new goodies of the Block Editor.', 'tinymce-advanced' ); ?>
+        </p>
+        <p>
+            <?php _e( 'Selecting this option makes the Classic Block in the Block Editor more prominent and adds a new &#8220;Classic Paragraph Block&#8221; that includes the TinyMCE Editor and replaces the Paragraph Block.', 'tinymce-advanced' ); ?>
+            <?php _e( 'Most existing TinyMCE plugins and add-ons will continue to work in the Classic Paragraph Block as well as in the Classic Block.', 'tinymce-advanced' ); ?>
+            <?php _e( 'This makes the Block Editor more familiar, easier to use, and much more compatible with your existing workflow.', 'tinymce-advanced' ); ?>
+        </p>
+        <p>
+            <?php _e( 'Note: The Classic Paragraph Block and the Classic Block are interchangeable. When saving a post that contains several successive Classic Paragraph blocks, they will be merged into one Classic Block.', 'tinymce-advanced' ); ?>
+            <?php _e( 'This will keep the blocks compatible should you decide to uninstall this plugin or turn the above option off.', 'tinymce-advanced' ); ?>
+        </p>
+        <?php echo $preselect ?>
+    </div>
+    <div>
+        <?php
+
+        if ( function_exists( 'is_plugin_active' ) && ! is_plugin_active( 'classic-editor/classic-editor.php' ) ) {
+
+            ?>
+            <input type="checkbox" name="admin_options[]" value="replace_block_editor" id="replace_block_editor" <?php if ( $this->check_admin_setting( 'replace_block_editor' ) ) echo ' checked'; ?> />
+            <label for="replace_block_editor"><?php _e( 'Replace the Block Editor with the Classic Editor', 'tinymce-advanced' ); ?></label>
+            <p>
+                <?php _e( 'Selecting this option will restore the previous (&#8220;classic&#8221;) editor and the previous Edit Post screen.', 'tinymce-advanced' ); ?>
+                <?php _e( 'It will allow you to use other plugins that enhance that editor, add old-style Meta Boxes, or in some way depend on the previous Edit Post screen.', 'tinymce-advanced' ); ?>
+            </p>
+            <?php echo $preselect ?>
+            <p>
+                <?php
+
+                $text = __( 'If you prefer to use both editors side by side, do not enable this option. It is better to install the %1$sClassic Editor plugin%2$s.', 'tinymce-advanced' );
+                $url = 'https://wordpress.org/plugins/classic-editor/';
+                printf( $text, '<a href="' . esc_url( $url ) . '">', '</a>' );
+
+                ?>
+            </p>
+            <?php
+        }
+
+        ?>
+    </div>
+    <div>
+        <input type="checkbox" name="admin_options[]" value="no_autop" id="no_autop" <?php if ( $this->check_admin_setting( 'no_autop' ) ) echo ' checked'; ?> />
+        <label for="no_autop"><?php _e( 'Keep paragraph tags', 'tinymce-advanced' ); ?></label>
+        <p><strong><?php _e( 'Recommended for better compatibility with the Block Editor (Gutenberg).', 'tinymce-advanced' ); ?></strong></p>
+        <p>
+            <?php _e( 'Stop removing the &lt;p&gt; and &lt;br&gt; tags when saving and show them in the Text editor.', 'tinymce-advanced' ); ?>
+            <?php _e( 'This will make it possible to use more advanced coding in the Text editor without the back-end filtering affecting it much.', 'tinymce-advanced' ); ?>
+            <?php _e( 'However it may behave unexpectedly in rare cases, so test it thoroughly before enabling it permanently.', 'tinymce-advanced' ); ?>
+            <?php _e( 'Line breaks in the Text editor would still affect the output, in particular do not use empty lines, line breaks inside HTML tags or multiple &lt;br&gt; tags.', 'tinymce-advanced' ); ?>
+        </p>
+    </div>
     <?php
 
@@ -346 +582 @@
     $disabled = ' disabled';
 
-    if ( $has_editor_style === 'not-supporetd' || $has_editor_style === 'not-present' ) {
+    if ( $has_editor_style === false ) {
         add_editor_style();
+        $has_editor_style = $this->has_editor_style();
     }
 
-    if ( $this->has_editor_style() === 'present' ) {
+    if ( $has_editor_style ) {
         $disabled = '';
-        $has_editor_style = 'present';
     }
 
     ?>
     <div>
-        <label><input type="checkbox" name="admin_options[]" value="importcss" id="importcss" <?php if ( ! $disabled && $this->check_admin_setting( 'importcss' ) ) echo ' checked="checked"'; echo $disabled; ?> />
-        <?php _e( 'Create CSS classes menu', 'tinymce-advanced' ); ?></label>
-        <p>
+        <input type="checkbox" name="admin_options[]" value="importcss" id="importcss" <?php if ( ! $disabled && $this->check_admin_setting( 'importcss' ) ) echo ' checked'; echo $disabled; ?> />
+        <label for="importcss"><?php _e( 'Create CSS classes menu', 'tinymce-advanced' ); ?></label>
+        <p>
+            <?php _e( 'Load the CSS classes used in editor-style.css and replace the Formats menu.', 'tinymce-advanced' ); ?>
+        </p>
         <?php
 
-        _e( 'Load the CSS classes used in editor-style.css and replace the Formats menu.', 'tinymce-advanced' );
-
-        if ( $has_editor_style === 'not-supporetd' ) {
+        if ( $disabled ) {
             ?>
-                <br>
-                <span class="tadv-error"><?php _e( 'ERROR:', 'tinymce-advanced' ); ?></span>
-                <?php _e( 'Your theme does not support editor-style.css.', 'tinymce-advanced' ); ?>
+            <p>
+            <span class="tadv-error"><?php _e( 'Disabled:', 'tinymce-advanced' ); ?></span>
+            <?php _e( 'A stylesheet file named editor-style.css was not added by your theme.', 'tinymce-advanced' ); ?>
+            <br>
             <?php
-        } elseif ( $disabled ) {
-            ?>
-                <br>
-                <span class="tadv-error"><?php _e( 'ERROR:', 'tinymce-advanced' ); ?></span>
-                <?php _e( 'A stylesheet file named editor-style.css was not added by your theme.', 'tinymce-advanced' ); ?>
-            <?php
-        }
-
-        if ( $has_editor_style === 'not-supporetd' || $disabled ) {
-            _e( 'To use this option, add editor-style.css to your theme or a child theme. Enabling this option will also load that stylesheet in the editor.', 'tinymce-advanced' );
         }
 
@@ -386 +613 @@
     </div>
     <div>
-        <label><input type="checkbox" name="admin_options[]" value="no_autop" id="no_autop" <?php if ( $this->check_admin_setting( 'no_autop' ) ) echo ' checked="checked"'; ?> />
-        <?php _e( 'Keep paragraph tags', 'tinymce-advanced' ); ?></label>
-        <p>
-            <?php _e( 'Stop removing the &lt;p&gt; and &lt;br /&gt; tags when saving and show them in the Text editor.', 'tinymce-advanced' ); ?>
-            <?php _e( 'This will make it possible to use more advanced coding in the Text editor without the back-end filtering affecting it much.', 'tinymce-advanced' ); ?>
-            <?php _e( 'However it may behave unexpectedly in rare cases, so test it thoroughly before enabling it permanently.', 'tinymce-advanced' ); ?>
-            <?php _e( 'Line breaks in the Text editor would still affect the output, in particular do not use empty lines, line breaks inside HTML tags or multiple &lt;br /&gt; tags.', 'tinymce-advanced' ); ?>
-        </p>
-    </div>
-    <div>
-        <label><input type="checkbox" name="admin_options[]" value="paste_images" id="paste_images" <?php if ( $this->check_admin_setting( 'paste_images' ) ) echo ' checked="checked"'; ?> />
-        <?php _e( 'Enable pasting of image source', 'tinymce-advanced' ); ?></label>
+        <input type="checkbox" name="admin_options[]" value="paste_images" id="paste_images" <?php if ( $this->check_admin_setting( 'paste_images' ) ) echo ' checked'; ?> />
+        <label for="paste_images"><?php _e( 'Enable pasting of image source', 'tinymce-advanced' ); ?></label>
         <p>
             <?php _e( 'Works only in Firefox and Safari. These browsers support pasting of images directly in the editor and convert them to base64 encoded text.', 'tinymce-advanced' ); ?>
@@ -404 +621 @@
         </p>
     </div>
+    <div>
+        <p class="tadv-help">
+        <?php
+
+        $text = __( 'For other advanced TinyMCE settings, including settings for the Classic Block in the Block Editor, you can use the %1$sAdvanced TinyMCE Configuration plugin%2$s.', 'tinymce-advanced' );
+        $url = 'https://wordpress.org/plugins/advanced-tinymce-configuration/';
+        printf( $text, '<a href="' . esc_url( $url ) . '">', '</a>' );
+
+        ?>
+        </p>
+    </div>
     </div>
 
@@ -418 +646 @@
         <h4><?php _e( 'Enable the editor enhancements for:', 'tinymce-advanced' ); ?></h4>
         <p>
-            <label><input type="checkbox" name="tadv_enable_at[]" value="edit_post_screen" <?php if ( $this->check_admin_setting( 'enable_edit_post_screen' ) ) echo ' checked="checked"'; ?> />
-            <?php _e( 'The main editor (Add New and Edit posts and pages)', 'tinymce-advanced' ); ?></label>
-        </p>
-        <p>
-            <label><input type="checkbox" name="tadv_enable_at[]" value="rest_of_wpadmin" <?php if ( $this->check_admin_setting( 'enable_rest_of_wpadmin' ) ) echo ' checked="checked"'; ?> />
-            <?php _e( 'Other editors in wp-admin', 'tinymce-advanced' ); ?></label>
-        </p>
-        <p>
-            <label><input type="checkbox" name="tadv_enable_at[]" value="on_front_end" <?php if ( $this->check_admin_setting( 'enable_on_front_end' ) ) echo ' checked="checked"'; ?> />
-            <?php _e( 'Editors on the front end of the site', 'tinymce-advanced' ); ?></label>
+            <input type="checkbox" id="tadv_enable_1" name="tadv_enable_at[]" value="edit_post_screen" <?php if ( $this->check_admin_setting( 'enable_edit_post_screen' ) ) echo ' checked'; ?> />
+            <label for="tadv_enable_1"><?php _e( 'The main editor (Add New and Edit posts and pages)', 'tinymce-advanced' ); ?></label>
+        </p>
+        <p>
+            <input type="checkbox" id="tadv_enable_2" name="tadv_enable_at[]" value="rest_of_wpadmin" <?php if ( $this->check_admin_setting( 'enable_rest_of_wpadmin' ) ) echo ' checked'; ?> />
+            <label for="tadv_enable_2"><?php _e( 'Other editors in wp-admin', 'tinymce-advanced' ); ?></label>
+        </p>
+        <p>
+            <input type="checkbox" id="tadv_enable_3" name="tadv_enable_at[]" value="on_front_end" <?php if ( $this->check_admin_setting( 'enable_on_front_end' ) ) echo ' checked'; ?> />
+            <label for="tadv_enable_3"><?php _e( 'Editors on the front end of the site', 'tinymce-advanced' ); ?></label>
         </p>
     </div>
@@ -435 +663 @@
 }
 ?>
+
+<hr>
 
 <p class="tadv-submit">

tinymce-advanced/trunk/tinymce-advanced.php

@@ -4 +4 @@
 Plugin URI: http://www.laptoptips.ca/projects/tinymce-advanced/
 Description: Enables advanced features and plugins in TinyMCE, the visual editor in WordPress.
-Version: 4.8.0
+Version: 4.8.1
 Author: Andrew Ozz
 Author URI: http://www.laptoptips.ca/
@@ -28 +28 @@
 */
 
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+
 if ( ! class_exists('Tinymce_Advanced') ) :
 
@@ -33 +37 @@
 
     private $required_version = '4.9.6';
-    private $plugin_version = '4.7.13';
+    private $plugin_version = '4.8.1';
 
     private $user_settings;
@@ -51 +55 @@
     private $buttons_filter = array();
     private $fontsize_formats = '8px 10px 12px 14px 16px 20px 24px 28px 32px 36px 48px 60px 72px 96px';
-    
+    private $required_menubar_plugins = array(
+        'anchor',
+        'code',
+        'insertdatetime',
+        'nonbreaking',
+        'print',
+        'searchreplace',
+        'table',
+        'visualblocks',
+        'visualchars'
+    );
 
     private function get_default_user_settings() {
         return array(
-            'options'   => 'menubar,advlist',
+            'options'   => 'menubar,advlist,menubar_block',
             'toolbar_1' => 'formatselect,bold,italic,blockquote,bullist,numlist,alignleft,aligncenter,alignright,link,unlink,undo,redo',
             'toolbar_2' => 'fontselect,fontsizeselect,outdent,indent,pastetext,removeformat,charmap,wp_more,forecolor,table,wp_help',
             'toolbar_3' => '',
             'toolbar_4' => '',
+            'toolbar_classic_block' => 'formatselect,bold,italic,blockquote,bullist,numlist,alignleft,aligncenter,alignright,link,forecolor,backcolor,table,wp_help',
             'plugins'   => 'anchor,code,insertdatetime,nonbreaking,print,searchreplace,table,visualblocks,visualchars,advlist,wptadv',
         );
@@ -96 +111 @@
             'contextmenu',
             'menubar',
+            'menubar_block',
             'fontsize_formats',
+            'no_merge_toolbars',
         );
     }
@@ -105 +122 @@
             'no_autop',
             'paste_images',
+            'no_hybrid_mode',
+            'replace_block_editor',
         );
     }
@@ -117 +136 @@
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            return;
-        }
 
         register_activation_hook( __FILE__, array( $this, 'check_plugin_version' ) );
@@ -136 +152 @@
 
         add_filter( 'mce_buttons', array( $this, 'mce_buttons_1' ), 999, 2 );
-        add_filter( 'mce_buttons_2', array( $this, 'mce_buttons_2' ), 999 );
-        add_filter( 'mce_buttons_3', array( $this, 'mce_buttons_3' ), 999 );
-        add_filter( 'mce_buttons_4', array( $this, 'mce_buttons_4' ), 999 );
-
-        add_filter( 'tiny_mce_before_init', array( $this, 'mce_options' ) );
+        add_filter( 'mce_buttons_2', array( $this, 'mce_buttons_2' ), 999, 2 );
+        add_filter( 'mce_buttons_3', array( $this, 'mce_buttons_3' ), 999, 2 );
+        add_filter( 'mce_buttons_4', array( $this, 'mce_buttons_4' ), 999, 2 );
+
+        add_filter( 'tiny_mce_before_init', array( $this, 'mce_options' ), 10, 2 );
         add_filter( 'mce_external_plugins', array( $this, 'mce_external_plugins' ), 999 );
         add_filter( 'tiny_mce_plugins', array( $this, 'tiny_mce_plugins' ), 999 );
-        add_action( 'after_wp_tiny_mce', array( $this, 'after_wp_tiny_mce' ) );
+
+        add_action( 'enqueue_block_editor_assets', array( $this, 'block_editor_assets' ), 20 );
+        // add_filter( 'block_editor_preload_paths', array( $this, 'initial_post_content' ), 10, 2 );
+
+        add_action( 'init', array( $this, 'block_editor_init' ) );
+
+        add_filter( 'wp_insert_post_data', array( $this, 'filter_post_content' ), 1 );
     }
 
@@ -174 +196 @@
 
         if ( ! $this->disabled_for_editor && ! $editor_style_added ) {
-            if ( $this->check_admin_setting( 'importcss' ) && $this->has_editor_style() !== 'present' ) {
+            if ( $this->check_admin_setting( 'importcss' ) && $this->has_editor_style() === false ) {
                 add_editor_style();
             }
@@ -190 +212 @@
     private function has_editor_style() {
         if ( ! current_theme_supports( 'editor-style' ) ) {
-            return 'not-supporetd';
+            return false;
         }
 
@@ -198 +220 @@
             foreach ( $editor_stylesheets as $url ) {
                 if ( strpos( $url, 'editor-style.css' ) !== false ) {
-                    return 'present';
+                    return $url;
                 }
             }
         }
 
-        return 'not-present';
+        return '';
     }
 
@@ -258 +280 @@
         $this->admin_options = ! empty( $this->admin_settings['options'] ) ? explode( ',', $this->admin_settings['options'] ) : array();
 
+        $default_user_settings = $this->get_default_user_settings();
+
         if ( $this->user_settings === false ) {
-            $this->user_settings = $this->get_default_user_settings();
+            $this->user_settings = $default_user_settings;
+        }
+
+        if ( empty( $this->user_settings['toolbar_1'] ) ) {
+            $this->user_settings['toolbar_1'] = $default_user_settings['toolbar_1'];
+        }
+
+        if ( empty( $this->user_settings['toolbar_classic_block'] ) ) {
+            $this->user_settings['toolbar_classic_block'] = $default_user_settings['toolbar_classic_block'];
         }
 
@@ -268 +300 @@
         $this->toolbar_3 = ! empty( $this->user_settings['toolbar_3'] ) ? explode( ',', $this->user_settings['toolbar_3'] ) : array();
         $this->toolbar_4 = ! empty( $this->user_settings['toolbar_4'] ) ? explode( ',', $this->user_settings['toolbar_4'] ) : array();
-
-        $this->used_buttons = array_merge( $this->toolbar_1, $this->toolbar_2, $this->toolbar_3, $this->toolbar_4 );
+        $this->toolbar_classic_block = ! empty( $this->user_settings['toolbar_classic_block'] ) ? explode( ',', $this->user_settings['toolbar_classic_block'] ) : array();
+
+        $this->used_buttons = array_merge( $this->toolbar_1, $this->toolbar_2, $this->toolbar_3, $this->toolbar_4, $this->toolbar_classic_block );
         $this->get_all_buttons();
 
@@ -400 +433 @@
             'backcolor' => 'Background color',
 
-            // Layer plugin ?
-        //  'insertlayer' => 'Layer',
-
             // WP
             'wp_adv'        => 'Toolbar Toggle',
@@ -513 +543 @@
         }
 
-        $buttons_1 = $this->toolbar_1;
+        if ( $editor_id === 'classic-block' ) {
+            $buttons_1 = $this->toolbar_classic_block;
+        } else {
+            $buttons_1 = $this->toolbar_1;
+        }
 
         if ( is_array( $original ) && ! empty( $original ) ) {
@@ -523 +557 @@
     }
 
-    public function mce_buttons_2( $original ) {
+    public function mce_buttons_2( $original, $editor_id ) {
         if ( $this->is_disabled() ) {
             return $original;
@@ -532 +566 @@
         }
 
-        $buttons_2 = $this->toolbar_2;
+        if ( $editor_id === 'classic-block' ) {
+            $buttons_2 = array();
+        } else {
+            $buttons_2 = $this->toolbar_2;
+        }
 
         if ( is_array( $original ) && ! empty( $original ) ) {
@@ -542 +580 @@
     }
 
-    public function mce_buttons_3( $original ) {
+    public function mce_buttons_3( $original, $editor_id ) {
         if ( $this->is_disabled() ) {
             return $original;
@@ -551 +589 @@
         }
 
-        $buttons_3 = $this->toolbar_3;
+        if ( $editor_id === 'classic-block' ) {
+            $buttons_3 = array();
+        } else {
+            $buttons_3 = $this->toolbar_3;
+        }
 
         if ( is_array( $original ) && ! empty( $original ) ) {
@@ -561 +603 @@
     }
 
-    public function mce_buttons_4( $original ) {
+    public function mce_buttons_4( $original, $editor_id ) {
         if ( $this->is_disabled() ) {
             return $original;
@@ -570 +612 @@
         }
 
-        $buttons_4 = $this->toolbar_4;
+        if ( $editor_id === 'classic-block' ) {
+            $buttons_4 = array();
+        } else {
+            $buttons_4 = $this->toolbar_4;
+        }
 
         if ( is_array( $original ) && ! empty( $original ) ) {
@@ -580 +626 @@
     }
 
-    public function mce_options( $init ) {
+    public function mce_options( $init, $editor_id = '' ) {
         if ( $this->is_disabled() ) {
             return $init;
@@ -586 +632 @@
 
         $init['image_advtab'] = true;
-        $init['rel_list'] = '[{text: "None", value: ""}, {text: "Nofollow", value: "nofollow"}]';
+        $init['rel_list'] = '[{text: "None", value: ""}, {text: "Nofollow", value: "nofollow noreferrer"}]';
 
         if ( $this->check_admin_setting( 'no_autop' ) ) {
@@ -594 +640 @@
         }
 
-        if ( $this->check_user_setting('menubar') ) {
-            $init['menubar'] = true;
+        if ( $editor_id === 'classic-block' ) {
+            if ( $this->check_user_setting('menubar_block') ) {
+                $init['menubar'] = true;
+            }
+
+            if (
+                ! $this->check_user_setting( 'no_merge_toolbars' ) &&
+                ! empty( $init['toolbar1'] ) &&
+                is_string( $init['toolbar1'] )
+            ) {
+                if ( ! empty( $init['toolbar2'] ) && is_string( $init['toolbar2'] ) ) {
+                    $init['toolbar1'] = $init['toolbar1'] . ',' . $init['toolbar2'];
+                    $init['toolbar2'] = '';
+                }
+                if ( ! empty( $init['toolbar3'] ) && is_string( $init['toolbar3'] ) ) {
+                    $init['toolbar1'] = $init['toolbar1'] . ',' . $init['toolbar3'];
+                    $init['toolbar3'] = '';
+                }
+                if ( ! empty( $init['toolbar4'] ) && is_string( $init['toolbar4'] ) ) {
+                    $init['toolbar1'] = $init['toolbar1'] . ',' . $init['toolbar4'];
+                    $init['toolbar4'] = '';
+                }
+            }
+        } else {
+            if ( $this->check_user_setting('menubar') ) {
+                $init['menubar'] = true;
+            }
         }
 
@@ -603 +674 @@
 
         if ( $this->check_admin_setting( 'importcss' ) ) {
-    //      $init['importcss_selector_filter'] = 'function(sel){return /^\.[a-z0-9]+$/i.test(sel);}';
             $init['importcss_file_filter'] = 'editor-style.css';
         }
@@ -617 +687 @@
         if ( in_array( 'table', $this->plugins, true ) ) {
             $init['table_toolbar'] = false;
+
+            // Remove default table styles and attributes. They should be set by the theme.
+            // Note that if the table cells are resized by dragging, an inline style with the widths will still be added.
+            $init['table_default_attributes'] = '{}';
+            $init['table_default_styles'] = '{}';
         }
 
@@ -622 +697 @@
     }
 
-    public function after_wp_tiny_mce() {
-        if ( $this->is_disabled() ) {
-            return;
-        }
-
-        ?>
-        <script>
-        !function(a,b){"undefined"!=typeof a&&"undefined"!=typeof b&&a(function(){b.addButton("sofbg-axcell","&para;",function(b,c){
-        var d=a(c),e=a.trim(d.val()),f="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|" +
-        "address|math|style|p|h[1-6]|hr|fieldset|legend|tmadv|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary";
-        -1!==e.indexOf("</p>")&&-1===e.indexOf("\n\n")&&(e=e.replace(new RegExp("<(?:"+f+")(?: [^>]*)?>","gi"),"\n$&"),
-        e=e.replace(new RegExp("</(?:"+f+")>","gi"),"$&\n"),e=e.replace(/(<br(?: [^>]*)?>)[\r\n\t]*/gi,"$1\n"),
-        e=e.replace(/>\n[\r\n\t]+</g,">\n<"),e=e.replace(/^<li/gm," <li"),e=e.replace(/<td>\u00a0<\/td>/g,"<td>&nbsp;</td>"),
-        d.val(a.trim(e)))},"","","Fix line breaks")})}(window.jQuery,window.QTags);
-        </script>
-        <?php
-    }
-
-    public function htmledit( $content ) {
-        return $content;
+    public function block_editor_assets() {
+        $plugin_url = plugins_url( 'block-editor', __FILE__ );
+
+        if ( ! $this->check_admin_setting( 'no_hybrid_mode' ) ) {
+            $dependencies = array( 'wp-element', 'wp-components', 'wp-i18n', 'wp-keycodes', 'wp-blocks', 'wp-hooks', 'lodash' );
+            wp_enqueue_script( 'tadv-block-register', $plugin_url . '/block-register.js', $dependencies );
+
+            wp_enqueue_style( 'tadv-classic-paragraph-styles', $plugin_url . '/classic-paragraph.css' );
+        }
+
+        wp_enqueue_style( 'tadv-block-editor-styles', $plugin_url . '/block-editor.css' );
+    }
+
+    public function initial_post_content( $paths, $post ) {
+        if ( $post->post_status === 'auto-draft' && empty( $post->post_content ) ) {
+            $post->post_content = '<p><br data-mce-bogus="1"></p>';
+        }
+
+        return $paths;
+    }
+
+    public function block_editor_init() {
+        if ( $this->check_admin_setting( 'replace_block_editor' ) && ! class_exists( 'Classic_Editor' ) ) {
+            add_filter( 'use_block_editor_for_post_type', '__return_false', 1000 );
+        }
+    }
+
+    public function filter_post_content( $data ) {
+        $content = $data['post_content'];
+        // Fix for the fix to keep <p> tags inside the classic block :-(
+        // $data is slashed...
+        if ( strpos( $content, '<p data-tadv-p=\"keep\">' ) !== false ) {
+            $content = str_replace( '<p data-tadv-p=\"keep\">', '<p>', $content );
+        }
+
+        if ( ! $this->check_admin_setting( 'no_hybrid_mode' ) && strpos( $content, '<!-- wp:paragraph {\"tadvType\":\"classic\"} -->' ) !== false ) {
+            $content = preg_replace( '@<!-- wp:paragraph \{\\\"tadvType\\\":\\\"classic\\\"\} -->\s*([\s\S]+?)<!-- \/wp:paragraph -->\s*@', '$1', $content );
+        }
+
+        $data['post_content'] = $content;
+        return $data;
     }
 
@@ -761 +857 @@
         }
 
-        for ( $i = 1; $i < 5; $i++ ) {
-            $toolbar_name = 'toolbar_' . $i;
+        for ( $i = 1; $i < 6; $i++ ) {
+            $toolbar_name = ( $i < 5 ) ? 'toolbar_' . $i : 'toolbar_classic_block';
 
             if ( ! empty( $user_settings[ $toolbar_name ] ) ) {
@@ -772 +868 @@
             }
 
-            if ( $i > 1 && ( $wp_adv = array_search( 'wp_adv', $toolbar ) ) !== false ) {
-                unset( $toolbar[ $wp_adv ] );
+            if ( $i > 1 && in_array( 'wp_adv', $toolbar, true ) ) {
+                $toolbar = array_diff( $toolbar, array( 'wp_adv' ) );
             }
 
@@ -782 +878 @@
             $options = explode( ',', $user_settings['options'] );
         } elseif ( ! empty( $_POST['options'] ) && is_array( $_POST['options'] ) ) {
-            $options = $_POST['options'];
+            $options_raw = $_POST['options'];
+            // Negate
+            if ( in_array( 'no_merge_toolbars', $options_raw, true ) ) {
+                $options_raw = array_diff( $options_raw, array( 'no_merge_toolbars' ) );
+            } else {
+                $options_raw[] = 'no_merge_toolbars';
+            }
+
+            $options = $options_raw;
         } else {
             $options = array();
@@ -791 +895 @@
         if ( ! empty( $user_settings['plugins'] ) ) {
             $plugins = explode( ',', $user_settings['plugins'] );
-        } elseif ( ! empty( $_POST['options']['menubar'] ) ) {
-            $plugins = array( 'anchor', 'code', 'insertdatetime', 'nonbreaking', 'print', 'searchreplace', 'table', 'visualblocks', 'visualchars' );
         } else {
             $plugins = array();
+        }
+
+        if ( ! empty( $settings['options']['menubar'] ) || ! empty( $settings['options']['menubar_block'] ) ) {
+            $plugins = array_merge( $plugins, $this->required_menubar_plugins );
         }
 
@@ -832 +938 @@
         } elseif ( isset( $_POST['tadv-save'] ) ) {
             if ( ! empty( $_POST['admin_options'] ) && is_array( $_POST['admin_options'] ) ) {
-                $save_admin_settings['options'] = $this->validate_settings( $_POST['admin_options'], $this->get_all_admin_options() );
+                $admin_options = $_POST['admin_options'];
+                // Negate
+                if ( in_array( 'no_hybrid_mode', $admin_options, true ) ) {
+                    $admin_options = array_diff( $admin_options, array( 'no_hybrid_mode' ) );
+                } else {
+                    $admin_options[] = 'no_hybrid_mode';
+                }
+
+                $save_admin_settings['options'] = $this->validate_settings( $admin_options, $this->get_all_admin_options() );
             }