Merge pull request #334 from plone/es6

Mockup ES6: Remove JavaScript from this package.
plone · Mar 24, 2022 · 802def4 · 802def4
2 parents 4e14835 + ff06fd4
commit 802def4
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 342 deletions.
diff --git a/news/334.breaking b/news/334.breaking
@@ -0,0 +1,7 @@
+Remove JavaScript from this package and move it to Mockup.
+[thet]
+
+Modeleditor: Use pat-code-editor from Patternslib instead ACE.
+Make the model editing form usable without JavaScript.
+Allow editing the form even with XML errors to be able to fix the problem.
+[thet]
diff --git a/plone/app/dexterity/behaviors/tests/test_id.py b/plone/app/dexterity/behaviors/tests/test_id.py
@@ -3,7 +3,7 @@
 from plone.app.dexterity.testing import DEXTERITY_FUNCTIONAL_TESTING
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
-from plone.testing import z2
+from plone.testing.zope import Browser
 
 import transaction
 import unittest
@@ -21,7 +21,7 @@ def setUp(self):
         transaction.commit()
 
         # prepare browser
-        self.browser = z2.Browser(self.layer['app'])
+        self.browser = Browser(self.layer['app'])
         self.browser.addHeader(
             'Authorization',
             'Basic {0}:{1}'.format(SITE_OWNER_NAME, SITE_OWNER_PASSWORD, )

diff --git a/plone/app/dexterity/browser/configure.zcml b/plone/app/dexterity/browser/configure.zcml
@@ -127,11 +127,6 @@
       permission="plone.schemaeditor.ManageSchemata"
       />
 
-  <browser:resource
-      name="plone.app.dexterity.types_listing.js"
-      file="types_listing.js"
-      />
-
   <configure zcml:condition="installed plone.resourceeditor">
     <browser:page
         name="modeleditor"
@@ -140,23 +135,6 @@
         permission="plone.schemaeditor.ManageSchemata"
         template="modeleditor.pt"
         />
-
-    <browser:page
-        name="model-edit-save"
-        for="plone.schemaeditor.interfaces.ISchemaContext"
-        class=".modeleditor.AjaxSaveHandler"
-        permission="plone.schemaeditor.ManageSchemata"
-        />
-
-    <browser:resource
-      name="plone.app.dexterity.modeleditor.css"
-      file="modeleditor.css"
-      />
-
-    <browser:resource
-      name="plone.app.dexterity.modeleditor.js"
-      file="modeleditor.js"
-      />
   </configure>
 
 </configure>
diff --git a/plone/app/dexterity/browser/modeleditor.css b/plone/app/dexterity/browser/modeleditor.css
diff --git a/plone/app/dexterity/browser/modeleditor.js b/plone/app/dexterity/browser/modeleditor.js
diff --git a/plone/app/dexterity/browser/modeleditor.pt b/plone/app/dexterity/browser/modeleditor.pt
@@ -9,12 +9,6 @@
 <body>
 <article metal:fill-slot="prefs_configlet_main">
 <tal:main-macro metal:define-macro="main">
-  <tal:comment tal:condition="python:False">
-    prefs_main_template doesn't have the style_slot
-  </tal:comment>
-  <style type="text/css"
-      tal:content="string:@import url(${portal_url}/++resource++plone.app.dexterity.modeleditor.css);"
-      />
 
   <header id="page-intro">
    <a href=""
@@ -23,6 +17,7 @@
         i18n:translate="label_back_to_schemaeditor">
             Back to the schema editor
     </a>
+
     <h1 class="documentFirstHeading"
         i18n:translate="heading_model_edit">Edit field model for
       <span i18n:name="name" tal:content="context/Title">name</span>
@@ -38,40 +33,31 @@
    </header>
 
   <div id="rules-editor">
-    <div class="portalMessage info">
-      <span id="messagespan" style="display:none">
-        &nbsp;
-      </span>&nbsp;
-    </div>
 
-    <form id="saveform"
-        tal:attributes="action string:${context/absolute_url}/@@model-edit-save"
+    <form
+        class="modeleditor__form"
+        action="${context/absolute_url}/@@modeleditor"
+        method="POST"
         tal:define="authenticator context/@@authenticator/authenticator | nothing">
+
       <input tal:replace="structure authenticator" />
-      <input type="hidden" id="savesource" name="source" value="" />
-      <div class="mb-3">
-         <button class="btn btn-primary" type="submit" name="form.button.save" disabled="disabled" i18n:translate="">Save</button>
 
-      </div>
-    </form>
+      <textarea
+          name="source"
+          class="modeleditor__source pat-code-editor"
+          data-pat-code-editor="language: xml; theme: okaidia">${view/escaped_model_source}</textarea>
 
-    <div id="modelEditor" tal:content="view/modelSource" />
-  </div>
+      <br />
+
+      <button
+          class="btn btn-primary"
+          type="submit"
+          name="form.button.save" 
+          i18n:translate="">Save</button>
 
-  <tal:comment tal:condition="python:False">
-      prefs_main_template doesn't have the head_javascript_slot
-  </tal:comment>
+    </form>
 
-  <script src="++plone++static/components/ace-builds/src/ace.js"
-      type="text/javascript"
-      charset="utf-8"
-      tal:attributes="src string:${portal_url}/++plone++static/components/ace-builds/src/ace.js"
-      ></script>
-  <script src="++resource++plone.schemaeditor/modeleditor.js"
-      type="text/javascript"
-      charset="utf-8"
-      tal:attributes="src string:${portal_url}/++resource++plone.app.dexterity.modeleditor.js"
-      ></script>
+  </div>
 
 </tal:main-macro>
 </article>