generators/jelly/templates/javascripts/jelly.js in honkster-jelly-0.8.10 vs generators/jelly/templates/javascripts/jelly.js in honkster-jelly-0.8.11
- old
+ new
@@ -1,10 +1,10 @@
/**
* Jelly. a sweet unobtrusive javascript framework
* for jQuery and Rails
*
- * version 0.8.10
+ * version 0.8.11
*
* Copyright (c) 2009 Pivotal Labs
* Licensed under the MIT license.
*
* * Date: 2009-07-20 9:50:50 (Mon, 20 Jul 2009)
@@ -51,11 +51,11 @@
}
}
},
evaluateComponent: function(component) {
- return (typeof component == "string") ? eval(component) : component;
+ return eval(component);
},
pushIfObserver: function(observer) {
if (observer) {
this.push(observer);
@@ -68,19 +68,19 @@
}
if (!$.isArray(callbacks)) {
callbacks = [callbacks];
}
- var observers = this.slice(0);
+ var pristineObservers = this.slice(0);
+ var observers;
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);
- }
+ observers = [eval(callback.on)];
+ } else {
+ observers = pristineObservers;
}
if (callback.method) {
for (var j = 0; j < observers.length; j++) {
var observer = observers[j];