Merge pull request #179 from V-Simos/main

default license_key to 'gpl' so legacy profiles work on TinyMCE 8

Author: skerbis

assets/scripts/base.js

@@ -505,6 +505,10 @@ function tiny_init(container) {
             }
         }
 
+        if (!options.hasOwnProperty('license_key')) {
+            options.license_key = 'gpl';
+        }
+
         if (!options.hasOwnProperty('convert_newlines_to_brs')) {
             options.convert_newlines_to_brs = false;
         }

assets/scripts/profiles-list.js

@@ -177,6 +177,7 @@
               var c = Object.assign({}, window.tinyprofiles[profileKey]);
               c.selector = '#tinymcePreviewEditor';
               c.height = c.height || 300;
+              if (!c.license_key) { c.license_key = 'gpl'; }
               window.tinymce.init(c);
             }
           } catch (e) {
@@ -193,6 +194,7 @@
               // final fallback: call tinymce.init with parsed conf
               conf.selector = '#tinymcePreviewEditor';
               conf.height = conf.height || 300;
+              if (!conf.license_key) { conf.license_key = 'gpl'; }
               window.tinymce.init(conf);
             } else if (modalBody) {
               modalBody.innerHTML += '<div class="text-danger">TinyMCE not available — please run the build or check vendor/tinymce is present.</div>';

assets/scripts/tests/mblock-integration-test.js

@@ -27,7 +27,7 @@
       tiny_init(window.jQuery(wrapper));
       log('called tiny_init on mblock wrapper — waiting for tinymce instance...');
     } else if (window.tinymce && typeof window.tinymce.init === 'function') {
-      window.tinymce.init({ selector: '#mblockIntegrationTestEditor' });
+      window.tinymce.init({ selector: '#mblockIntegrationTestEditor', license_key: 'gpl' });
       log('called tinymce.init fallback — waiting for tinymce instance...');
     } else {
       log('tinymce not found on page — ensure vendor build is loaded');

lib/TinyMce/Creator/Profiles.php

@@ -151,6 +151,10 @@ public static function mapProfile(array $profile): string
                 }
             }
 
+            if (1 !== preg_match('/(?:^|[,\{\r\n])\s*license_key\s*:/', $extra)) {
+                $extra = "license_key: 'gpl',\n" . $extra;
+            }
+
             return $extra;
         }
         return $jsonProfile;