v 1.0.8

nnajm · Mar 8, 2015 · 1026b41 · 1026b41
1 parent 08f6690
commit 1026b41
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 91 deletions.
diff --git a/demo/demo.html b/demo/demo.html
@@ -46,10 +46,10 @@
 
     var config = {
         dataSource: window.demo.data,
-        dataHeadersLocation: 'rows',
+        dataHeadersLocation: 'columns',
         width: 1099,
         height: 611,
-        theme: 'blue',
+        theme: 'bootstrap',
         showToolbar: false,
         grandTotal: {
             rowsvisible: true,

diff --git a/dist/orb.js b/dist/orb.js
@@ -2574,11 +2574,9 @@
                     thisnode.children[1].className = classes.table;
                 },
                 componentDidUpdate: function() {
-                    //return;
                     this.synchronizeCompsWidths();
                 },
                 componentDidMount: function() {
-                    //return;
                     var dataCellsContainerNode = this.refs.dataCellsContainer.getDOMNode();
                     var dataCellsTableNode = this.refs.dataCellsTable.getDOMNode();
                     var colHeadersContainerNode = this.refs.colHeadersContainer.getDOMNode();
@@ -3045,9 +3043,6 @@
                             currWidth = newWidthArray[arrayIndex];
                         }
                     }
-
-                    // set table style width
-                    //tbl.style.width = tblObject.size.width + 'px';
                 }
             }
 
@@ -3077,8 +3072,6 @@
 
                     var rowstyle = {};
 
-
-
                     var istopmost = false;
 
                     cells = this.props.row.map(function(cell, index) {
@@ -3184,10 +3177,6 @@
                         node.__orb._paddingRight = _paddingLeft;
                         node.__orb._borderLeftWidth = this.props.leftmost ? 0 : _borderLeft;
                         node.__orb._borderRightWidth = 0;
-
-
-
-
                     }
                 },
                 componentDidMount: function() {
@@ -4999,7 +4988,7 @@
                             show: function(props) {
                                 React.render(dialogFactory(props), overlay);
                             }
-                        }
+                        };
                     }
                 },
                 overlayElement: null,
@@ -5014,8 +5003,8 @@
                     var dialogElement = this.overlayElement.children[0];
                     var dialogBodyElement = dialogElement.children[0].children[1];
 
-                    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
-                    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+                    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+                    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
                     var maxHeight = 2 * screenHeight / 3;
                     maxHeight = maxHeight < 301 ? 301 : maxHeight;
                     var dWidth = dialogElement.offsetWidth + (dialogElement.offsetHeight > maxHeight ? 11 : 0);

diff --git a/dist/orb.min.js.map b/dist/orb.min.js.map
diff --git a/dist/v1.0.8/orb-1.0.8.js b/dist/v1.0.8/orb-1.0.8.js
@@ -2574,11 +2574,9 @@
                     thisnode.children[1].className = classes.table;
                 },
                 componentDidUpdate: function() {
-                    //return;
                     this.synchronizeCompsWidths();
                 },
                 componentDidMount: function() {
-                    //return;
                     var dataCellsContainerNode = this.refs.dataCellsContainer.getDOMNode();
                     var dataCellsTableNode = this.refs.dataCellsTable.getDOMNode();
                     var colHeadersContainerNode = this.refs.colHeadersContainer.getDOMNode();
@@ -3045,9 +3043,6 @@
                             currWidth = newWidthArray[arrayIndex];
                         }
                     }
-
-                    // set table style width
-                    //tbl.style.width = tblObject.size.width + 'px';
                 }
             }
 
@@ -3077,8 +3072,6 @@
 
                     var rowstyle = {};
 
-
-
                     var istopmost = false;
 
                     cells = this.props.row.map(function(cell, index) {
@@ -3184,10 +3177,6 @@
                         node.__orb._paddingRight = _paddingLeft;
                         node.__orb._borderLeftWidth = this.props.leftmost ? 0 : _borderLeft;
                         node.__orb._borderRightWidth = 0;
-
-
-
-
                     }
                 },
                 componentDidMount: function() {
@@ -4999,7 +4988,7 @@
                             show: function(props) {
                                 React.render(dialogFactory(props), overlay);
                             }
-                        }
+                        };
                     }
                 },
                 overlayElement: null,
