Fixing issue with action scopes on json grammar for Token

elmasse · May 20, 2014 · fe3f367 · fe3f367
1 parent 7d80c8a
commit fe3f367
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/Graph.js b/lib/Graph.js
@@ -57,7 +57,7 @@ cocktail.mix({
 
     _parseRules: function (rules) {
         var k, v, action;
-        
+
         for (k in rules) {
             v = rules[k];
             action = this._parseAction(v);
@@ -73,20 +73,22 @@ cocktail.mix({
 
         if (stmt.length) {
             actionFn = function() {
-                var ret, args, action, what, next, j;
+                var ret, args, action, what, next, j, scope;
                 for (i = 0; i < l; i++) {
+                    scope = actionScope;
                     args = (ret !== undefined) ? [ret] : arguments;
                     what = stmt[i];
                     if (what.indexOf('.') !== -1){
                         next = what.split('.');
                         for(j in next){
+                            scope = action || actionScope;
                             action = (action) ? action[next[j]]: actionScope[next[j]];
                         }
                     }else {
                         action = actionScope[what];
                     }
-                    
-                    ret = (typeof action === "function" ) ? action.apply(actionScope, args) : action;
+
+                    ret = (typeof action === "function" ) ? action.apply(scope, args) : action;
                 }
 
                 return ret;
@@ -120,10 +122,10 @@ cocktail.mix({
                     replaced = replaced.replace(new RegExp(exp[i], 'g'), value.source);
                 }
             }
-        } 
-        
+        }
+
         regex = new RegExp(replaced);
-        
+
         return regex;
     },