diff --git a/bower.json b/bower.json index 1b741ef..b6b8eda 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ng-expression-builder", - "version": "0.1.1", + "version": "0.1.2", "authors": [ "Josh " ], diff --git a/dist/expression-builder.js b/dist/expression-builder.js index 1beef16..726e6d5 100644 --- a/dist/expression-builder.js +++ b/dist/expression-builder.js @@ -63,7 +63,7 @@ angular.module('expression-builder', ['ui.bootstrap']) scope.booleanOperators = ['AND', 'OR', 'XOR']; if(scope.comparisonOperators === undefined) - scope.comparisonOperators = ['=', '<>', '<', '<=', '>', '>=', '[]']; + scope.comparisonOperators = ['=', '<>', '<', '<=', '>', '>=', '[]', '![]']; if(scope.leftOperandProvider) scope.leftOperandProvider = scope.leftOperandProvider() diff --git a/dist/expression-builder.min.js b/dist/expression-builder.min.js index c6c4863..54d33c3 100644 --- a/dist/expression-builder.min.js +++ b/dist/expression-builder.min.js @@ -1 +1 @@ -angular.module("expression-builder",["ui.bootstrap"]).controller("ExpressionBuilderController",["$scope",function(o){o.addCondition=function(){o.conditions.push({})},o.addGroup=function(){o.conditions.push({conditions:[]})},o.remove=function(e){var n=o.conditions.indexOf(e);o.removeAt(n)},o.removeAt=function(e){o.conditions.splice(e,1)},o.getLeftOperands=function(e){return o.leftOperandProvider?o.leftOperandProvider(e):[]},o.getRightOperands=function(e){return o.rightOperandProvider?o.rightOperandProvider(e):[]}}]).directive("expressionBuilder",["$compile",function(o){return{restrict:"EA",controller:"ExpressionBuilderController",templateUrl:"templates/expressionbuilder.html",scope:{conditions:"=",booleanOperators:"=?",comparisonOperators:"=?",leftOperandProvider:"&",rightOperandProvider:"&"},compile:function(e){var n,r=e.contents().remove();return function(e,i){angular.isUndefined(n)&&(n=o(r)),n(e,function(o){i.append(o)}),void 0===e.booleanOperators&&(e.booleanOperators=["AND","OR","XOR"]),void 0===e.comparisonOperators&&(e.comparisonOperators=["=","<>","<","<=",">",">=","[]"]),e.leftOperandProvider&&(e.leftOperandProvider=e.leftOperandProvider()),e.rightOperandProvider&&(e.rightOperandProvider=e.rightOperandProvider())}}}}]),angular.module("expression-builder").run(["$templateCache",function(o){o.put("templates/expressionbuilder.html",'
')}]); \ No newline at end of file +angular.module("expression-builder",["ui.bootstrap"]).controller("ExpressionBuilderController",["$scope",function(o){o.addCondition=function(){o.conditions.push({})},o.addGroup=function(){o.conditions.push({conditions:[]})},o.remove=function(e){var n=o.conditions.indexOf(e);o.removeAt(n)},o.removeAt=function(e){o.conditions.splice(e,1)},o.getLeftOperands=function(e){return o.leftOperandProvider?o.leftOperandProvider(e):[]},o.getRightOperands=function(e){return o.rightOperandProvider?o.rightOperandProvider(e):[]}}]).directive("expressionBuilder",["$compile",function(o){return{restrict:"EA",controller:"ExpressionBuilderController",templateUrl:"templates/expressionbuilder.html",scope:{conditions:"=",booleanOperators:"=?",comparisonOperators:"=?",leftOperandProvider:"&",rightOperandProvider:"&"},compile:function(e){var n,r=e.contents().remove();return function(e,i){angular.isUndefined(n)&&(n=o(r)),n(e,function(o){i.append(o)}),void 0===e.booleanOperators&&(e.booleanOperators=["AND","OR","XOR"]),void 0===e.comparisonOperators&&(e.comparisonOperators=["=","<>","<","<=",">",">=","[]","![]"]),e.leftOperandProvider&&(e.leftOperandProvider=e.leftOperandProvider()),e.rightOperandProvider&&(e.rightOperandProvider=e.rightOperandProvider())}}}}]),angular.module("expression-builder").run(["$templateCache",function(o){o.put("templates/expressionbuilder.html",'
')}]); \ No newline at end of file diff --git a/package.json b/package.json index 2edf040..4120143 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng-expression-builder", - "version": "0.1.1", + "version": "0.1.2", "description": "", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/src/js/expression-builder.js b/src/js/expression-builder.js index b5d6e2c..8df753f 100644 --- a/src/js/expression-builder.js +++ b/src/js/expression-builder.js @@ -63,7 +63,7 @@ angular.module('expression-builder', ['ui.bootstrap']) scope.booleanOperators = ['AND', 'OR', 'XOR']; if(scope.comparisonOperators === undefined) - scope.comparisonOperators = ['=', '<>', '<', '<=', '>', '>=', '[]']; + scope.comparisonOperators = ['=', '<>', '<', '<=', '>', '>=', '[]', '![]']; if(scope.leftOperandProvider) scope.leftOperandProvider = scope.leftOperandProvider()