@@ -5014,8 +5003,8 @@
                     var dialogElement = this.overlayElement.children[0];
                     var dialogBodyElement = dialogElement.children[0].children[1];
 
-                    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
-                    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+                    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+                    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
                     var maxHeight = 2 * screenHeight / 3;
                     maxHeight = maxHeight < 301 ? 301 : maxHeight;
                     var dWidth = dialogElement.offsetWidth + (dialogElement.offsetHeight > maxHeight ? 11 : 0);

diff --git a/dist/v1.0.8/orb-1.0.8.min.js.map b/dist/v1.0.8/orb-1.0.8.min.js.map
diff --git a/src/css/orb.bootstrap.less b/src/css/orb.bootstrap.less
@@ -34,7 +34,6 @@
 
             &-over {
                 background-color: #f7f7f7;
-                /*border: 1px dotted #aaa;*/
             }
         }
 
@@ -43,8 +42,6 @@
 
             &-over {
                 background-color: #aaa;
-                /*border: 1px dashed #aaa;
-                border-radius: 2px;*/
             }
         }
     }

diff --git a/src/css/orb.theme.less b/src/css/orb.theme.less
@@ -101,19 +101,16 @@
         }
 
         .drp-trgt {
-            /*border: 1px dashed @drop-target-color-border;*/
             height: 27px;
             &-over {
                 background-color: @drop-target-over-color-bg;
-                /*border: 1px dashed @drop-target-over-color-border;*/
             }
         }
         .drp-indic {
             height: 25px;
 
             &-over {
                 background-color: @drop-indicator-over-color-border;
-                /*border-radius: 3px;*/
             }
         }
     }

diff --git a/src/js/orb.ui.pgridwidget.js b/src/js/orb.ui.pgridwidget.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-/* global module, require, React */
+/* global module, require, React, window */
 /*jshint eqnull: true*/
 
 var axe = require('./orb.axe');

diff --git a/src/js/react/orb.react.Dialog.jsx b/src/js/react/orb.react.Dialog.jsx
@@ -21,7 +21,7 @@ var Dialog = module.exports.Dialog = react.createClass({
           show: function(props) {
             React.render(dialogFactory(props), overlay);
           }
-        }
+        };
     }
   },
   overlayElement: null,
