Merge pull request #16095 from rwjblue/binding-cleanup

[CLEANUP beta] Fix ember-2-legacy support for Ember.Binding.
emberjs · Jan 9, 2018 · 629c5a8 · 629c5a8
2 parents 0ef4488 + 634924c
commit 629c5a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/packages/ember-metal/lib/mixin.js b/packages/ember-metal/lib/mixin.js
@@ -338,14 +338,14 @@ function applyMixin(obj, mixins, partial) {
       replaceObserversAndListeners(obj, key, obj[key], value);
     }
 
-    if (ENV._ENABLE_BINDING_SUPPORT && Mixin.detectBinding(key)) {
+    if (ENV._ENABLE_BINDING_SUPPORT && typeof Mixin.detectBinding === 'function' && Mixin.detectBinding(key)) {
       meta.writeBindings(key, value);
     }
 
     defineProperty(obj, key, desc, value, meta);
   }
 
-  if (ENV._ENABLE_BINDING_SUPPORT && !partial) { // don't apply to prototype
+  if (ENV._ENABLE_BINDING_SUPPORT && !partial && typeof Mixin.finishProtype === 'function') {
     Mixin.finishPartial(obj, meta);
   }
 

diff --git a/packages/ember-runtime/lib/system/core_object.js b/packages/ember-runtime/lib/system/core_object.js
@@ -24,7 +24,6 @@ import {
   Mixin,
   REQUIRED,
   defineProperty,
-  Binding,
   ComputedProperty,
   computed,
   InjectedProperty,
@@ -495,12 +494,6 @@ CoreObject.PrototypeMixin = Mixin.create({
     m.setSourceDestroyed();
   },
 
-  bind(to, from) {
-    if (!(from instanceof Binding)) { from = Binding.from(from); }
-    from.to(to).connect(this);
-    return from;
-  },
-
   /**
     Returns a string representation which attempts to provide more information
     than Javascript's `toString` typically does, in a generic way for all Ember