Merge branch 'master' of http://github.com/openfin/fin-hypergrid

abc91199 · Feb 10, 2015 · 32add91 · 32add91
2 parents 5228ebb + b88604b
commit 32add91
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 89 deletions.
diff --git a/behaviors/fin-hypergrid-behavior-qtree.html b/behaviors/fin-hypergrid-behavior-qtree.html
@@ -210,7 +210,7 @@
             var normalized = Math.floor(y - this.scrollPositionY);
             if (this.block) {
                 var val = this.block.Z[1][col][normalized];
-                if (val) {
+                if (val || val === 0) {
                     return val;
                 }
             }

diff --git a/bower.json b/bower.json
@@ -19,13 +19,13 @@
   ],
   "dependencies": {
     "paper-elements": "Polymer/paper-elements#master",
-    "core-elements": "Polymer/core-elements#master"
+    "core-elements": "Polymer/core-elements#master",
+    "fin-canvas": "#master",
+    "fin-rectangle": "#master",
+    "fin-vampire-bar": "#master"
   },
   "devDependencies": {
     "polymer": "Polymer/polymer#master",
-    "fin-canvas": "#master",
-    "fin-rectangle": "#master",
-    "fin-vampire-bar": "#master",
     "accountingjs": "~0.3.2"
   }
 }
diff --git a/excel-packed.zip b/excel-packed.zip
diff --git a/q/index.html b/q/index.html