From b4a415e1be4db3673a102b3fdc45b6bd22d46d59 Mon Sep 17 00:00:00 2001 From: Jo Liss Date: Sun, 6 May 2012 15:22:28 +0200 Subject: [PATCH] Replace deprecated ember_assert with Ember.assert This fixes all instances of the old un-namespaced ember_* functions. --- packages/ember-data/lib/adapters/fixture_adapter.js | 4 ++-- packages/ember-data/lib/adapters/rest_adapter.js | 10 +++++----- .../ember-data/lib/system/associations/belongs_to.js | 2 +- .../ember-data/lib/system/associations/has_many.js | 2 +- packages/ember-data/lib/system/model/attributes.js | 2 +- packages/ember-data/lib/system/model/model.js | 4 ++-- .../ember-data/lib/system/record_array/many_array.js | 2 +- packages/ember-data/lib/system/store.js | 8 ++++---- packages/ember-data/lib/system/transaction.js | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/ember-data/lib/adapters/fixture_adapter.js b/packages/ember-data/lib/adapters/fixture_adapter.js index 23fbd231b49..682046f00c3 100644 --- a/packages/ember-data/lib/adapters/fixture_adapter.js +++ b/packages/ember-data/lib/adapters/fixture_adapter.js @@ -5,7 +5,7 @@ DS.fixtureAdapter = DS.Adapter.create({ find: function(store, type, id) { var fixtures = type.FIXTURES; - ember_assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); + Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); if (fixtures.hasLoaded) { return; } setTimeout(function() { @@ -21,7 +21,7 @@ DS.fixtureAdapter = DS.Adapter.create({ findAll: function(store, type) { var fixtures = type.FIXTURES; - ember_assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); + Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures); var ids = fixtures.map(function(item, index, self){ return item.id; }); store.loadMany(type, ids, fixtures); diff --git a/packages/ember-data/lib/adapters/rest_adapter.js b/packages/ember-data/lib/adapters/rest_adapter.js index 0a7202632ec..199477c44eb 100644 --- a/packages/ember-data/lib/adapters/rest_adapter.js +++ b/packages/ember-data/lib/adapters/rest_adapter.js @@ -207,10 +207,10 @@ DS.RESTAdapter = DS.Adapter.extend({ if (!sideloadedType) { mappings = get(this, 'mappings'); - ember_assert("Your server returned a hash with the key " + prop + " but you have no mappings", !!mappings); + Ember.assert("Your server returned a hash with the key " + prop + " but you have no mappings", !!mappings); sideloadedType = get(mappings, prop); - ember_assert("Your server returned a hash with the key " + prop + " but you have no mapping for it", !!sideloadedType); + Ember.assert("Your server returned a hash with the key " + prop + " but you have no mapping for it", !!sideloadedType); } this.loadValue(store, sideloadedType, json[prop]); @@ -228,9 +228,9 @@ DS.RESTAdapter = DS.Adapter.extend({ buildURL: function(record, suffix) { var url = [""]; - ember_assert("Namespace URL (" + this.namespace + ") must not start with slash", !this.namespace || this.namespace.toString().charAt(0) !== "/"); - ember_assert("Record URL (" + record + ") must not start with slash", !record || record.toString().charAt(0) !== "/"); - ember_assert("URL suffix (" + suffix + ") must not start with slash", !suffix || suffix.toString().charAt(0) !== "/"); + Ember.assert("Namespace URL (" + this.namespace + ") must not start with slash", !this.namespace || this.namespace.toString().charAt(0) !== "/"); + Ember.assert("Record URL (" + record + ") must not start with slash", !record || record.toString().charAt(0) !== "/"); + Ember.assert("URL suffix (" + suffix + ") must not start with slash", !suffix || suffix.toString().charAt(0) !== "/"); if (this.namespace !== undefined) { url.push(this.namespace); diff --git a/packages/ember-data/lib/system/associations/belongs_to.js b/packages/ember-data/lib/system/associations/belongs_to.js index f79d001373a..194f77e1cce 100644 --- a/packages/ember-data/lib/system/associations/belongs_to.js +++ b/packages/ember-data/lib/system/associations/belongs_to.js @@ -52,6 +52,6 @@ var hasAssociation = function(type, options, one) { }; DS.belongsTo = function(type, options) { - ember_assert("The type passed to DS.belongsTo must be defined", !!type); + Ember.assert("The type passed to DS.belongsTo must be defined", !!type); return hasAssociation(type, options); }; diff --git a/packages/ember-data/lib/system/associations/has_many.js b/packages/ember-data/lib/system/associations/has_many.js index 1cc15018e10..2a29e606105 100644 --- a/packages/ember-data/lib/system/associations/has_many.js +++ b/packages/ember-data/lib/system/associations/has_many.js @@ -38,6 +38,6 @@ var hasAssociation = function(type, options) { }; DS.hasMany = function(type, options) { - ember_assert("The type passed to DS.hasMany must be defined", !!type); + Ember.assert("The type passed to DS.hasMany must be defined", !!type); return hasAssociation(type, options); }; diff --git a/packages/ember-data/lib/system/model/attributes.js b/packages/ember-data/lib/system/model/attributes.js index 57b0b38c220..bb53d7be68e 100644 --- a/packages/ember-data/lib/system/model/attributes.js +++ b/packages/ember-data/lib/system/model/attributes.js @@ -28,7 +28,7 @@ DS.Model.reopenClass({ DS.attr = function(type, options) { var transform = DS.attr.transforms[type]; - ember_assert("Could not find model attribute of type " + type, !!transform); + Ember.assert("Could not find model attribute of type " + type, !!transform); var transformFrom = transform.from; var transformTo = transform.to; diff --git a/packages/ember-data/lib/system/model/model.js b/packages/ember-data/lib/system/model/model.js index 673fb67b225..d588499a259 100644 --- a/packages/ember-data/lib/system/model/model.js +++ b/packages/ember-data/lib/system/model/model.js @@ -250,7 +250,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, { var data = get(this, 'data'); if (data && key in data) { - ember_assert("You attempted to access the " + key + " property on a record without defining an attribute.", false); + Ember.assert("You attempted to access the " + key + " property on a record without defining an attribute.", false); } }, @@ -258,7 +258,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, { var data = get(this, 'data'); if (data && key in data) { - ember_assert("You attempted to set the " + key + " property on a record without defining an attribute.", false); + Ember.assert("You attempted to set the " + key + " property on a record without defining an attribute.", false); } else { return this._super(key, value); } diff --git a/packages/ember-data/lib/system/record_array/many_array.js b/packages/ember-data/lib/system/record_array/many_array.js index 107e2aec4d9..5f2b0abb18a 100644 --- a/packages/ember-data/lib/system/record_array/many_array.js +++ b/packages/ember-data/lib/system/record_array/many_array.js @@ -35,7 +35,7 @@ DS.ManyArray = DS.RecordArray.extend({ var stateManager = get(this, 'stateManager'); added = added.map(function(record) { - ember_assert("You can only add records of " + (get(this, 'type') && get(this, 'type').toString()) + " to this association.", !get(this, 'type') || (get(this, 'type') === record.constructor)); + Ember.assert("You can only add records of " + (get(this, 'type') && get(this, 'type').toString()) + " to this association.", !get(this, 'type') || (get(this, 'type') === record.constructor)); if (pendingParent) { record.send('waitingOn', parentRecord); diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js index 75495d70ab9..12633aa61c9 100644 --- a/packages/ember-data/lib/system/store.js +++ b/packages/ember-data/lib/system/store.js @@ -573,11 +573,11 @@ DS.Store = Ember.Object.extend({ primaryKey = type.proto().primaryKey; - // TODO: Make ember_assert more flexible and convert this into an ember_assert + // TODO: Make Ember.assert more flexible and convert this into an Ember.assert if (hash) { - ember_assert("The server must provide a primary key: " + primaryKey, get(hash, primaryKey)); + Ember.assert("The server must provide a primary key: " + primaryKey, get(hash, primaryKey)); } else { - ember_assert("The server did not return data, and you did not create a primary key (" + primaryKey + ") on the client", get(get(record, 'data'), primaryKey)); + Ember.assert("The server did not return data, and you did not create a primary key (" + primaryKey + ") on the client", get(get(record, 'data'), primaryKey)); } clientId = get(record, 'clientId'); @@ -750,7 +750,7 @@ DS.Store = Ember.Object.extend({ if (hash === undefined) { hash = id; var primaryKey = type.proto().primaryKey; - ember_assert("A data hash was loaded for a record of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", primaryKey in hash); + Ember.assert("A data hash was loaded for a record of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", primaryKey in hash); id = hash[primaryKey]; } diff --git a/packages/ember-data/lib/system/transaction.js b/packages/ember-data/lib/system/transaction.js index 732e4213b2f..27893123c64 100644 --- a/packages/ember-data/lib/system/transaction.js +++ b/packages/ember-data/lib/system/transaction.js @@ -120,12 +120,12 @@ DS.Transaction = Ember.Object.extend({ */ add: function(record) { // we could probably make this work if someone has a valid use case. Do you? - ember_assert("Once a record has changed, you cannot move it into a different transaction", !get(record, 'isDirty')); + Ember.assert("Once a record has changed, you cannot move it into a different transaction", !get(record, 'isDirty')); var recordTransaction = get(record, 'transaction'), defaultTransaction = getPath(this, 'store.defaultTransaction'); - ember_assert("Models cannot belong to more than one transaction at a time.", recordTransaction === defaultTransaction); + Ember.assert("Models cannot belong to more than one transaction at a time.", recordTransaction === defaultTransaction); this.adoptRecord(record); },