jelly.js in honkster-jelly-0.8.6

- old
+ new

@@ -1,10 +1,10 @@
 /**
  *  Jelly. a sweet unobtrusive javascript framework
  *  for jQuery and Rails
  *
- *  version 0.8.4
+ *  version 0.8.6
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.
  *
  *  * Date: 2009-07-20 9:50:50 (Mon, 20 Jul 2009)
@@ -18,152 +18,134 @@
     return function() {
       return self.apply(object, arguments);
     }
   }
 }
-Jelly.init = function() {
-  this.observers = [];
-  this.observers.pending = [];
-  this.attach = this.Observers.attach;
-  this.notifyObservers = this.Observers.notify;
-  this.Components.initCalled = false;
-  this.Pages.init();
-  var self = this;
-  $(document).ready(function() {
-    self.Components.init();
-  });
-};
-
-Jelly.Components = {
+$.extend(Jelly, {
   init: function() {
-    for (var i = 0; i < Jelly.observers.pending.length; i++) {
-      Jelly.Observers.initPending.call(Jelly.observers, Jelly.observers.pending[i]);
-    }
-    this.initCalled = true;
-  }
-};
+    this.observers = [];
+    this.attach = this.Observers.attach;
+    this.notifyObservers = this.Observers.notify;
+    this.Pages.init();
+  },
 
-Jelly.Observers = {
-  attach: function() {
-    if (this == Jelly) {
-      return Jelly.Observers.attach.apply(this.observers, arguments);
-    }
-    this.pending = this.pending || [];
-    for (var i = 0; i < arguments.length; i++) {
-      var definition = arguments[i];
-      var component = (typeof definition.component == "string") ?
-                      eval(definition.component) :
-                      definition.component;
-      var evaluatedDefinition = {
-        component: component,
-        arguments: definition.arguments
-      };
-      this.pending.push(evaluatedDefinition);
-      if (Jelly.Components.initCalled) {
-        Jelly.Observers.initPending.call(this, evaluatedDefinition);
+  Observers: {
+    attach: function() {
+      if (this == Jelly) {
+        return Jelly.Observers.attach.apply(this.observers, arguments);
       }
-    }
-  },
+      for (var i = 0; i < arguments.length; i++) {
+        var definitionOrComponent = arguments[i];
+        var observer;
+        if (definitionOrComponent.component) {
+          var component = Jelly.Observers.evaluateComponent(definitionOrComponent.component);
+          if (component.init) {
+            observer = component.init.apply(component, definitionOrComponent.arguments) || component;
+          } else {
+            observer = component;
+          }
+        } else {
+          observer = Jelly.Observers.evaluateComponent(definitionOrComponent);
+        }
+        this.push(observer);
+      }
+    },
 
-  initPending: function(definition) {
-    var observer;
-    if (definition.component.init) {
-      observer = definition.component.init.apply(definition.component, definition.arguments);
-    }
-    this.push(observer ? observer : definition.component);
-  },
+    evaluateComponent: function(component) {
+      return (typeof component == "string") ? eval(component) : component;
+    },
 
-  notify: function(callbacks) {
-    if (this == Jelly) {
-      return Jelly.Observers.notify.apply(this.observers, arguments);
-    }
-    if (!$.isArray(callbacks)) {
-      callbacks = [callbacks];
-    }
+    notify: function(callbacks) {
+      if (this == Jelly) {
+        return Jelly.Observers.notify.apply(this.observers, arguments);
+      }
+      if (!$.isArray(callbacks)) {
+        callbacks = [callbacks];
+      }
 
-    var observers = this.slice(0);
-    for (var i = 0; i < callbacks.length; i++) {
-      var callback = callbacks[i];
+      var observers = this.slice(0);
+      for (var i = 0; i < callbacks.length; i++) {
+        var callback = callbacks[i];
 
-      // Deprecate 'on' in favor of making each page action a Component.
-      if (callback.on) {
-        var additionalObserver = eval(callback.on);
-        if (observers.indexOf(additionalObserver) == -1) {
-          observers.push(additionalObserver);
+        // Deprecate 'on' in favor of making each page action a Component.
+        if (callback.on) {
+          var additionalObserver = eval(callback.on);
+          if (observers.indexOf(additionalObserver) == -1) {
+            observers.push(additionalObserver);
+          }
         }
-      }
 
-      for (var j = 0; j < observers.length; j++) {
-        var observer = observers[j];
-        if (observer[callback.method]) {
-          if (observer.detach && observer.detach()) {
-            Jelly.Observers.garbageCollectObserver.call(this, observer);
-          } else {
-            observer[callback.method].apply(observer, callback.arguments);
+        if (callback.method) {
+          for (var j = 0; j < observers.length; j++) {
+            var observer = observers[j];
+            if (observer[callback.method]) {
+              if (observer.detach && observer.detach()) {
+                Jelly.Observers.garbageCollectObserver.call(this, observer);
+              } else {
+                observer[callback.method].apply(observer, callback.arguments);
+              }
+            }
           }
         }
+
+        if (callback.attach) {
+          Jelly.Observers.attach.apply(this, callback.attach);
+        }
       }
+    },
 
-      if (callback.attach) {
-        Jelly.Observers.attach.apply(this, callback.attach);
+    garbageCollectObserver: function(observer) {
+      var index = this.indexOf(observer);
+      if (index > -1) {
+        Jelly.Observers.remove.call(this, index, index + 1);
       }
-    }
-  },
+    },
 
-  garbageCollectObserver: function(observer) {
-    var index = this.indexOf(observer);
-    if (index > -1) {
-      Jelly.Observers.remove.call(this, index, index + 1);
+    remove: function(from, to) {
+      var rest = this.slice((to || from) + 1 || this.length);
+      this.length = from < 0 ? this.length + from : from;
+      return this.push.apply(this, rest);
     }
   },
 
-  remove: function(from, to) {
-    var rest = this.slice((to || from) + 1 || this.length);
-    this.length = from < 0 ? this.length + from : from;
-    return this.push.apply(this, rest);
-  }
-};
+  Pages: {
+    init: function() {
+      this.all = {};
+      Jelly.all = this.all; // Deprecated
+    },
 
-Jelly.Pages = {
-  init: function() {
-    this.all = {};
-    Jelly.all = this.all; // Deprecated
-  },
-
-  add: function(name) {
-    var page = new Jelly.Page.Constructor(name);
-    for (var i = 1; i < arguments.length; i++) {
-      $.extend(page, arguments[i]);
+    add: function(name) {
+      var page = new Jelly.Page.Constructor(name);
+      for (var i = 1; i < arguments.length; i++) {
+        $.extend(page, arguments[i]);
+      }
+      return page;
     }
-    return page;
-  }
-};
-Jelly.add = Jelly.Pages.add; // Deprecated
-
-Jelly.Page = {
-  init: function(controllerName, actionName) {
-    var page = Jelly.Pages.all[controllerName] || new Jelly.Page.Constructor(controllerName);
-    window.page = page;
-    if (page.all) page.all();
-    if (page[actionName]) page[actionName].call(page);
-    page.loaded = true;
-    return page;
   },
-  Constructor: function(name) {
-    this.loaded = false;
-    this.documentHref = Jelly.Location.documentHref;
 
-    this.name = name;
-    Jelly.Pages.all[name] = this;
-  }
-};
+  Page: {
+    init: function(controllerName, actionName) {
+      var page = Jelly.Pages.all[controllerName] || new Jelly.Page.Constructor(controllerName);
+      window.page = page;
+      if (page.all) page.all();
+      if (page[actionName]) page[actionName].call(page);
+      page.loaded = true;
+      return page;
+    },
+    Constructor: function(name) {
+      this.loaded = false;
+      this.documentHref = Jelly.Location.documentHref;
 
-Jelly.Location = {
-  init: function() {
+      this.name = name;
+      Jelly.Pages.all[name] = this;
+    }
   },
 
-  on_redirect: function(location) {
-    top.location.href = location;
+  Location: {
+    on_redirect: function(location) {
+      top.location.href = location;
+    }
   }
-};
+});
+Jelly.add = Jelly.Pages.add; // Deprecated
 
 Jelly.init();