Merge remote-tracking branch 'upstream/master'

intersystems-community · May 30, 2015 · f08934a · f08934a
2 parents c784854 + 1bfcdf2
commit f08934a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

diff --git a/web/css/interface.css b/web/css/interface.css
@@ -17,6 +17,7 @@ html, body {
     float: left;
     width: 200px;
     height: 100%;
+    box-shadow: 0 0 0 1px lightgray;
 }
 
 .ui-mainBlock {

diff --git a/web/css/treeView.css b/web/css/treeView.css
@@ -3,7 +3,6 @@
     display: block;
     font-size: 16px;
     height: 100%;
-    border-right: 1px solid lightgray;
     overflow: auto;
     box-sizing: border-box;
     padding-top: 24px;

diff --git a/web/index.html b/web/index.html
@@ -28,7 +28,7 @@
 <body onload="cue = new CacheUMLExplorer(document.getElementById('treeView'), document.getElementById('svgContainer'))">
     <div class="ui-body" id="ui-body">
         <div class="ui-sideBlock">
-            <div class="ui-sideSearchBlock">
+            <div class="ui-sideSearchBlock" id="searchBlock">
                 <input type="search" id="classTreeSearch" placeholder="Search..."/>
             </div>
             <div id="treeView">

diff --git a/web/js/CacheUMLExplorer.js b/web/js/CacheUMLExplorer.js
@@ -29,7 +29,8 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
         methodDescription: id("methodDescription"),
         methodViewBounds: id("methodViewBounds"),
         namespaces: id("namespaces"),
-        classTreeSearch: id("classTreeSearch")
+        classTreeSearch: id("classTreeSearch"),
+        searchBlock: id("searchBlock")
     };
 
     this.UI = new UI(this);

diff --git a/web/js/ClassTree.js b/web/js/ClassTree.js
@@ -20,6 +20,24 @@ var ClassTree = function (parent, treeViewContainer) {
         self.searchChanged.call(self, (e.target || e.srcElement).value);
     });
 
+    window.addEventListener("resize", function () {
+        self.updateSizes();
+    });
+
+    this.updateSizes();
+
+};
+
+ClassTree.prototype.updateSizes = function () {
+
+    var dh = this.cacheUMLExplorer.elements.searchBlock.clientHeight,
+        h = window.innerHeight - dh,
+        b = this.cacheUMLExplorer.elements.treeViewContainer;
+
+    b.style.paddingTop = 0;
+    b.style.marginTop = dh + "px";
+    b.style.height = h + "px";
+
 };
 
 ClassTree.prototype.showLoader = function () {