fin-hypergrid - npm Package Compare versions

Comparing version 0.2.4 to 0.2.5

images/images.js

@@ -1,2 +0,2 @@
-module.exports = { // This file generated by gulp-imagine-64 at 11:46:44 AM on 4/5/2016
+module.exports = { // This file generated by gulp-imagine-64 at 2:22:46 PM on 4/6/2016
 	"calendar": {
@@ -3,0 +3,0 @@ type: "image/png",

package.json

 {
   "name": "fin-hypergrid",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Canvas-based high-performance spreadsheet",
@@ -14,3 +14,3 @@ "main": "src/Hypergrid.js",
     "extend-me": "^2.2.2",
-    "filter-tree": "^0.3.16",
+    "filter-tree": "0.3.17",
     "finbars": "^1.5.1",
@@ -21,2 +21,3 @@ "fincanvas": "^1.2.1",
     "lru-cache": "^2.7.0",
+    "mustache": "^2.2.0",
     "object-iterators": "^1.3.0",
@@ -49,3 +50,2 @@ "pop-menu": "^0.2.0",
     "multiple": "^0.2.1",
-    "mustache": "^2.2.0",
     "run-sequence": "^1.1.4",
@@ -52,0 +52,0 @@ "through2": "^2.0.0"

src/behaviors/JSON.js

@@ -7,3 +7,3 @@ 'use strict';
 var aggregations = require('../Shared.js').analytics.util.aggregations;
-var filterUtil = require('../filter/filterUtil');
+var filterUtil = require('../filter/util');
 var CustomFilter = require('../filter/CustomFilter');
@@ -10,0 +10,0 @@

src/cellEditors/ComboBox.js

@@ -120,5 +120,3 @@ // ComboBox.js - A combo-box is a combination of a text-box and a drop-down.
         var columnFilters = this.grid.getGlobalFilter().columnFilters,
-            columnFilterSubtree = columnFilters.children.find(function(subtree) {
-                return subtree.children[0].column === columnName;
-            });
+            columnFilterSubtree = filter.getColumnFilter(columnName);
 
@@ -203,7 +201,5 @@ // get the column filter's `operators` list
         // look in the filter, under column filters, for a column filter for this column
-        var columnFilters = this.grid.getGlobalFilter().columnFilters,
+        var filter = this.grid.getGlobalFilter(),
             columnName = this.columnName,
-            columnFilterSubtree = columnFilters.children.find(function(subtree) {
-                return subtree.children[0].column === columnName;
-            });
+            columnFilterSubtree = filter.getColumnFilter(columnName);
 
@@ -210,0 +206,0 @@ if (columnFilterSubtree) {

src/filter/CustomFilter.js

@@ -30,6 +30,6 @@ 'use strict';
         op = originalOp.toLowerCase();
-        return op + ' ' + c.literal;
+        return op + ' ' + c.operand;
     },
     makeIN: function(op, c) {
-        return op.toLowerCase() + ' ' + c.literal.replace(/\s*,\s*/g, ',');
+        return op.toLowerCase() + ' ' + c.operand.replace(/\s*,\s*/g, ',');
     },
@@ -39,3 +39,3 @@ make: function(op, c) {
         if (/\w/.test(op)) { op += ' '; }
-        op += c.literal || c.identifier;
+        op += c.operand;
         return op;
@@ -220,3 +220,5 @@ }
      * @param columnName
-     * @param state
+     * @param {string|object} [query] - If undefined, removes column filter from the filter tree.
+     *
+     * Otherwise, column filter is replaced (if it already exists) or added (if new). Interpretation of this parameter is auto-detected as per {@link http://joneit.github.io/filter-tree/FilterNode.html#~parseStateString|parseStateString} unless overridden by `options.syntax` (as explained therein).
      * @param {filterTreeSetStateOptionsObject} [options]
@@ -223,0 +225,0 @@ * @param {boolean} [options.syntax='CQL']

src/filter/parser-CQL.js

@@ -159,4 +159,4 @@ 'use strict';
      * @returns {expressionState[]} where `expressionState` is one of:
-     * * `{column: string, operator: string, literal: string}`
-     * * `{column: string, operator: string, identifier: string, editor: 'Columns'}`
+     * * `{column: string, operator: string, operand: string}`
+     * * `{column: string, operator: string, operand: string, editor: 'Columns'}`
      */
@@ -198,6 +198,6 @@ makeChildren: function(columnName, expressions) {
                     if (fieldName) {
-                        child.identifier = fieldName.name || fieldName;
+                        child.operand = fieldName.name || fieldName;
                         child.editor = 'Columns';
                     } else {
-                        child.literal = literal;
+                        child.operand = literal;
                     }
@@ -204,0 +204,0 @@

src/filter/parser-SQL.js

@@ -144,3 +144,3 @@ 'use strict';
 function walk(t) {
-    var m, name, op, arg, bool, token, tokens = [];
+    var m, name, op, operand, bool, token, tokens = [];
     var i = 0;
@@ -203,6 +203,6 @@
                 }
-                arg = m[1];
-                i += arg.length + 2;
-                while ((m = arg.match(reLitAnywhere))) {
-                    arg = arg.replace(reLitAnywhere, this.literals[m[1]]);
+                operand = m[1];
+                i += operand.length + 2;
+                while ((m = operand.match(reLitAnywhere))) {
+                    operand = operand.replace(reLitAnywhere, this.literals[m[1]]);
                 }
@@ -214,5 +214,5 @@ } else {
                 }
-                arg = m[1];
-                i += arg.length + 2;
-                arg = this.literals[arg];
+                operand = m[1];
+                i += operand.length + 2;
+                operand = this.literals[operand];
             }
@@ -223,3 +223,3 @@
                 operator: op,
-                literal: arg
+                operand: operand
             };
@@ -226,0 +226,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

754143

increased by0.07%

Dev dependency count

22

decreased by-4.35%

Lines of code

19557

increased by0.02%

Worsened metrics

Dependency count

14

increased by7.69%

Dependency changes

• + Addedmustache@^2.2.0

• + Addedfilter-tree@0.3.17(transitive)

• + Addedmustache@2.3.2(transitive)

• - Removedfilter-tree@0.3.41(transitive)

• Updatedfilter-tree@0.3.17