clean up for better obfuscation

5 files changed, 42 insertions, 56 deletions

diff --git a/src/JSON.js b/src/JSON.js
index 340b075a..1e468e89 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -1,4 +1,4 @@
-array = [].constructor;
+var array = [].constructor;
 
 function toJson(obj, pretty){
   var buf = [];
@@ -6,10 +6,6 @@ function toJson(obj, pretty){
   return buf.join('');
 }
 
-function toPrettyJson(obj)  {
-  return toJson(obj, true);
-}
-
 function fromJson(json) {
   if (!json) return json;
   try {
diff --git a/src/Scope.js b/src/Scope.js
index 86d5bc14..30e56915 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -44,9 +44,10 @@ function setter(instance, path, value){
 }
 
 ///////////////////////////////////
-
-var getterFnCache = {};
-var JS_KEYWORDS = {};
+var scopeId = 0;
+    getterFnCache = {},
+    compileCache = {},
+    JS_KEYWORDS = {};
 foreach(
    ["abstract", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default",
     "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto",
@@ -88,7 +89,6 @@ function getterFn(path){
 
 ///////////////////////////////////
 
-var compileCache = {};
 function expressionCompile(exp){
   if (typeof exp === 'function') return exp;
   var fn = compileCache[exp];
@@ -108,7 +108,6 @@ function errorHandlerFor(element, error) {
   elementError(element, NG_EXCEPTION, isDefined(error) ? toJson(error) : error);
 }
 
-var scopeId = 0;
 function createScope(parent, services, existing) {
   function Parent(){}
   function API(){}
diff --git a/src/formatters.js b/src/formatters.js
index ca1ce83e..9122489f 100644
--- a/src/formatters.js
+++ b/src/formatters.js
@@ -3,31 +3,28 @@ function toString(obj) {return (isDefined(obj) && obj !== null) ? "" + obj : obj
 
 var NUMBER = /^\s*[-+]?\d*(\.\d*)?\s*$/;
 
-extend(angularFormatter, {
-  'noop':formatter(identity, identity),
-  'json':formatter(toJson, fromJson),
-  'boolean':formatter(toString, toBoolean),
-  'number':formatter(toString,
-      function(obj){
-        if (isString(obj) && NUMBER.exec(obj)) {
-          return obj ? 1*obj : null;
-        }
-        throw "Not a number";
-      }),
+angularFormatter.noop = formatter(identity, identity);
+angularFormatter.json = formatter(toJson, fromJson);
+angularFormatter['boolean'] = formatter(toString, toBoolean);
+angularFormatter.number = formatter(toString, function(obj){
+  if (isString(obj) && NUMBER.exec(obj)) {
+    return obj ? 1*obj : null;
+  }
+  throw "Not a number";
+});
 
-  'list':formatter(
-    function(obj) { return obj ? obj.join(", ") : obj; },
-    function(value) {
-      var list = [];
-      foreach((value || '').split(','), function(item){
-        item = trim(item);
-        if (item) list.push(item);
-      });
-      return list;
-    }
-  ),
+angularFormatter.list = formatter(
+  function(obj) { return obj ? obj.join(", ") : obj; },
+  function(value) {
+    var list = [];
+    foreach((value || '').split(','), function(item){
+      item = trim(item);
+      if (item) list.push(item);
+    });
+    return list;
+  }
+);
 
-  'trim':formatter(
-    function(obj) { return obj ? trim("" + obj) : ""; }
-  )
-});
+angularFormatter.trim = formatter(
+  function(obj) { return obj ? trim("" + obj) : ""; }
+);
diff --git a/src/jqLite.js b/src/jqLite.js
index 22b3c070..1ad4d96d 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -2,24 +2,17 @@
 //JQLite
 //////////////////////////////////
 
-var jqCache = {};
-var jqName = 'ng-' + new Date().getTime();
-var jqId = 1;
-function jqNextId() { return (jqId++); }
-
-var addEventListener = window.document.attachEvent ?
-    function(element, type, fn) {
-      element.attachEvent('on' + type, fn);
-    } : function(element, type, fn) {
-      element.addEventListener(type, fn, false);
-    };
+var jqCache = {},
+    jqName = 'ng-' + new Date().getTime(),
+    jqId = 1,
+    addEventListener = (window.document.attachEvent ?
+      function(element, type, fn) {element.attachEvent('on' + type, fn);} :
+      function(element, type, fn) {element.addEventListener(type, fn, false);}),
+    removeEventListener = (window.document.detachEvent ?
+      function(element, type, fn) {element.detachEvent('on' + type, fn); } :
+      function(element, type, fn) { element.removeEventListener(type, fn, false); });
 
-var removeEventListener = window.document.detachEvent ?
-    function(element, type, fn) {
-      element.detachEvent('on' + type, fn);
-    } : function(element, type, fn) {
-      element.removeEventListener(type, fn, false);
-    };
+function jqNextId() { return (jqId++); }
 
 function jqClearData(element) {
   var cacheId = element[jqName],
diff --git a/src/services.js b/src/services.js
index fa9cdaa4..a5158149 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,11 +1,12 @@
+var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/,
+    HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/,
+    DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
+
 angularService("$window", bind(window, identity, window));
 angularService("$document", function(window){
   return jqLite(window.document);
 }, {inject:['$window']});
 
-var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/;
-var HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/;
-var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
 angularService("$location", function(browser){
   var scope = this,
       location = {parse:parseUrl, toString:toString, update:update},