From 6cc946413622f1cef97997849e73a06a00f876fd Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 12 Feb 2010 14:16:33 -0800
Subject: Fixed negation grouping bug Make 'this' of validation be scope

---
 src/Filters.js |  4 ++--
 src/Parser.js  | 53 +++++++++++++++++++++++------------------------------
 src/Scope.js   |  4 ++--
 src/Widgets.js |  6 +++---
 4 files changed, 30 insertions(+), 37 deletions(-)

(limited to 'src')

diff --git a/src/Filters.js b/src/Filters.js
index 77fa5ec7..60d53fb9 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -24,7 +24,7 @@ var angularFilterGoogleChartApi;
 
 foreach({
   'currency': function(amount){
-    jQuery(this.element).toggleClass('ng-format-negative', amount < 0);
+    jQuery(this.$element).toggleClass('ng-format-negative', amount < 0);
     return '$' + angularFilter['number'].apply(this, [amount, 2]);
   },
   
@@ -60,7 +60,7 @@ foreach({
   },
   
   'json': function(object) {
-    jQuery(this.element).addClass("ng-monospace");
+    jQuery(this.$element).addClass("ng-monospace");
     return toJson(object, true);
   },
   
diff --git a/src/Parser.js b/src/Parser.js
index fe9671af..3aa644ac 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -369,7 +369,16 @@ Parser.prototype = {
           for ( var i = 0; i < argsFn.length; i++) {
             args.push(argsFn[i](self));
           }
-          return fn.apply(self, args);
+          var pipeThis = function(){
+            var _this = this;
+            foreach(self, function(v, k) {
+              if (k.charAt(0) == '$') {
+                _this[k] = v; 
+              }
+            });
+          };
+          pipeThis.prototype = self.self;
+          return fn.apply(new pipeThis(), args);
         };
         return function(){
           return fnInvoke;
@@ -422,48 +431,30 @@ Parser.prototype = {
   },
   
   logicalAND: function(){
-    var left = this.negated();
+    var left = this.equality();
     var token;
-    while(true) {
-      if ((token = this.expect('&&'))) {
-        left = this._binary(left, token.fn, this.negated());
-      } else {
-        return left;
-      }
-    }
-  },
-  
-  negated: function(){
-    var token;
-    if (token = this.expect('!')) {
-      return this._unary(token.fn, this.assignment());
-    } else {
-      return this.equality();
+    if ((token = this.expect('&&'))) {
+      left = this._binary(left, token.fn, this.logicalAND());
     }
+    return left;
   },
   
   equality: function(){
     var left = this.relational();
     var token;
-    while(true) {
-      if ((token = this.expect('==','!='))) {
-        left = this._binary(left, token.fn, this.relational());
-      } else {
-        return left;
-      }
+    if ((token = this.expect('==','!='))) {
+      left = this._binary(left, token.fn, this.equality());
     }
+    return left;
   },
   
   relational: function(){
     var left = this.additive();
     var token;
-    while(true) {
-      if ((token = this.expect('<', '>', '<=', '>='))) {
-        left = this._binary(left, token.fn, this.additive());
-      } else {
-        return left;
-      }
+    if (token = this.expect('<', '>', '<=', '>=')) {
+      left = this._binary(left, token.fn, this.relational());
     }
+    return left;
   },
   
   additive: function(){
@@ -489,7 +480,9 @@ Parser.prototype = {
     if (this.expect('+')) {
       return this.primary();
     } else if (token = this.expect('-')) {
-      return this._binary(Parser.ZERO, token.fn, this.multiplicative());
+      return this._binary(Parser.ZERO, token.fn, this.unary());
+    } else if (token = this.expect('!')) {
+      return this._unary(token.fn, this.unary());
     } else {
      return this.primary();
     }
diff --git a/src/Scope.js b/src/Scope.js
index cedb0542..c0998168 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -138,13 +138,13 @@ Scope.prototype = {
     }
   },
   
-  validate: function(expressionText, value) {
+  validate: function(expressionText, value, element) {
     var expression = Scope.expressionCache[expressionText];
     if (!expression) {
       expression = new Parser(expressionText).validator();
       Scope.expressionCache[expressionText] = expression;
     }
-    var self = {scope:this};
+    var self = {scope:this, self:this.state, '$element':element};
     return expression(self)(self, value);
   },
   
diff --git a/src/Widgets.js b/src/Widgets.js
index 4f359e91..71fcd110 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -234,7 +234,7 @@ TextController.prototype = {
     }
     var errorText = isValidationError ? "Required Value" : null;
     if (!isValidationError && this.validator && value) {
-      errorText = scope.validate(this.validator, value);
+      errorText = scope.validate(this.validator, value, view);
       isValidationError = !!errorText;
     }
     if (this.lastErrorText !== errorText) {
@@ -480,7 +480,7 @@ BindUpdater.prototype = {
       var part = parts[i];
       var binding = Binder.binding(part);
       if (binding) {
-        scope.evalWidget(this, binding, {element:this.view}, function(value){
+        scope.evalWidget(this, binding, {$element:this.view}, function(value){
           html.push(BindUpdater.toText(value));
         }, function(e, text){
           setHtml(this.view, text);
@@ -520,7 +520,7 @@ BindAttrUpdater.prototype = {
         var binding = Binder.binding(attributeTemplate[i]);
         if (binding) {
           try {
-            var value = scope.eval(binding, {element:jNode[0], attrName:attrName});
+            var value = scope.eval(binding, {$element:jNode[0], attrName:attrName});
             if (value && (value.constructor !== array || value.length !== 0))
               attrValues.push(value);
           } catch (e) {
-- 
cgit v1.2.3