diff --git a/packages/ember-metal/lib/main.js b/packages/ember-metal/lib/main.js index d84c92e00a3..9b6f84bd957 100644 --- a/packages/ember-metal/lib/main.js +++ b/packages/ember-metal/lib/main.js @@ -30,8 +30,8 @@ import { meta, metaPath, setMeta, - tryCatchFinally, - tryFinally, + deprecatedTryCatchFinally, + deprecatedTryFinally, tryInvoke, typeOf, uuid, @@ -263,12 +263,12 @@ Ember.setMeta = setMeta; Ember.metaPath = metaPath; Ember.inspect = inspect; Ember.typeOf = typeOf; -Ember.tryCatchFinally = tryCatchFinally; +Ember.tryCatchFinally = deprecatedTryCatchFinally; Ember.isArray = isArray; Ember.makeArray = makeArray; Ember.canInvoke = canInvoke; Ember.tryInvoke = tryInvoke; -Ember.tryFinally = tryFinally; +Ember.tryFinally = deprecatedTryFinally; Ember.wrap = wrap; Ember.apply = apply; Ember.applyStr = applyStr; diff --git a/packages/ember-metal/lib/utils.js b/packages/ember-metal/lib/utils.js index 92fb70b055b..d11f672d698 100644 --- a/packages/ember-metal/lib/utils.js +++ b/packages/ember-metal/lib/utils.js @@ -665,6 +665,7 @@ var needsFinallyFix = (function() { ``` @method tryFinally + @deprecated Use JavaScript's native try/finally @for Ember @param {Function} tryable The function to run the try callback @param {Function} finalizer The function to run the finally callback @@ -711,6 +712,11 @@ if (needsFinallyFix) { }; } +var deprecatedTryFinally = function() { + Ember.deprecate("tryFinally is deprecated. Please use JavaScript's native try/finally.", false); + return tryFinally.apply(this, arguments); +}; + /** Provides try/catch/finally functionality, while working around Safari's double finally bug. @@ -741,6 +747,7 @@ if (needsFinallyFix) { ``` @method tryCatchFinally + @deprecated Use JavaScript's native try/catch/finally instead @for Ember @param {Function} tryable The function to run the try callback @param {Function} catchable The function to run the catchable callback @@ -791,6 +798,11 @@ if (needsFinallyFix) { }; } +var deprecatedTryCatchFinally = function() { + Ember.deprecate("tryCatchFinally is deprecated. Please use JavaScript's native try/catch/finally.", false); + return tryCatchFinally.apply(this, arguments); +}; + // ........................................ // TYPING & ARRAY MESSAGING // @@ -972,7 +984,9 @@ export { meta, typeOf, tryCatchFinally, + deprecatedTryCatchFinally, isArray, canInvoke, - tryFinally + tryFinally, + deprecatedTryFinally };