Merge pull request #11826 from martndemus/deprecate-container-view

[BUGFIX release] Deprecate Ember.ContainerView
emberjs · Jul 20, 2015 · 6b5e347 · 6b5e347
2 parents 7b199b6 + e475b91
commit 6b5e347
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/ember-views/lib/main.js b/packages/ember-views/lib/main.js
@@ -21,7 +21,7 @@ import {
 import Renderer from 'ember-metal-views/renderer';
 import { DeprecatedCoreView } from 'ember-views/views/core_view';
 import { DeprecatedView } from 'ember-views/views/view';
-import ContainerView from 'ember-views/views/container_view';
+import { DeprecatedContainerView } from 'ember-views/views/container_view';
 import CollectionView from 'ember-views/views/collection_view';
 import Component from 'ember-views/views/component';
 
@@ -85,7 +85,7 @@ Ember.SelectOptgroup = SelectOptgroup;
 
 Ember.TextSupport = TextSupport;
 Ember.ComponentLookup = ComponentLookup;
-Ember.ContainerView = ContainerView;
+Ember.ContainerView = DeprecatedContainerView;
 Ember.CollectionView = CollectionView;
 Ember.Component = Component;
 Ember.EventDispatcher = EventDispatcher;

diff --git a/packages/ember-views/lib/views/container_view.js b/packages/ember-views/lib/views/container_view.js
@@ -167,6 +167,7 @@ containerViewTemplate.meta.revision = 'Ember@VERSION_STRING_PLACEHOLDER';
   @class ContainerView
   @namespace Ember
   @extends Ember.View
+  @deprecated See http://emberjs.com/deprecations/v1.x/#toc_ember-containerview
   @private
 */
 var ContainerView = View.extend(MutableArray, {
@@ -302,4 +303,11 @@ var ContainerView = View.extend(MutableArray, {
   })
 });
 
+export var DeprecatedContainerView = ContainerView.extend({
+  init() {
+    Ember.deprecate('Ember.ContainerView is deprecated.', !!Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT , { url: 'http://emberjs.com/deprecations/v1.x/#toc_ember-containerview' });
+    this._super.apply(this, arguments);
+  }
+});
+
 export default ContainerView;