opening class tree and focusing on displayed class item when page opens

intersystems-community · Apr 28, 2015 · 4c5b4b7 · 4c5b4b7
1 parent 8406965
commit 4c5b4b7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/web/css/treeView.css b/web/css/treeView.css
@@ -11,7 +11,7 @@
     display: none;
 }
 
-.tv-class-name.selected {
+.tv-class-name.selected, .tv-package-name.selected {
     box-shadow: inset 0 0 2px 2px #ffcc1b;
 }
 

diff --git a/web/js/ClassTree.js b/web/js/ClassTree.js
@@ -65,7 +65,9 @@ ClassTree.prototype.packageSelected = function (element, packageName) {
 ClassTree.prototype.updateTree = function (treeObject) {
 
     var self = this,
-        div = function () { return document.createElement("div"); };
+        div = function () { return document.createElement("div");},
+        selectedClassElement = this.SELECTED_CLASS_NAME ? this.SELECTED_CLASS_NAME.split(".") : [],
+        sce = 0; // selectedClassElement level index
 
     var packageClick = function (e) {
 
@@ -87,24 +89,32 @@ ClassTree.prototype.updateTree = function (treeObject) {
 
     };
 
-    var append = function (rootElement, elementName, isPackage, path) {
+    var append = function (rootElement, elementName, isPackage, path, level) {
 
-        var el1 = div(),
+        var sel = selectedClassElement.length
+                && sce === level && selectedClassElement[sce] === elementName ? ++sce : null,
+            el1 = div(),
             el2, el3, el4;
 
         if (isPackage) {
             el1.className = "tv-package";
-            (el2 = div()).className = "tv-package-name minimized"; el2.textContent = elementName;
+            (el2 = div()).className = "tv-package-name" + (sel ? "" : " minimized");
+            el2.textContent = elementName;
+            if (sel && sce === selectedClassElement.length) {
+                el2.className += " selected";
+                self.SELECTED_ELEMENT = el2;
+            }
             (el3 = div()).className = "tv-package-content";
             el1.appendChild(el2); el1.appendChild(el3);
             el2.addEventListener("click", packageClick);
             el2.appendChild(el4 = div());
             el4.className = "tv-rightListIcon icon list";
             el4.addEventListener("click", function () {
-                self.packageSelected(el1, (path ? path + "." : path) + elementName);
+                self.packageSelected(el2, (path ? path + "." : path) + elementName);
             });
         } else {
-            el1.className = "tv-class-name";
+            if (sel) self.SELECTED_ELEMENT = el1;
+            el1.className = "tv-class-name" + (sel ? " selected" : "");
             el1.textContent = elementName;
             el1.addEventListener("click", classClick);
             el1.CLASS_NAME = path + (path ? "." : "") + elementName;
@@ -116,7 +126,7 @@ ClassTree.prototype.updateTree = function (treeObject) {
 
     };
 
-    var build = function (rootElement, object, path) {
+    var build = function (rootElement, object, path, level) {
 
         var i, element, rec,
             arr = [];
@@ -136,15 +146,16 @@ ClassTree.prototype.updateTree = function (treeObject) {
                     rootElement,
                     element.name,
                     typeof element.val === "object",
-                    path.join(".")
+                    path.join("."),
+                    level
                 )) {
-                build(rec, element.val, path.concat([element.name]));
+                build(rec, element.val, path.concat([element.name]), level + 1);
             }
         }
 
     };
 
-    build(this.container, treeObject, []);
+    build(this.container, treeObject, [], 0);
 
     this.removeLoader();
 

diff --git a/web/js/ClassView.js b/web/js/ClassView.js
@@ -214,6 +214,7 @@ ClassView.prototype.loadClass = function (className) {
 
     var self = this;
 
+    this.cacheUMLExplorer.classTree.SELECTED_CLASS_NAME = className;
     this.showLoader();
     this.cacheUMLExplorer.source.getClassView(className, function (err, data) {
         //console.log(data);
@@ -235,6 +236,7 @@ ClassView.prototype.loadPackage = function (packageName) {
 
     var self = this;
 
+    this.cacheUMLExplorer.classTree.SELECTED_CLASS_NAME = packageName;
     this.showLoader();
     this.cacheUMLExplorer.source.getPackageView(packageName, function (err, data) {
         //console.log(data);