Fix MODX 2.5.1 issue

* origin/pr/20:
  Fixing MODX 2.5.1 issue

Author: theboxer

core/components/tinymce/docs/changelog.txt

@@ -2,6 +2,10 @@
 This file shows the changes in recent releases of TinyMCE for MODx. The most current release is usually the 
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+TinyMCE 4.3.4
+====================================
+- Use modx->controller->addJavascript/addHtml/etc to fix issue in MODX Revolution 2.5.1
+
 TinyMCE 4.3.3
 ====================================
 - Change popup windows to more convenient modals

core/components/tinymce/tinymce.class.php

@@ -148,21 +148,19 @@ public function initialize() {
             $this->modx->getVersionData();
             $inRevo20 = (boolean)version_compare($this->modx->version['full_version'],'2.1.0-rc1','<');
 
-            $this->modx->regClientStartupScript($this->config['assetsUrl'].'jscripts/tiny_mce/'.$scriptFile);
-            $this->modx->regClientStartupScript($this->config['assetsUrl'].'xconfig.js');
+            $this->modx->controller->addJavascript($this->config['assetsUrl'].'jscripts/tiny_mce/'.$scriptFile);
+            $this->modx->controller->addJavascript($this->config['assetsUrl'].'xconfig.js');
             if ($compressJs) {
-                $this->modx->regClientStartupScript($this->config['assetsUrl'].'tiny.min.js');
+                $this->modx->controller->addJavascript($this->config['assetsUrl'].'tiny.min.js');
             } else {
-                $this->modx->regClientStartupScript($this->config['assetsUrl'].'tiny.js');
+                $this->modx->controller->addJavascript($this->config['assetsUrl'].'tiny.js');
             }
 
             $source = $this->context->getOption('default_media_source',1);
-            $this->modx->regClientStartupHTMLBlock('<script type="text/javascript">' . "\n//<![CDATA[" .  "\nvar inRevo20 = ".($inRevo20 ? 1 : 0).";MODx.source = '".$source."';Tiny.lang = "  . $this->modx->toJSON($lang). ';' . "\n//]]>" . "\n</script>");
+            $this->modx->controller->addHtml('<script type="text/javascript">' . "\n//<![CDATA[" .  "\nvar inRevo20 = ".($inRevo20 ? 1 : 0).";MODx.source = '".$source."';Tiny.lang = "  . $this->modx->toJSON($lang). ';' . "\n//]]>" . "\n</script>");
             if (!$compressJs) {
-                $this->modx->regClientStartupScript($this->config['assetsUrl'].'tinymce.panel.js');
+                $this->modx->controller->addJavascript($this->config['assetsUrl'].'tinymce.panel.js');
             }
-
-
             $this->jsLoaded = true;
         }
         return $this->getScript();
@@ -228,21 +226,17 @@ public function getScript() {
                 unset($this->properties['elements']);
                 $richtextResource = false; /* workaround for modx ui bug with rte tvs */
             }
-            $this->config['resource'] = $this->config['resource']->toArray();
         }
         $templates = $this->getTemplateList();
 
-        /* get formats */
-        //$this->properties['formats'] = $this->getFormats();
         /* get JS */
         unset($this->properties['resource']);
         ob_start();
         include_once dirname(__FILE__).'/templates/script.tpl';
         $script = ob_get_contents();
         ob_end_clean();
 
-        /* will need to do $this->modx->controller->addHtml() for Revo 2.2+ */
-        $this->modx->regClientStartupHTMLBlock($script);
+        $this->modx->controller->addHtml($script);
         return '';
     }
 
@@ -354,4 +348,4 @@ public function getFormats() {
         ),
     ),
 );
- */
+ */