Merge http://github.com/angular/angular.js into angular

Conflicts:
	.gitignore

1 files changed, 35 insertions, 0 deletions

diff --git a/src/moveToAngularCom/Users.js b/src/moveToAngularCom/Users.js
new file mode 100644
index 00000000..fb5845d3
--- /dev/null
+++ b/src/moveToAngularCom/Users.js
@@ -0,0 +1,35 @@
+function Users(server, controlBar) {
+  this.server = server;
+  this.controlBar = controlBar;
+};
+
+extend(Users.prototype, {
+  'fetchCurrentUser':function(callback) {
+    var self = this;
+    this.server.request("GET", "/account.json", {}, function(code, response){
+      self['current'] = response['user'];
+      callback(response['user']);
+    });
+  },
+
+  'logout': function(callback) {
+    var self = this;
+    this.controlBar.logout(function(){
+      delete self['current'];
+      (callback||noop)();
+    });
+  },
+
+  'login': function(callback) {
+    var self = this;
+    this.controlBar.login(function(){
+      self['fetchCurrentUser'](function(){
+        (callback||noop)();
+      });
+    });
+  },
+
+  'notAuthorized': function(){
+    this.controlBar.notAuthorized();
+  }
+});