@@ -36,8 +36,8 @@ var Dialog = module.exports.Dialog = react.createClass({
     var dialogElement = this.overlayElement.children[0];
     var dialogBodyElement = dialogElement.children[0].children[1];
 
-    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
-    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+    var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+    var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
     var maxHeight = 2*screenHeight/3;
     maxHeight = maxHeight < 301 ? 301 : maxHeight;
     var dWidth = dialogElement.offsetWidth + (dialogElement.offsetHeight > maxHeight ?  11 : 0);

diff --git a/src/js/react/orb.react.PivotCell.jsx b/src/js/react/orb.react.PivotCell.jsx
@@ -63,20 +63,6 @@ module.exports.PivotCell = react.createClass({
       node.__orb._paddingRight = _paddingLeft;
       node.__orb._borderLeftWidth = this.props.leftmost ? 0 : _borderLeft;
       node.__orb._borderRightWidth = 0;
-
-      /*if(!this.props.cell.visible()) {
-        reactUtils.addClass(node, 'cell-hidden');
-      } else {
-        reactUtils.removeClass(node, 'cell-hidden');
-      }*/
-
-      /*if(node.__orb._borderLeftWidth != 0 && !this.props.leftmost) {
-        console.log('[' + cell.value + '][' + cell.template + '/' + cell.type + ']: ' + 
-          'leftmost?=' + this.props.leftmost + ', ' + 
-          'topmost?=' + this.props.topmost + ', ' + 
-          'border-left=' + node.__orb._borderLeftWidth + ', '
-          ); 
-      }*/
     }
   },
   componentDidMount: function() {

diff --git a/src/js/react/orb.react.PivotRow.jsx b/src/js/react/orb.react.PivotRow.jsx
@@ -18,10 +18,6 @@ module.exports.PivotRow = react.createClass({
 
     var rowstyle = {};
 
-    /*if(self.props.axetype === axe.Type.ROWS && cell0.visible && !cell0.visible()) {
-      rowstyle.display = 'none';
-    }*/
-
     var istopmost = false;
 
     cells = this.props.row.map(function(cell, index) {

diff --git a/src/js/react/orb.react.PivotTable.jsx b/src/js/react/orb.react.PivotTable.jsx
@@ -68,11 +68,9 @@ module.exports.PivotTable = react.createClass({
       thisnode.children[1].className = classes.table;
   },
   componentDidUpdate: function() {
-    //return;
     this.synchronizeCompsWidths();
   },
   componentDidMount: function() {
-    //return;
     var dataCellsContainerNode = this.refs.dataCellsContainer.getDOMNode();
     var dataCellsTableNode = this.refs.dataCellsTable.getDOMNode();
     var colHeadersContainerNode = this.refs.colHeadersContainer.getDOMNode();
@@ -466,9 +464,6 @@ function setTableWidths(tblObject, newWidthArray) {
         currWidth = newWidthArray[arrayIndex];
       }
     }
-
-    // set table style width
-    //tbl.style.width = tblObject.size.width + 'px';
   }
 }
 

diff --git a/src/js/react/orb.react.compiled.js b/src/js/react/orb.react.compiled.js
@@ -84,11 +84,9 @@ module.exports.PivotTable = react.createClass({
         thisnode.children[1].className = classes.table;
     },
     componentDidUpdate: function() {
-        //return;
         this.synchronizeCompsWidths();
     },
     componentDidMount: function() {
-        //return;
         var dataCellsContainerNode = this.refs.dataCellsContainer.getDOMNode();
         var dataCellsTableNode = this.refs.dataCellsTable.getDOMNode();
         var colHeadersContainerNode = this.refs.colHeadersContainer.getDOMNode();
@@ -569,9 +567,6 @@ function setTableWidths(tblObject, newWidthArray) {
                 currWidth = newWidthArray[arrayIndex];
             }
         }
-
-        // set table style width
-        //tbl.style.width = tblObject.size.width + 'px';
     }
 }
 
@@ -606,10 +601,6 @@ module.exports.PivotRow = react.createClass({
 
         var rowstyle = {};
 
-        /*if(self.props.axetype === axe.Type.ROWS && cell0.visible && !cell0.visible()) {
-          rowstyle.display = 'none';
-        }*/
-
         var istopmost = false;
 
         cells = this.props.row.map(function(cell, index) {
@@ -720,20 +711,6 @@ module.exports.PivotCell = react.createClass({
             node.__orb._paddingRight = _paddingLeft;
             node.__orb._borderLeftWidth = this.props.leftmost ? 0 : _borderLeft;
             node.__orb._borderRightWidth = 0;
-
-            /*if(!this.props.cell.visible()) {
-              reactUtils.addClass(node, 'cell-hidden');
-            } else {
-              reactUtils.removeClass(node, 'cell-hidden');
-            }*/
-
-            /*if(node.__orb._borderLeftWidth != 0 && !this.props.leftmost) {
-              console.log('[' + cell.value + '][' + cell.template + '/' + cell.type + ']: ' + 
-                'leftmost?=' + this.props.leftmost + ', ' + 
-                'topmost?=' + this.props.topmost + ', ' + 
-                'border-left=' + node.__orb._borderLeftWidth + ', '
-                ); 
-            }*/
         }
     },
     componentDidMount: function() {
@@ -2625,7 +2602,7 @@ var Dialog = module.exports.Dialog = react.createClass({
                 show: function(props) {
                     React.render(dialogFactory(props), overlay);
                 }
-            }
+            };
         }
     },
     overlayElement: null,
@@ -2640,8 +2617,8 @@ var Dialog = module.exports.Dialog = react.createClass({
         var dialogElement = this.overlayElement.children[0];
         var dialogBodyElement = dialogElement.children[0].children[1];
 
-        var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
-        var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+        var screenWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+        var screenHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
         var maxHeight = 2 * screenHeight / 3;
         maxHeight = maxHeight < 301 ? 301 : maxHeight;
         var dWidth = dialogElement.offsetWidth + (dialogElement.offsetHeight > maxHeight ? 11 : 0);