From 9b9a0dadcce82ae42ac09ad396d647739af20a06 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 9 Jan 2010 15:02:43 -0800
Subject: removed nglr namespace

---
 src/Scope.js | 62 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index 45dd15a4..e3634cee 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,6 +1,6 @@
 // Copyright (C) 2009 BRAT Tech LLC
 
-nglr.Scope = function(initialState, name) {
+Scope = function(initialState, name) {
   this.widgets = [];
   this.watchListeners = {};
   this.name = name;
@@ -14,9 +14,9 @@ nglr.Scope = function(initialState, name) {
   }
 };
 
-nglr.Scope.expressionCache = {};
+Scope.expressionCache = {};
 
-nglr.Scope.prototype.updateView = function() {
+Scope.prototype.updateView = function() {
   var self = this;
   this.fireWatchers();
   _.each(this.widgets, function(widget){
@@ -26,21 +26,21 @@ nglr.Scope.prototype.updateView = function() {
   });
 };
 
-nglr.Scope.prototype.addWidget = function(controller) {
+Scope.prototype.addWidget = function(controller) {
   if (controller) this.widgets.push(controller);
 };
 
-nglr.Scope.prototype.isProperty = function(exp) {
+Scope.prototype.isProperty = function(exp) {
   for ( var i = 0; i < exp.length; i++) {
     var ch = exp.charAt(i);
-    if (ch!='.'  && !nglr.Lexer.prototype.isIdent(ch)) {
+    if (ch!='.'  && !Lexer.prototype.isIdent(ch)) {
       return false;
     }
   }
   return true;
 };
 
-nglr.Scope.getter = function(instance, path) {
+Scope.getter = function(instance, path) {
   if (!path) return instance;
   var element = path.split('.');
   var key;
@@ -65,16 +65,16 @@ nglr.Scope.getter = function(instance, path) {
     }
   }
   if (typeof instance === 'function' && !instance.$$factory) {
-    return nglr.bind(lastInstance, instance);
+    return bind(lastInstance, instance);
   }
   return instance;
 };
 
-nglr.Scope.prototype.get = function(path) {
-  return nglr.Scope.getter(this.state, path);
+Scope.prototype.get = function(path) {
+  return Scope.getter(this.state, path);
 };
 
-nglr.Scope.prototype.set = function(path, value) {
+Scope.prototype.set = function(path, value) {
   var element = path.split('.');
   var instance = this.state;
   for ( var i = 0; element.length > 1; i++) {
@@ -90,17 +90,17 @@ nglr.Scope.prototype.set = function(path, value) {
   return value;
 };
 
-nglr.Scope.prototype.setEval = function(expressionText, value) {
-  this.eval(expressionText + "=" + nglr.toJson(value));
+Scope.prototype.setEval = function(expressionText, value) {
+  this.eval(expressionText + "=" + toJson(value));
 };
 
-nglr.Scope.prototype.eval = function(expressionText, context) {
-  var expression = nglr.Scope.expressionCache[expressionText];
+Scope.prototype.eval = function(expressionText, context) {
+  var expression = Scope.expressionCache[expressionText];
   if (!expression) {
-    var parser = new nglr.Parser(expressionText);
+    var parser = new Parser(expressionText);
     expression = parser.statements();
     parser.assertAllConsumed();
-    nglr.Scope.expressionCache[expressionText] = expression;
+    Scope.expressionCache[expressionText] = expression;
   }
   context = context || {};
   context.scope = this;
@@ -110,7 +110,7 @@ nglr.Scope.prototype.eval = function(expressionText, context) {
 //TODO: Refactor. This function needs to be an execution closure for widgets
 // move to widgets
 // remove expression, just have inner closure.
-nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, onFailure) {
+Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, onFailure) {
   try {
     var value = this.eval(expression, context);
     if (widget.hasError) {
@@ -125,7 +125,7 @@ nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSucces
     return true;
   } catch (e){
     console.error('Eval Widget Error:', e);
-    var jsonError = nglr.toJson(e, true);
+    var jsonError = toJson(e, true);
     widget.hasError = true;
     jQuery(widget.view).
       addClass('ng-exception').
@@ -137,42 +137,42 @@ nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSucces
   }
 };
 
-nglr.Scope.prototype.validate = function(expressionText, value) {
-  var expression = nglr.Scope.expressionCache[expressionText];
+Scope.prototype.validate = function(expressionText, value) {
+  var expression = Scope.expressionCache[expressionText];
   if (!expression) {
-    expression = new nglr.Parser(expressionText).validator();
-    nglr.Scope.expressionCache[expressionText] = expression;
+    expression = new Parser(expressionText).validator();
+    Scope.expressionCache[expressionText] = expression;
   }
   var self = {scope:this};
   return expression(self)(self, value);
 };
 
-nglr.Scope.prototype.entity = function(entityDeclaration) {
-  var expression = new nglr.Parser(entityDeclaration).entityDeclaration();
+Scope.prototype.entity = function(entityDeclaration) {
+  var expression = new Parser(entityDeclaration).entityDeclaration();
   return expression({scope:this});
 };
 
-nglr.Scope.prototype.markInvalid = function(widget) {
+Scope.prototype.markInvalid = function(widget) {
   this.state.$invalidWidgets.push(widget);
 };
 
-nglr.Scope.prototype.watch = function(declaration) {
+Scope.prototype.watch = function(declaration) {
   var self = this;
-  new nglr.Parser(declaration).watch()({
+  new Parser(declaration).watch()({
     scope:this,
     addListener:function(watch, exp){
       self.addWatchListener(watch, function(n,o){
         try {
           return exp({scope:self}, n, o);
         } catch(e) {
-          nglr.alert(e);
+          alert(e);
         }
       });
     }
   });
 };
 
-nglr.Scope.prototype.addWatchListener = function(watchExpression, listener) {
+Scope.prototype.addWatchListener = function(watchExpression, listener) {
   var watcher = this.watchListeners[watchExpression];
   if (!watcher) {
     watcher = {listeners:[], expression:watchExpression};
@@ -181,7 +181,7 @@ nglr.Scope.prototype.addWatchListener = function(watchExpression, listener) {
   watcher.listeners.push(listener);
 };
 
-nglr.Scope.prototype.fireWatchers = function() {
+Scope.prototype.fireWatchers = function() {
   var self = this;
   var fired = false;
   jQuery.each(this.watchListeners, function(name, watcher) {
-- 
cgit v1.2.3


From 1aba6b53b88c70b61a0cc991b1371739305d117b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 10 Jan 2010 08:58:57 -0800
Subject: basic calculator works with minified.js, lots of references still
 broken

---
 src/Scope.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index e3634cee..dff3bfbd 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -55,7 +55,7 @@ Scope.getter = function(instance, path) {
       instance = instance[key];
     }
     if (_.isUndefined(instance)  && key.charAt(0) == '$') {
-      var type = angular.Global.typeOf(lastInstance);
+      var type = angular['Global']['typeOf'](lastInstance);
       type = angular[type.charAt(0).toUpperCase()+type.substring(1)];
       var fn = type ? type[[key.substring(1)]] : undefined;
       if (fn) {
-- 
cgit v1.2.3


From 1a42a3fab99ca02af0476f5a87175c53104aa2e3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 11 Jan 2010 16:15:12 -0800
Subject: green

---
 src/Scope.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index dff3bfbd..f4b34c3c 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -124,7 +124,7 @@ Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, on
     }
     return true;
   } catch (e){
-    console.error('Eval Widget Error:', e);
+    error('Eval Widget Error:', e);
     var jsonError = toJson(e, true);
     widget.hasError = true;
     jQuery(widget.view).
@@ -184,10 +184,10 @@ Scope.prototype.addWatchListener = function(watchExpression, listener) {
 Scope.prototype.fireWatchers = function() {
   var self = this;
   var fired = false;
-  jQuery.each(this.watchListeners, function(name, watcher) {
+  foreach(this.watchListeners, function(watcher) {
     var value = self.eval(watcher.expression);
     if (value !== watcher.lastValue) {
-      jQuery.each(watcher.listeners, function(i, listener){
+      foreach(watcher.listeners, function(listener){
         listener(value, watcher.lastValue);
         fired = true;
       });
-- 
cgit v1.2.3


From 6d5471c9bea9671dec7900a7bc548aea8ddd5a3e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 11 Jan 2010 17:32:33 -0800
Subject: all files converted to prototype= {}

---
 src/Scope.js | 295 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 147 insertions(+), 148 deletions(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index f4b34c3c..dcc50007 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,6 +1,4 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
-Scope = function(initialState, name) {
+function Scope(initialState, name) {
   this.widgets = [];
   this.watchListeners = {};
   this.name = name;
@@ -15,31 +13,6 @@ Scope = function(initialState, name) {
 };
 
 Scope.expressionCache = {};
-
-Scope.prototype.updateView = function() {
-  var self = this;
-  this.fireWatchers();
-  _.each(this.widgets, function(widget){
-    self.evalWidget(widget, "", {}, function(){
-      this.updateView(self);
-    });
-  });
-};
-
-Scope.prototype.addWidget = function(controller) {
-  if (controller) this.widgets.push(controller);
-};
-
-Scope.prototype.isProperty = function(exp) {
-  for ( var i = 0; i < exp.length; i++) {
-    var ch = exp.charAt(i);
-    if (ch!='.'  && !Lexer.prototype.isIdent(ch)) {
-      return false;
-    }
-  }
-  return true;
-};
-
 Scope.getter = function(instance, path) {
   if (!path) return instance;
   var element = path.split('.');
@@ -70,129 +43,155 @@ Scope.getter = function(instance, path) {
   return instance;
 };
 
-Scope.prototype.get = function(path) {
-  return Scope.getter(this.state, path);
-};
-
-Scope.prototype.set = function(path, value) {
-  var element = path.split('.');
-  var instance = this.state;
-  for ( var i = 0; element.length > 1; i++) {
-    var key = element.shift();
-    var newInstance = instance[key];
-    if (!newInstance) {
-      newInstance = {};
-      instance[key] = newInstance;
+Scope.prototype = {
+  updateView: function() {
+    var self = this;
+    this.fireWatchers();
+    _.each(this.widgets, function(widget){
+      self.evalWidget(widget, "", {}, function(){
+        this.updateView(self);
+      });
+    });
+  },
+  
+  addWidget: function(controller) {
+    if (controller) this.widgets.push(controller);
+  },
+  
+  isProperty: function(exp) {
+    for ( var i = 0; i < exp.length; i++) {
+      var ch = exp.charAt(i);
+      if (ch!='.'  && !Lexer.prototype.isIdent(ch)) {
+        return false;
+      }
     }
-    instance = newInstance;
-  }
-  instance[element.shift()] = value;
-  return value;
-};
-
-Scope.prototype.setEval = function(expressionText, value) {
-  this.eval(expressionText + "=" + toJson(value));
-};
-
-Scope.prototype.eval = function(expressionText, context) {
-  var expression = Scope.expressionCache[expressionText];
-  if (!expression) {
-    var parser = new Parser(expressionText);
-    expression = parser.statements();
-    parser.assertAllConsumed();
-    Scope.expressionCache[expressionText] = expression;
-  }
-  context = context || {};
-  context.scope = this;
-  return expression(context);
-};
-
-//TODO: Refactor. This function needs to be an execution closure for widgets
-// move to widgets
-// remove expression, just have inner closure.
-Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, onFailure) {
-  try {
-    var value = this.eval(expression, context);
-    if (widget.hasError) {
-      widget.hasError = false;
-      jQuery(widget.view).
-        removeClass('ng-exception').
-        removeAttr('ng-error');
+    return true;
+  },
+    
+  get: function(path) {
+    return Scope.getter(this.state, path);
+  },
+  
+  set: function(path, value) {
+    var element = path.split('.');
+    var instance = this.state;
+    for ( var i = 0; element.length > 1; i++) {
+      var key = element.shift();
+      var newInstance = instance[key];
+      if (!newInstance) {
+        newInstance = {};
+        instance[key] = newInstance;
+      }
+      instance = newInstance;
     }
-    if (onSuccess) {
-      value = onSuccess.apply(widget, [value]);
+    instance[element.shift()] = value;
+    return value;
+  },
+  
+  setEval: function(expressionText, value) {
+    this.eval(expressionText + "=" + toJson(value));
+  },
+  
+  eval: function(expressionText, context) {
+    var expression = Scope.expressionCache[expressionText];
+    if (!expression) {
+      var parser = new Parser(expressionText);
+      expression = parser.statements();
+      parser.assertAllConsumed();
+      Scope.expressionCache[expressionText] = expression;
     }
-    return true;
-  } catch (e){
-    error('Eval Widget Error:', e);
-    var jsonError = toJson(e, true);
-    widget.hasError = true;
-    jQuery(widget.view).
-      addClass('ng-exception').
-      attr('ng-error', jsonError);
-    if (onFailure) {
-      onFailure.apply(widget, [e, jsonError]);
+    context = context || {};
+    context.scope = this;
+    return expression(context);
+  },
+  
+  //TODO: Refactor. This function needs to be an execution closure for widgets
+  // move to widgets
+  // remove expression, just have inner closure.
+  evalWidget: function(widget, expression, context, onSuccess, onFailure) {
+    try {
+      var value = this.eval(expression, context);
+      if (widget.hasError) {
+        widget.hasError = false;
+        jQuery(widget.view).
+          removeClass('ng-exception').
+          removeAttr('ng-error');
+      }
+      if (onSuccess) {
+        value = onSuccess.apply(widget, [value]);
+      }
+      return true;
+    } catch (e){
+      error('Eval Widget Error:', e);
+      var jsonError = toJson(e, true);
+      widget.hasError = true;
+      jQuery(widget.view).
+        addClass('ng-exception').
+        attr('ng-error', jsonError);
+      if (onFailure) {
+        onFailure.apply(widget, [e, jsonError]);
+      }
+      return false;
     }
-    return false;
-  }
-};
-
-Scope.prototype.validate = function(expressionText, value) {
-  var expression = Scope.expressionCache[expressionText];
-  if (!expression) {
-    expression = new Parser(expressionText).validator();
-    Scope.expressionCache[expressionText] = expression;
-  }
-  var self = {scope:this};
-  return expression(self)(self, value);
-};
-
-Scope.prototype.entity = function(entityDeclaration) {
-  var expression = new Parser(entityDeclaration).entityDeclaration();
-  return expression({scope:this});
-};
-
-Scope.prototype.markInvalid = function(widget) {
-  this.state.$invalidWidgets.push(widget);
-};
-
-Scope.prototype.watch = function(declaration) {
-  var self = this;
-  new Parser(declaration).watch()({
-    scope:this,
-    addListener:function(watch, exp){
-      self.addWatchListener(watch, function(n,o){
-        try {
-          return exp({scope:self}, n, o);
-        } catch(e) {
-          alert(e);
-        }
-      });
+  },
+  
+  validate: function(expressionText, value) {
+    var expression = Scope.expressionCache[expressionText];
+    if (!expression) {
+      expression = new Parser(expressionText).validator();
+      Scope.expressionCache[expressionText] = expression;
     }
-  });
-};
-
-Scope.prototype.addWatchListener = function(watchExpression, listener) {
-  var watcher = this.watchListeners[watchExpression];
-  if (!watcher) {
-    watcher = {listeners:[], expression:watchExpression};
-    this.watchListeners[watchExpression] = watcher;
-  }
-  watcher.listeners.push(listener);
-};
-
-Scope.prototype.fireWatchers = function() {
-  var self = this;
-  var fired = false;
-  foreach(this.watchListeners, function(watcher) {
-    var value = self.eval(watcher.expression);
-    if (value !== watcher.lastValue) {
-      foreach(watcher.listeners, function(listener){
-        listener(value, watcher.lastValue);
-        fired = true;
-      });
-      watcher.lastValue = value;
+    var self = {scope:this};
+    return expression(self)(self, value);
+  },
+  
+  entity: function(entityDeclaration) {
+    var expression = new Parser(entityDeclaration).entityDeclaration();
+    return expression({scope:this});
+  },
+  
+  markInvalid: function(widget) {
+    this.state.$invalidWidgets.push(widget);
+  },
+  
+  watch: function(declaration) {
+    var self = this;
+    new Parser(declaration).watch()({
+      scope:this,
+      addListener:function(watch, exp){
+        self.addWatchListener(watch, function(n,o){
+          try {
+            return exp({scope:self}, n, o);
+          } catch(e) {
+            alert(e);
+          }
+        });
+      }
+    });
+  },
+  
+  addWatchListener: function(watchExpression, listener) {
+    var watcher = this.watchListeners[watchExpression];
+    if (!watcher) {
+      watcher = {listeners:[], expression:watchExpression};
+      this.watchListeners[watchExpression] = watcher;
     }
-  });
-  return fired;
-};
+    watcher.listeners.push(listener);
+  },
+  
+  fireWatchers: function() {
+    var self = this;
+    var fired = false;
+    foreach(this.watchListeners, function(watcher) {
+      var value = self.eval(watcher.expression);
+      if (value !== watcher.lastValue) {
+        foreach(watcher.listeners, function(listener){
+          listener(value, watcher.lastValue);
+          fired = true;
+        });
+        watcher.lastValue = value;
+      }
+    });
+    return fired;
+  }
+};
\ No newline at end of file
-- 
cgit v1.2.3


From efad9ec5be8da442af5fb3dffc08510f7a71e10f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 17:10:58 -0800
Subject: changes to make it closure compiler compatible

---
 src/Scope.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index dcc50007..3b1f3930 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -6,9 +6,9 @@ function Scope(initialState, name) {
   var State = function(){};
   State.prototype = initialState;
   this.state = new State();
-  this.state.$parent = initialState;
+  this.state['$parent'] = initialState;
   if (name == "ROOT") {
-    this.state.$root = this.state;
+    this.state['$root'] = this.state;
   }
 };
 
@@ -37,7 +37,7 @@ Scope.getter = function(instance, path) {
       }
     }
   }
-  if (typeof instance === 'function' && !instance.$$factory) {
+  if (typeof instance === 'function' && !instance['$$factory']) {
     return bind(lastInstance, instance);
   }
   return instance;
@@ -69,10 +69,12 @@ Scope.prototype = {
   },
     
   get: function(path) {
+//    log('SCOPE.get', path, Scope.getter(this.state, path));
     return Scope.getter(this.state, path);
   },
   
   set: function(path, value) {
+//    log('SCOPE.set', path, value);
     var element = path.split('.');
     var instance = this.state;
     for ( var i = 0; element.length > 1; i++) {
@@ -145,9 +147,9 @@ Scope.prototype = {
     return expression(self)(self, value);
   },
   
-  entity: function(entityDeclaration) {
+  entity: function(entityDeclaration, datastore) {
     var expression = new Parser(entityDeclaration).entityDeclaration();
-    return expression({scope:this});
+    return expression({scope:this, datastore:datastore});
   },
   
   markInvalid: function(widget) {
-- 
cgit v1.2.3


From 0f42fa2930f5827ac9f1eac2ce09ea3bf9533563 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 19:33:04 -0800
Subject: fix closure compiler issues

---
 src/Scope.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index 3b1f3930..9be6bc3f 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -153,7 +153,7 @@ Scope.prototype = {
   },
   
   markInvalid: function(widget) {
-    this.state.$invalidWidgets.push(widget);
+    this.state['$invalidWidgets'].push(widget);
   },
   
   watch: function(declaration) {
-- 
cgit v1.2.3


From 473e57e22532f9b85fc9dcc1bcc53e12a10154c2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 20:44:17 -0800
Subject: bindRootId configuration option

---
 src/Scope.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Scope.js')

diff --git a/src/Scope.js b/src/Scope.js
index 9be6bc3f..7e477ec5 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -95,6 +95,7 @@ Scope.prototype = {
   },
   
   eval: function(expressionText, context) {
+    log('Scope.eval', expressionText);
     var expression = Scope.expressionCache[expressionText];
     if (!expression) {
       var parser = new Parser(expressionText);
-- 
cgit v1.2.3