Merge pull request #3215 from sly7-7/fix-for-2512

remove Map/MapWithDefault polyfills, use Ember's ones
emberjs · Sep 17, 2015 · 0f06c86 · 0f06c86
2 parents 047c1ea + 807a517
commit 0f06c86
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 32 deletions.
diff --git a/packages/ember-data/lib/adapters/rest-adapter.js b/packages/ember-data/lib/adapters/rest-adapter.js
@@ -9,11 +9,9 @@ import {
   TimeoutError,
   AbortError
 } from 'ember-data/adapters/errors';
-import {
-  MapWithDefault
-} from "ember-data/system/map";
 import EmptyObject from "ember-data/system/empty-object";
 var get = Ember.get;
+var MapWithDefault = Ember.MapWithDefault;
 
 import BuildURLMixin from "ember-data/adapters/build-url-mixin";
 

diff --git a/packages/ember-data/lib/system/map.js b/packages/ember-data/lib/system/map.js
diff --git a/packages/ember-data/lib/system/model/attributes.js b/packages/ember-data/lib/system/model/attributes.js
@@ -1,13 +1,11 @@
 import Model from "ember-data/system/model/model";
-import {
-  Map
-} from "ember-data/system/map";
 
 /**
   @module ember-data
 */
 
 var get = Ember.get;
+var Map = Ember.Map;
 
 /**
   @class Model

diff --git a/packages/ember-data/lib/system/model/errors.js b/packages/ember-data/lib/system/model/errors.js
@@ -3,9 +3,7 @@ var set = Ember.set;
 var isEmpty = Ember.isEmpty;
 var makeArray = Ember.makeArray;
 
-import {
-  MapWithDefault
-} from "ember-data/system/map";
+var MapWithDefault = Ember.MapWithDefault;
 
 /**
 @module ember-data

diff --git a/packages/ember-data/lib/system/record-array-manager.js b/packages/ember-data/lib/system/record-array-manager.js
@@ -7,9 +7,7 @@ import {
   FilteredRecordArray,
   AdapterPopulatedRecordArray
 } from "ember-data/system/record-arrays";
-import {
-  MapWithDefault
-} from "ember-data/system/map";
+var  MapWithDefault = Ember.MapWithDefault;
 import OrderedSet from "ember-data/system/ordered-set";
 var get = Ember.get;
 

diff --git a/packages/ember-data/lib/system/relationships/ext.js b/packages/ember-data/lib/system/relationships/ext.js
@@ -3,13 +3,11 @@ import {
   relationshipFromMeta
 } from "ember-data/system/relationship-meta";
 import Model from "ember-data/system/model";
-import {
-  Map,
-  MapWithDefault
-} from "ember-data/system/map";
 import EmptyObject from "ember-data/system/empty-object";
 
 var get = Ember.get;
+var Map = Ember.Map;
+var MapWithDefault = Ember.MapWithDefault;
 
 var relationshipsDescriptor = Ember.computed(function() {
   if (Ember.testing === true && relationshipsDescriptor._cacheable === true) {

diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
@@ -10,9 +10,6 @@ import normalizeModelName from "ember-data/system/normalize-model-name";
 import {
   InvalidError
 } from 'ember-data/adapters/errors';
-import {
-  Map
-} from "ember-data/system/map";
 
 import {
   promiseArray,
@@ -55,6 +52,7 @@ import InternalModel from "ember-data/system/model/internal-model";
 import EmptyObject from "ember-data/system/empty-object";
 
 var Backburner = Ember._Backburner || Ember.Backburner || Ember.__loader.require('backburner')['default'] || Ember.__loader.require('backburner')['Backburner'];
+var Map = Ember.Map;
 
 //Shim Backburner.join
 if (!Backburner.prototype.join) {