Merge remote-tracking branch 'upstream/master'

Author: tsafin

cache/projectTemplate.xml

@@ -643,9 +643,17 @@ Write the contents of xData tag</Description>
 
 <Class name="ClassExplorer.WebAppInstaller">
 <Super>%Projection.AbstractProjection</Super>
-<TimeChanged>63696,65168.289869</TimeChanged>
+<TimeChanged>63958,46205.449903</TimeChanged>
 <TimeCreated>63696,64041.85537</TimeCreated>
 
+<Parameter name="Name">
+<Default>/ClassExplorer</Default>
+</Parameter>
+
+<Parameter name="DispatchClass">
+<Default>ClassExplorer.Router</Default>
+</Parameter>
+
 <Projection name="Reference">
 <Type>WebAppInstaller</Type>
 </Projection>
@@ -657,28 +665,29 @@ This method is invoked when a class is compiled.</Description>
 <FormalSpec><![CDATA[cls:%String,&params]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    set ns = $NAMESPACE
-    zn:ns'="%SYS" "%SYS"
+	set properties("NameSpace") = $Namespace
+    set properties("Description") = "A WEB application for Cache UML Explorer."
+    set properties("IsNameSpaceDefault") = $$$YES
+    set properties("DispatchClass") = ..#DispatchClass
+	
+    new $Namespace
+    set $Namespace = "%SYS"
     do ##class(Security.System).GetInstallationSecuritySetting(.security)
     if (security="None") {
-        set cspProperties("AutheEnabled") = 64 // Unauthenticated
+        set properties("AutheEnabled") = $$$AutheUnauthenticated
     } else {
-        set cspProperties("AutheEnabled") = 32 // Password
-    }
-    set cspProperties("NameSpace") = ns
-    set cspProperties("Description") = "A WEB application for Cache Class Explorer."
-    set cspProperties("IsNameSpaceDefault") = 1
-    set cspProperties("DispatchClass") = "ClassExplorer.Router"
-    if ('##class(Security.Applications).Exists("/ClassExplorer")) {
-        w !, "Creating WEB application ""/ClassExplorer""..."
-        set tSC = ##class(Security.Applications).Create("/ClassExplorer", .cspProperties)
-        if $$$ISERR(tSC) throw ##class(%Installer.Exception).CreateFromStatus(tSC)
-        w !, "WEB application ""/ClassExplorer"" created."
+        set properties("AutheEnabled") = $$$AutheCache
+    } 
+
+    if ('##class(Security.Applications).Exists(..#Name)) {
+        write !, "Creating WEB application " _ ..#Name _ "..."
+        set st = ##class(Security.Applications).Create(..#Name, .properties)
+        write !, "WEB application " _ ..#Name _ " created."
     } else {
-        w !, "WEB application ""/ClassExplorer"" already exists, so it is ready to use."
+	    set st = $$$OK
+        write !, "WEB application " _ ..#Name _ " already exists, so it is ready to use."
     }
-    zn:ns'="%SYS" ns
-    quit $$$OK
+    quit st
 ]]></Implementation>
 </Method>
 
@@ -689,15 +698,15 @@ This method is invoked when a class is 'uncompiled'.</Description>
 <FormalSpec><![CDATA[cls:%String,&params,recompile:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    set ns = $NAMESPACE
-    zn:ns'="%SYS" "%SYS"
-    if (##class(Security.Applications).Exists("/ClassExplorer")) {
-        w !, "Deleting WEB application ""/ClassExplorer""..."
-        do ##class(Security.Applications).Delete("/ClassExplorer")
-        w !, "WEB application ""/ClassExplorer"" was successfully removed."
+    new $Namespace
+    set $Namespace = "%SYS"
+    set st = $$$OK
+    if (##class(Security.Applications).Exists(..#Name)) {
+        write !, "Deleting WEB application " _ ..#Name _"..."
+        set st = ##class(Security.Applications).Delete(..#Name)
+        write !, "WEB application " _ ..#Name _ " was successfully removed."
     }
-    zn:ns'="%SYS" ns
-    QUIT $$$OK
+    quit st
 ]]></Implementation>
 </Method>
 </Class>

gulpfile.js

@@ -42,6 +42,9 @@ gulp.task("clean", function () {
 
 gulp.task("gatherLibs", ["clean"], function () {
     return gulp.src([
+            "web/jsLib/jquery.min.js",
+            "web/jsLib/lodash.min.js",
+            "web/jsLib/backbone-min.js",
             "web/jsLib/joint.js",
             "web/jsLib/joint.shapes.uml.js",
             "web/jsLib/ImageExporter.js"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CacheClassExplorer",
-  "version": "1.14.3",
+  "version": "1.15.0",
   "description": "Class Explorer for InterSystems Caché",
   "directories": {
     "test": "test"

web/css/joint.min.css

@@ -16,6 +16,9 @@
     <link rel="stylesheet" href="css/hoverMessage.css"/>
     <!-- endbuild -->
     <!-- build:js -->
+    <script type="text/javascript" src="jsLib/jquery.min.js"></script>
+    <script type="text/javascript" src="jsLib/lodash.min.js"></script>
+    <script type="text/javascript" src="jsLib/backbone-min.js"></script>
     <script type="text/javascript" src="jsLib/joint.js"></script>
     <script type="text/javascript" src="jsLib/joint.shapes.uml.js"></script>
     <script type="text/javascript" src="jsLib/joint.layout.DirectedGraph.min.js"></script>

web/index.html

@@ -19,7 +19,7 @@ Lib.prototype.load = function (url, data, callback) {
             try {
                 return callback(null, JSON.parse(xhr.responseText) || {});
             } catch (e) {
-                console.error(url, "Unable to parse:", { data: xhr.responseText });
+                console.error(e, url, "Unable to parse:", { data: xhr.responseText });
                 return {};
             }
         } else if (xhr.readyState === 4) {

web/js/Lib.js

@@ -1,7 +1,7 @@
 var Source = function (cacheUMLExplorer) {
 
     this.URL = window.location.protocol + "//" + window.location.hostname + ":" +
-        57776/*build.replace:window.location.port*/ + "/ClassExplorer";
+        57772/*build.replace:window.location.port*/ + "/ClassExplorer";
 
     this.cue = cacheUMLExplorer;