Setup viewer for ModuleController, move locally scoped jquery and ent…

…wine into preview handler js

_config/extensions.yml

@@ -1,6 +1,9 @@
 Page:
   extensions:
     - ContentModule_PageExtension
+Page_Controller:
+  extensions:
+    - ContentModule_PageController_Extension
 SiteConfig:
   extensions:
     - ContentModuleSiteConfigExtension

code/controllers/ModuleController.php

@@ -35,6 +35,19 @@ public function init()
         parent::init();
     }
 
+    /**
+     * Return an SSViewer object to process the data
+     *
+     * Overwrite defaut viewer by disabling requirements
+     *
+     * @return SSViewer The viewer identified being the default handler for this Controller/Action combination
+     */
+    public function getViewer($action) {
+        $viewer = new SSViewer(array_reverse(ClassInfo::ancestry($this->data()->class)));
+        $viewer->includeRequirements(false);
+        return $viewer;
+    }
+
     public function handleRequest(SS_HTTPRequest $request, DataModel $model)
     {
         return parent::handleRequest($request, $model);

code/model/ContentModule.php

@@ -380,7 +380,7 @@ public function forTemplate()
             $controller->setFailover($this);
         }
 
-        $html = $controller->renderWith(array_reverse(ClassInfo::ancestry($this->class)));
+        $html = $controller->renderWith($controller->getViewer(''));
 
         //check if we are in editor mode, if so inject html to handle modules
         if ($this->getIsEditorMode()) {
@@ -1187,9 +1187,7 @@ public function injectModuleEditor(HTMLText $html)
         //clear the errors
         libxml_clear_errors();
 
-        $html->setValue($newHTML);
-
-        return $html;
+        return DBField::create_field('HTMLText', $newHTML);
     }
 
     /**

javascript/ContentModuleField.js

@@ -611,7 +611,7 @@
                 e.preventDefault();
                 e.stopPropagation();
 
-                var name = this.attr('name');console.log(this, name);
+                var name = this.attr('name');
                 var action = name.substring(name.indexOf('_') + 1, name.lastIndexOf('_'));
 
                 this.closest('.content-module').submitModule(action);
@@ -631,7 +631,7 @@
                 e.preventDefault();
                 e.stopPropagation();
 
-                var name = this.attr('name');console.log(this, name);
+                var name = this.attr('name');
                 var action = name.substring(name.indexOf('_') + 1, name.lastIndexOf('_'));
 
                 var contentModule = this.closest('.content-module');