Merge branch 'master' into issue_482

zopefoundation · Feb 13, 2019 · 508bf5a · 508bf5a
2 parents 22a1dc4 + 5fb4287
commit 508bf5a
Show file tree

Hide file tree

Showing 21 changed files with 343 additions and 233 deletions.
diff --git a/src/OFS/dtml/documentEdit.dtml b/src/OFS/dtml/documentEdit.dtml
@@ -21,7 +21,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<textarea id="content" data-contenttype="html" 
+				<textarea id="content" data-contenttype="dtml" 
 					class="form-control zmi-code col-sm-12" name="data:text" wrap="off" 
 					rows="20"><dtml-var __str__></textarea>
 			</div>

diff --git a/src/zmi/styles/resources/ace.ajax.org/ace.js b/src/zmi/styles/resources/ace.ajax.org/ace.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-css.js b/src/zmi/styles/resources/ace.ajax.org/mode-css.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-html.js b/src/zmi/styles/resources/ace.ajax.org/mode-html.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-javascript.js b/src/zmi/styles/resources/ace.ajax.org/mode-javascript.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-less.js b/src/zmi/styles/resources/ace.ajax.org/mode-less.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-markdown.js b/src/zmi/styles/resources/ace.ajax.org/mode-markdown.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-python.js b/src/zmi/styles/resources/ace.ajax.org/mode-python.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-sql.js b/src/zmi/styles/resources/ace.ajax.org/mode-sql.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-text.js b/src/zmi/styles/resources/ace.ajax.org/mode-text.js
@@ -0,0 +1,8 @@
+;                (function() {
+                    ace.require(["ace/mode/text"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+