dist/ember-runtime.js in ember-source-2.12.0.beta.2 vs dist/ember-runtime.js in ember-source-2.12.0.beta.3
- old
+ new
@@ -4,11 +4,11 @@
* @copyright Copyright 2011-2017 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version 2.12.0-beta.2
+ * @version 2.12.0-beta.3
*/
var enifed, requireModule, Ember;
var mainContext = this; // Used in ember-environment/lib/global.js
@@ -162,11 +162,11 @@
}
}
return obj;
}
-babelHelpers = {
+var babelHelpers = {
inherits: inherits,
taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
slice: Array.prototype.slice,
createClass: createClass,
interopExportWildcard: interopExportWildcard,
@@ -4942,10 +4942,11 @@
'use strict';
exports.getOnerror = getOnerror;
exports.setOnerror = setOnerror;
exports.dispatchError = dispatchError;
+ exports.getDispatchOverride = getDispatchOverride;
exports.setDispatchOverride = setDispatchOverride;
// To maintain stacktrace consistency across browsers
var getStack = function (error) {
var stack = error.stack;
@@ -4982,10 +4983,14 @@
}
}
// allows testing adapter to override dispatch
+ function getDispatchOverride() {
+ return dispatchOverride;
+ }
+
function setDispatchOverride(handler) {
dispatchOverride = handler;
}
function defaultDispatch(error) {
@@ -9606,11 +9611,11 @@
run.currentRunLoop = next;
}
var onErrorTarget = {
get onerror() {
- return _emberMetalError_handler.getOnerror();
+ return _emberMetalError_handler.dispatchError;
},
set onerror(handler) {
return _emberMetalError_handler.setOnerror(handler);
}
};
@@ -16555,13 +16560,13 @@
Usually you will not need the value or revision parameters at
the end. In this case, it is common to write observer methods that take
only a sender and key value as parameters or, if you aren't interested in
any of these values, to write an observer that has no parameters at all.
@method addObserver
- @param {String} key The key to observer
+ @param {String} key The key to observe
@param {Object} target The target object to invoke
- @param {String|Function} method The method to invoke.
+ @param {String|Function} method The method to invoke
@public
*/
addObserver: function (key, target, method) {
_emberMetal.addObserver(this, key, target, method);
},
@@ -16569,13 +16574,13 @@
/**
Remove an observer you have previously registered on this object. Pass
the same key, target, and method you passed to `addObserver()` and your
target will no longer receive notifications.
@method removeObserver
- @param {String} key The key to observer
+ @param {String} key The key to observe
@param {Object} target The target object to invoke
- @param {String|Function} method The method to invoke.
+ @param {String|Function} method The method to invoke
@public
*/
removeObserver: function (key, target, method) {
_emberMetal.removeObserver(this, key, target, method);
},
@@ -19744,11 +19749,11 @@
exports.default = { "features-stripped-test": false, "ember-libraries-isregistered": false, "ember-improved-instrumentation": false, "ember-metal-weakmap": false, "ember-glimmer-allow-backtracking-rerender": false, "ember-testing-resume-test": false, "ember-factory-for": true, "ember-no-double-extend": false, "mandatory-setter": true, "ember-glimmer-detect-backtracking-rerender": true };
});
enifed("ember/version", ["exports"], function (exports) {
"use strict";
- exports.default = "2.12.0-beta.2";
+ exports.default = "2.12.0-beta.3";
});
enifed('rsvp', ['exports'], function (exports) {
'use strict';
var _rsvp;
@@ -20168,10 +20173,11 @@
if (maybeThenable.constructor === promise.constructor && then$$ === then && promise.constructor.resolve === resolve$1) {
handleOwnThenable(promise, maybeThenable);
} else {
if (then$$ === GET_THEN_ERROR) {
reject(promise, GET_THEN_ERROR.error);
+ GET_THEN_ERROR.error = null;
} else if (then$$ === undefined) {
fulfill(promise, maybeThenable);
} else if (isFunction(then$$)) {
handleForeignThenable(promise, maybeThenable, then$$);
} else {
@@ -20295,14 +20301,14 @@
value = tryCatch(callback, detail);
if (value === TRY_CATCH_ERROR) {
failed = true;
error = value.error;
- value = null;
+ value.error = null; // release
} else {
- succeeded = true;
- }
+ succeeded = true;
+ }
if (promise === value) {
reject(promise, withOwnPromise());
return;
}
@@ -21082,21 +21088,21 @@
}
try {
return findAuthor(); // succeed or fail
} catch(error) {
- return findOtherAuther();
+ return findOtherAuthor();
} finally {
// always runs
// doesn't affect the return value
}
```
Asynchronous example:
```js
findAuthor().catch(function(reason){
- return findOtherAuther();
+ return findOtherAuthor();
}).finally(function(){
// author was either found, or not
});
```