Merge pull request #11794 from martndemus/remove-ember-view-support

[CLEANUP beta] Remove deprecated Ember.View support from Ember global
emberjs · Jul 17, 2015 · 8e03e3a · 8e03e3a
2 parents a49526b + 1b3fb6f
commit 8e03e3a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 53 deletions.
diff --git a/packages/ember-views/lib/main.js b/packages/ember-views/lib/main.js
@@ -62,16 +62,24 @@ ViewUtils.isSimpleClick = isSimpleClick;
 ViewUtils.getViewClientRects = getViewClientRects;
 ViewUtils.getViewBoundingClientRect = getViewBoundingClientRect;
 
-Ember.CoreView = DeprecatedCoreView;
-Ember.View = DeprecatedView;
-Ember.View.states = states;
-Ember.View.cloneStates = cloneStates;
-Ember.View._Renderer = Renderer;
+if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+  Ember.CoreView = DeprecatedCoreView;
+  Ember.View = DeprecatedView;
+  Ember.View.states = states;
+  Ember.View.cloneStates = cloneStates;
+  Ember.View._Renderer = Renderer;
+}
+
+Ember._Renderer = Renderer;
+
 Ember.Checkbox = Checkbox;
 Ember.TextField = TextField;
 Ember.TextArea = TextArea;
 
-Ember.Select = DeprecatedSelect;
+if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+  Ember.Select = DeprecatedSelect;
+}
+
 Ember.SelectOption = SelectOption;
 Ember.SelectOptgroup = SelectOptgroup;
 
@@ -83,9 +91,11 @@ Ember.Component = Component;
 Ember.EventDispatcher = EventDispatcher;
 
 // Deprecated:
-Ember._Metamorph = _Metamorph;
-Ember._MetamorphView = _MetamorphView;
-Ember._LegacyEachView = LegacyEachView;
+if (Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+  Ember._Metamorph = _Metamorph;
+  Ember._MetamorphView = _MetamorphView;
+  Ember._LegacyEachView = LegacyEachView;
+}
 
 // END EXPORTS
 

diff --git a/packages/ember-views/tests/views/exports_test.js b/packages/ember-views/tests/views/exports_test.js
diff --git a/packages/ember-views/tests/views/select_test.js b/packages/ember-views/tests/views/select_test.js
@@ -35,12 +35,6 @@ function selectedOptions() {
   return select.get('childViews').mapBy('selected');
 }
 
-QUnit.test('using the Ember.Select global is deprecated', function(assert) {
-  expectDeprecation(function() {
-    Ember.Select.create();
-  }, /Ember.Select is deprecated./);
-});
-
 QUnit.test('has \'ember-view\' and \'ember-select\' CSS classes', function() {
   deepEqual(select.get('classNames'), ['ember-view', 'ember-select']);
 });

diff --git a/tests/node/app-boot-test.js b/tests/node/app-boot-test.js
@@ -69,7 +69,7 @@ function registerDOMHelper(app) {
     initialize: function(app) {
       app.registry.register('renderer:-dom', {
         create: function() {
-          return new Ember.View._Renderer(domHelper, false);
+          return new Ember._Renderer(domHelper, false);
         }
       });
     }
@@ -151,8 +151,8 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {
   });
 
   QUnit.test("It is possible to render a view in Node", function(assert) {
-    var View = Ember.View.extend({
-      renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
+    var View = Ember.Component.extend({
+      renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
       template: compile("<h1>Hello</h1>")
     });
 
@@ -168,7 +168,7 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {
 
   QUnit.test("It is possible to render a view with curlies in Node", function(assert) {
     var View = Ember.Component.extend({
-      renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
+      renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
       layout: compile("<h1>Hello {{location}}</h1>"),
       location: "World"
     });
@@ -186,11 +186,11 @@ if (canUseInstanceInitializers && canUseApplicationVisit) {
 
   QUnit.test("It is possible to render a view with a nested {{view}} helper in Node", function(assert) {
     var View = Ember.Component.extend({
-      renderer: new Ember.View._Renderer(new DOMHelper(new SimpleDOM.Document())),
+      renderer: new Ember._Renderer(new DOMHelper(new SimpleDOM.Document())),
       layout: compile("<h1>Hello {{#if hasExistence}}{{location}}{{/if}}</h1> <div>{{view bar}}</div>"),
       location: "World",
       hasExistence: true,
-      bar: Ember.View.extend({
+      bar: Ember.Component.extend({
         template: compile("<p>The files are *inside* the computer?!</p>")
       })
     });