XML code highlight, readme update

nikitaeverywhere · nikitaeverywhere · commit 606b4772ce69 · 2016-04-23T11:46:34.000+03:00
diff --git a/README.md b/README.md
@@ -3,6 +3,20 @@
 A Web-based user interface for InterSystems Caché which allows to create and manage classes
 literally without touching any code.
 
+Features
+--------
+
++ Simple, intuitive and powerful visual class editing and exploring tool for both desktop and mobile devices;
++ Supports all basic class editing functionality:
+    + Adding/deleting classes, editing class keywords, comments, etc;
+    + Adding/deleting/altering class members: parameters, properties, methods, queries, xDatas, indices;
+    + **Convenient code editing** for methods and xDatas;
+    + Editing all class members keywords with inputs, drop-downs and suggestions;
+    + XData code highlight (COS highlight is coming!);
++ **Embedded web terminal** if [Caché web terminal](http://intersystems-ru.github.io/webterminal/) is installed in the system;
++ Smart class members grouping, folding and convenient interface, adaptive design;
++ More features are coming!
+
 Preview
 -------
 
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cache-visual-editor",
   "printableName": "Cache Visual Editor",
   "packageName": "VisualEditor",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Visual class editor for InterSystems Caché",
   "main": "index.js",
   "keywords": [
diff --git a/source/cache/REST/StaticLibJS.cls b/source/cache/REST/StaticLibJS.cls
@@ -5,7 +5,8 @@ Class VisualEditor.REST.StaticLibJS extends VisualEditor.REST.Content [ Generate
 XData UrlMap
 {
 <Routes>
-   <Route Url="/ace.js" Method="GET" Call="AceJS"/>
+   <Route Url="/ace/ace.js" Method="GET" Call="AceJS"/>
+   <Route Url="/ace/mode-xml.js" Method="GET" Call="AceXML"/>
 </Routes>
 }
 
@@ -15,10 +16,22 @@ ClassMethod AceJS() As %Status
 	return ..PrintXData("acejs")
 }
 
+/// Outputs ace.js code
+ClassMethod AceXML() As %Status
+{
+	return ..PrintXData("acexml")
+}
+
 /// This block handles HTML markup.
 XData acejs [ MimeType = text/javascript ]
 {
-<d><![CDATA[<!-- @include ../client/js/lib/ace.js -->]]></d>
+<d><![CDATA[<!-- @include ../client/js/lib/ace/ace.js -->]]></d>
+}
+
+/// This block handles HTML markup.
+XData acexml [ MimeType = text/javascript ]
+{
+<d><![CDATA[<!-- @include ../client/js/lib/ace/mode-xml.js -->]]></d>
 }
 
 }
diff --git a/source/client/index.html b/source/client/index.html
@@ -11,7 +11,7 @@
     <link rel="icon" type="image/png" href="favicon.png"/>
     <link rel="stylesheet" href="css/index.css"/>
     <script type="text/javascript" src="js/index.js" async defer></script>
-    <script type="text/javascript" src="js/lib/ace.js" async defer></script>
+    <script type="text/javascript" src="js/lib/ace/ace.js" async defer></script>
 </head>
 <body>
     <div class="pages">
diff --git a/source/client/js/classEditor/class/code.js b/source/client/js/classEditor/class/code.js
@@ -30,6 +30,7 @@ export function getCodeCaptionView ({ memberManifest, codePropertyName, data, sa
         keywordManifest = (memberManifest[codePropertyName] || {}),
         returnTypeProp = keywordManifest["returnTypeProperty"] || ``,
         formalSpecProperty = keywordManifest["formalSpecProperty"] || ``,
+        codeMode = keywordManifest[`codeMode`] || "",
         ROUTINE_SUPPORT = hasRoutineCode(code),
         useRoutinesToggle = toggle(ROUTINE_SUPPORT),
         useRoutinesBlock = block(`div`, `property-block`),
@@ -102,6 +103,14 @@ export function getCodeCaptionView ({ memberManifest, codePropertyName, data, sa
     editor.setOptions({
         maxLines: Infinity
     });
+    if (
+        codeMode
+        || data[`MimeType`] === `` // default is `text/xml`
+        || data[`MimeType`] === `text/xml`
+        || data[`MimeType`] === `text/html`
+    ) {
+        editor.getSession().setMode("ace/mode/xml");
+    }
 
     editor.on(`change`, ({ start, end }) => {
         if (start.row !== end.row)
diff --git a/source/client/js/lib/ace/ace.js b/source/client/js/lib/ace/ace.js
diff --git a/source/client/js/lib/ace/mode-xml.js b/source/client/js/lib/ace/mode-xml.js

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ Class VisualEditor.REST.StaticLibJS extends VisualEditor.REST.Content [ Generate`
`5`	`5`	`XData UrlMap`
`6`	`6`	`{`
`7`	`7`	`<Routes>`
`8`		`- <Route Url="/ace.js" Method="GET" Call="AceJS"/>`
	`8`	`+ <Route Url="/ace/ace.js" Method="GET" Call="AceJS"/>`
	`9`	`+ <Route Url="/ace/mode-xml.js" Method="GET" Call="AceXML"/>`
`9`	`10`	`</Routes>`
`10`	`11`	`}`
`11`	`12`
`@@ -15,10 +16,22 @@ ClassMethod AceJS() As %Status`
`15`	`16`	`return ..PrintXData("acejs")`
`16`	`17`	`}`
`17`	`18`
	`19`	`+/// Outputs ace.js code`
	`20`	`+ClassMethod AceXML() As %Status`
	`21`	`+{`
	`22`	`+ return ..PrintXData("acexml")`
	`23`	`+}`
	`24`	`+`
`18`	`25`	`/// This block handles HTML markup.`
`19`	`26`	`XData acejs [ MimeType = text/javascript ]`
`20`	`27`	`{`
`21`		`-<d><![CDATA[<!-- @include ../client/js/lib/ace.js -->]]></d>`
	`28`	`+<d><![CDATA[<!-- @include ../client/js/lib/ace/ace.js -->]]></d>`
	`29`	`+}`
	`30`	`+`
	`31`	`+/// This block handles HTML markup.`
	`32`	`+XData acexml [ MimeType = text/javascript ]`
	`33`	`+{`
	`34`	`+<d><![CDATA[<!-- @include ../client/js/lib/ace/mode-xml.js -->]]></d>`
`22`	`35`	`}`
`23`	`36`
`24`	`37`	`}`