dist/ember-runtime.js in ember-source-0.0.2 vs dist/ember-runtime.js in ember-source-0.0.3

- old
+ new

@@ -148,12 +148,12 @@ }; }; })(); -// Version: v1.0.0-rc.1-188-gb6bb967 -// Last commit: b6bb967 (2013-03-16 18:09:42 -0700) +// Version: v1.0.0-rc.1-203-ga1cbd22 +// Last commit: a1cbd22 (2013-03-18 10:31:41 -0700) (function() { var define, requireModule; @@ -400,24 +400,25 @@ Ember.handleErrors = function(func, context) { // Unfortunately in some browsers we lose the backtrace if we rethrow the existing error, // so in the event that we don't have an `onerror` handler we don't wrap in a try/catch if ('function' === typeof Ember.onerror) { try { - return func.apply(context || this); + return func.call(context || this); } catch (error) { Ember.onerror(error); } } else { - return func.apply(context || this); + return func.call(context || this); } }; Ember.merge = function(original, updates) { for (var prop in updates) { if (!updates.hasOwnProperty(prop)) { continue; } original[prop] = updates[prop]; } + return original; }; /** Returns true if the passed value is null or undefined. This avoids errors from JSLint complaining about use of ==, which can be technically @@ -4059,10 +4060,10 @@ if (!target) { target = obj; } if ('string' === typeof method) { method = target[method]; } if (params) { method.apply(target, params); } else { - method.apply(target); + method.call(target); } } return true; }