Merge pull request #43 from danyaPostfactum/ajaxready

Make ClientConfig compatible with AjaxManager

Author: Mark-H

assets/components/clientconfig/js/mgr/sections/admin.js

@@ -1,15 +1,8 @@
-Ext.onReady(function() {
-    MODx.load({
-        xtype: 'clientconfig-page-admin',
-        renderTo: 'clientconfig-wrapper-div'
-    });
-    MODx.config.help_url = 'http://rtfm.modx.com/display/ADDON/ClientConfig';
-});
- 
 ClientConfig.page.Admin = function(config) {
     config = config || {};
     Ext.applyIf(config,{
         cls: 'container form-with-labels',
+        renderTo: 'clientconfig-wrapper-div',
         border: false,
         components: [{
             xtype: 'panel',
@@ -63,7 +56,7 @@ ClientConfig.page.Admin = function(config) {
 };
 Ext.extend(ClientConfig.page.Admin,MODx.Component,{
     toClientView: function() {
-        location.href = MODx.config.manager_url + '?a=' + MODx.request.a;
+        MODx.loadPage(MODx.request.a);
     }
 });
 Ext.reg('clientconfig-page-admin',ClientConfig.page.Admin);

assets/components/clientconfig/js/mgr/sections/home.js

@@ -1,12 +1,9 @@
-Ext.onReady(function() {
-    MODx.load({ xtype: 'clientconfig-page-home', renderTo: 'clientconfig-wrapper-div'});
-});
- 
 ClientConfig.page.Home = function(config) {
     config = config || {};
     Ext.applyIf(config,{
         id: 'clientconfig-page-home',
         cls: 'container form-with-labels',
+        renderTo: 'clientconfig-wrapper-div',
         layout: 'form',
         border: false,
         components: [{
@@ -194,7 +191,7 @@ Ext.extend(ClientConfig.page.Home,MODx.Component,{
 
     openAdminPanel: function() {
         if (ClientConfig.isAdmin) {
-            location.href = MODx.config.manager_url + '?a=' + MODx.request.a + '&action=admin';
+            MODx.loadPage(MODx.request.a, 'action=admin');
         }
     }
 });

core/components/clientconfig/controllers/admin.class.php

@@ -36,6 +36,13 @@ public function loadCustomCssJs() {
         $this->addJavascript($this->clientconfig->config['jsUrl'].'mgr/widgets/combos.js');
 
         $this->addLastJavascript($this->clientconfig->config['jsUrl'].'mgr/sections/admin.js');
+
+        $this->addHtml('<script type="text/javascript">
+        Ext.onReady(function() {
+            MODx.config.help_url = "http://rtfm.modx.com/display/ADDON/ClientConfig";
+            MODx.load({ xtype: "clientconfig-page-admin" });
+        });
+        </script>');
     }
 
     /**

core/components/clientconfig/controllers/home.class.php

@@ -42,6 +42,7 @@ public function process(array $scriptProperties = array()) {
         Ext.onReady(function() {
             ClientConfig.data = '.$this->modx->toJSON($tabs).';
             ClientConfig.isAdmin = ' . (($this->clientconfig->hasAdminPermission()) ? '1' : '0') .';
+            MODx.load({ xtype: "clientconfig-page-home" });
         });
         </script>');
     }