Fixed : Work with enabled system setting "compress_js".

Version 1.6.1-pl
danyaPostfactum · Aug 8, 2015 · c1c9cda · c1c9cda
1 parent 25a77b5
commit c1c9cda
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/_build/build.config.php b/_build/build.config.php
@@ -2,7 +2,7 @@
 
 define('PKG_NAME','Ace');
 define('PKG_NAMESPACE','ace');
-define('PKG_VERSION','1.6.0');
+define('PKG_VERSION','1.6.1');
 define('PKG_RELEASE','pl');
 define('PKG_AUTO_INSTALL', true);
 

diff --git a/assets/components/ace/ace/ace.js → assets/components/ace/ace/ace.min.js b/assets/components/ace/ace/ace.js → assets/components/ace/ace/ace.min.js
diff --git a/assets/components/ace/modx.texteditor.js b/assets/components/ace/modx.texteditor.js
@@ -236,6 +236,7 @@ MODx.ux.Ace = Ext.extend(Ext.ux.Ace, {
         MODx.ux.Ace.superclass.initComponent.call(this);
         var config = ace.require("ace/config");
         var acePath = MODx.config['assets_url'] + 'components/ace/ace';
+        config.set('basePath', acePath);
         config.set('modePath', acePath);
         config.set('themePath', acePath);
         config.set('workerPath', acePath);

diff --git a/core/components/ace/documents/changelog.txt b/core/components/ace/documents/changelog.txt
@@ -1,5 +1,9 @@
 Changelog for Ace integration into MODx Revolution.
 
+Ace 1.6.1
+====================================
+- Fixed : Work with enabled system setting "compress_js".
+
 Ace 1.6.0
 ====================================
 - Added: "Smarty" syntax for support of Fenom in chunks.

diff --git a/core/components/ace/model/ace/ace.class.php b/core/components/ace/model/ace/ace.class.php
@@ -36,7 +36,7 @@ function __construct(modX &$modx,array $config = array()) {
     public function initialize() {
         if (!$this->assetsLoaded) {
             $this->modx->controller->addLexiconTopic('ace:default');
-            $this->modx->controller->addJavascript($this->config['assetsUrl'].'ace/ace.js');
+            $this->modx->controller->addJavascript($this->config['assetsUrl'].'ace/ace.min.js');
             $this->modx->controller->addJavascript($this->config['assetsUrl'].'ace/ext-language_tools.js');
             $this->modx->controller->addJavascript($this->config['assetsUrl'].'ace/ext-keybinding_menu.js');
             $this->modx->controller->addJavascript($this->config['assetsUrl'].'ace/ext-emmet.js');