expand variable names, whitespace

madrobby · Dec 4, 2010 · 120c8ad · 120c8ad
1 parent 89a5180
commit 120c8ad
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 99 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -3,16 +3,16 @@
     // { type, url, data, success, dataType, contentType }
     options = options || {};
     var data = options.data,
-        cb = options.success,
+        callback = options.success,
         mime = mimeTypes[options.dataType],
         content = options.contentType,
         xhr = new XMLHttpRequest();
 
-    if (cb instanceof Function) {
+    if (callback instanceof Function) {
       xhr.onreadystatechange = function(){
         if(xhr.readyState==4 && (xhr.status==200 || xhr.status==0)) {
-          if (mime == 'application/json') cb(JSON.parse(xhr.responseText));
-          else cb(xhr.responseText);
+          if (mime == 'application/json') callback(JSON.parse(xhr.responseText));
+          else callback(xhr.responseText);
         }
       };
     }
@@ -24,6 +24,7 @@
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     xhr.send(data);
   };
+
   var mimeTypes = $.ajax.mimeTypes = {
     json: 'application/json',
     xml:  'application/xml',
@@ -39,9 +40,9 @@
   $.getJSON = function(url, success){ $.ajax({ url: url, success: success, dataType: 'json' }) };
 
   $.fn.load = function(url, success){
+    if (!this.dom.length) return this;
     var self = this, parts = url.split(/\s/), selector;
-    if(!this.dom.length) return this;
-    if(parts.length>1) url = parts[0], selector = parts[1];
+    if (parts.length > 1) url = parts[0], selector = parts[1];
     $.get(url, function(response){
       self.html(selector ?
         $(document.createElement('div')).html(response).find(selector).html()

diff --git a/src/assets.js b/src/assets.js
@@ -2,14 +2,14 @@
   var cache = [], timeout;
 
   $.fn.remove = function(){
-    return this.each(function(el){
-      if(el.tagName=='IMG'){
-        cache.push(el);
-        el.src = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
-        if(timeout) clearTimeout(timeout);
+    return this.each(function(element){
+      if(element.tagName == 'IMG'){
+        cache.push(element);
+        element.src = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+        if (timeout) clearTimeout(timeout);
         timeout = setTimeout(function(){ cache = [] }, 60000);
       }
-      el.parentNode.removeChild(el);
+      element.parentNode.removeChild(element);
     });
   }
 })(Zepto);
diff --git a/src/detect.js b/src/detect.js
@@ -5,10 +5,10 @@
       iphone = ua.match(/(iPhone\sOS)\s([\d_]+)/),
       ipad = ua.match(/(iPad).*OS\s([\d_]+)/),
       webos = ua.match(/(webOS)\/([\d.]+)/);
-    if(android) os.android = true, os.version = android[2];
-    if(iphone) os.ios = true, os.version = iphone[2].replace(/_/g,'.'), os.iphone = true;
-    if(ipad) os.ios = true, os.version = ipad[2].replace(/_/g,'.'), os.ipad = true;
-    if(webos) os.webos = true, os.version = webos[2];
+    if (android) os.android = true, os.version = android[2];
+    if (iphone) os.ios = true, os.version = iphone[2].replace(/_/g, '.'), os.iphone = true;
+    if (ipad) os.ios = true, os.version = ipad[2].replace(/_/g, '.'), os.ipad = true;
+    if (webos) os.webos = true, os.version = webos[2];
     return os;
   }
   $.os = detect(navigator.userAgent);

diff --git a/src/event.js b/src/event.js
@@ -1,46 +1,56 @@
 (function($){
-  var d=document, $$=$.qsa, handlers=[];
-  function find(el, ev, fn) {
+  var $$ = $.qsa, handlers = [];
+
+  function find(element, event, fn) {
     return handlers.filter(function(handler){
-      return handler && handler.el===el && (!ev || handler.ev===ev) && (!fn || handler.fn===fn);
+      return handler && handler.element === element &&
+        (!event || handler.event === event) && (!fn || handler.fn === fn);
     });
   }
+
   $.event = {
-    add: function(el, events, fn){
-      events.split(/\s/).forEach(function(ev){
-        var handler = {ev: ev, el: el, fn: fn, i: handlers.length};
+    add: function(element, events, fn){
+      events.split(/\s/).forEach(function(event){
+        var handler = {event: event, element: element, fn: fn, i: handlers.length};
         handlers.push(handler);
-        el.addEventListener(ev, fn, false);
+        element.addEventListener(event, fn, false);
       });
     },
-    remove: function(el, events, fn){
-      (events||'').split(/\s/).forEach(function(ev){
-        find(el, ev, fn).forEach(function(handler){
+    remove: function(element, events, fn){
+      (events || '').split(/\s/).forEach(function(event){
+        find(element, event, fn).forEach(function(handler){
           handlers[handler.i] = null;
-          el.removeEventListener(handler.ev, handler.fn, false);
+          element.removeEventListener(handler.event, handler.fn, false);
         });
       });
     }
   };
   $.fn.bind = function(event, callback){
-    return this.each(function(el){ $.event.add(el, event, callback) });
+    return this.each(function(element){
+      $.event.add(element, event, callback);
+    });
   };
   $.fn.unbind = function(event, callback){
-    return this.each(function(el){ $.event.remove(el, event, callback) });
+    return this.each(function(element){
+      $.event.remove(element, event, callback);
+    });
   };
   $.fn.delegate = function(selector, event, callback){
-    return this.each(function(el){
-      $.event.add(el, event, function(event){
-        var target = event.target, nodes = $$(el, selector);
-        while(target && nodes.indexOf(target)<0) target = target.parentNode;
-        if(target && !(target===el) && !(target===d)) callback.call(target, event);
-      }, false);
+    return this.each(function(element){
+      $.event.add(element, event, function(e){
+        var target = e.target, nodes = $$(element, selector);
+        while (target && nodes.indexOf(target) < 0) target = target.parentNode;
+        if (target && !(target === element) && !(target === document)) callback.call(target, e);
+      });
     });
   };
   $.fn.live = function(event, callback){
-    $(d.body).delegate(this.selector, event, callback); return this;
+    $(document.body).delegate(this.selector, event, callback); return this;
   };
   $.fn.trigger = function(event){
-    return this.each(function(el){ var e; el.dispatchEvent(e = d.createEvent('Events'), e.initEvent(event, true, false)) });
+    return this.each(function(element){
+      var e = document.createEvent('Events');
+      element.dispatchEvent(e, e.initEvent(event, true, false));
+    });
   };
 })(Zepto);
diff --git a/src/fx.js b/src/fx.js
@@ -1,8 +1,14 @@
 (function($){
-  $.fn.anim = function(props, dur, ease){
-    var transforms = [], opacity, k;
-    for (k in props) k === 'opacity' ? opacity=props[k] : transforms.push(k+'('+props[k]+')');
-    return this.css({ '-webkit-transition': 'all '+(dur||0.5)+'s '+(ease||''),
-      '-webkit-transform': transforms.join(' '), opacity: opacity });
+  $.fn.anim = function(properties, duration, ease){
+    var transforms = [], opacity, key;
+    for (key in properties)
+      if (key === 'opacity') opacity = properties[key];
+      else transforms.push(key + '(' + properties[key] + ')');
+
+    return this.css({
+      '-webkit-transition': 'all ' + (duration || 0.5) + 's ' + (ease || ''),
+      '-webkit-transform': transforms.join(' '),
+      opacity: opacity
+    });
   }
 })(Zepto);
diff --git a/src/touch.js b/src/touch.js
@@ -1,13 +1,13 @@
 (function($){
-  var touch={}, touchTimeout;
+  var touch = {}, touchTimeout;
 
   function parentIfText(node){
     return 'tagName' in node ? node : node.parentNode;
   }
 
   $(document).ready(function(){
     $(document.body).bind('touchstart', function(e){
-      var now = Date.now(), delta = now-(touch.last || now);
+      var now = Date.now(), delta = now - (touch.last || now);
       touch.target = parentIfText(e.touches[0].target);
       touchTimeout && clearTimeout(touchTimeout);
       touch.x1 = e.touches[0].pageX;
@@ -20,7 +20,7 @@
         $(touch.target).trigger('doubleTap');
         touch = {};
       } else if (touch.x2 > 0) {
-        Math.abs(touch.x1-touch.x2)>30 && $(touch.target).trigger('swipe');
+        Math.abs(touch.x1 - touch.x2) > 30 && $(touch.target).trigger('swipe');
         touch.x1 = touch.x2 = touch.last = 0;
       } else if ('last' in touch) {
         touchTimeout = setTimeout(function(){
@@ -29,10 +29,10 @@
           touch = {};
         }, 250);
       }
-    }).bind('touchcancel', function(){ touch={} });
+    }).bind('touchcancel', function(){ touch = {} });
   });
 
-  ['swipe', 'doubleTap', 'tap'].forEach(function(m){
-    $.fn[m] = function(callback){ return this.bind(m, callback) }
+  ['swipe', 'doubleTap', 'tap'].forEach(function(gesture){
+    $.fn[gesture] = function(callback){ return this.bind(gesture, callback) }
   });
 })(Zepto);