diff --git a/packages/ember-data/lib/system/model/model.js b/packages/ember-data/lib/system/model/model.js index 28acd9c6b7a..fcf17395cc6 100644 --- a/packages/ember-data/lib/system/model/model.js +++ b/packages/ember-data/lib/system/model/model.js @@ -101,34 +101,6 @@ var Model = Ember.Object.extend(Ember.Evented, { Example - ```javascript - var record = store.createRecord('model'); - record.get('isDirty'); // true - - store.find('model', 1).then(function(model) { - model.get('isDirty'); // false - model.set('foo', 'some value'); - model.get('isDirty'); // true - }); - ``` - - @property isDirty - @type {Boolean} - @readOnly - @deprecated - */ - isDirty: Ember.computed('currentState.isDirty', function() { - Ember.deprecate('DS.Model#isDirty has been deprecated please use hasDirtyAttributes instead'); - return this.get('currentState.isDirty'); - }), - /** - If this property is `true` the record is in the `dirty` state. The - record has local changes that have not yet been saved by the - adapter. This includes records that have been created (but not yet - saved) or deleted. - - Example - ```javascript var record = store.createRecord('model'); record.get('hasDirtyAttributes'); // true @@ -661,28 +633,6 @@ var Model = Ember.Object.extend(Ember.Evented, { }, */ - /** - If the model `isDirty` this function will discard any unsaved - changes. If the model `isNew` it will be removed from the store. - - Example - - ```javascript - record.get('name'); // 'Untitled Document' - record.set('name', 'Doc 1'); - record.get('name'); // 'Doc 1' - record.rollback(); - record.get('name'); // 'Untitled Document' - ``` - - @method rollback - @deprecated Use `rollbackAttributes()` instead - */ - rollback: function() { - Ember.deprecate('Using model.rollback() has been deprecated. Use model.rollbackAttributes() to discard any unsaved changes to a model.'); - this.rollbackAttributes(); - }, - /** If the model `isDirty` this function will discard any unsaved changes. If the model `isNew` it will be removed from the store. diff --git a/packages/ember-data/tests/unit/model-test.js b/packages/ember-data/tests/unit/model-test.js index f635db70ef8..2a43eb650c4 100644 --- a/packages/ember-data/tests/unit/model-test.js +++ b/packages/ember-data/tests/unit/model-test.js @@ -893,23 +893,3 @@ test('accessing attributes in the initializer should not throw an error', functi run(() => store.createRecord('person')); }); - - -test('isDirty should log a deprecation warning', function() { - expect(1); - var Person = DS.Model.extend({ - name: DS.attr('string') - }); - - var env = setupStore({ - person: Person - }); - var store = env.store; - - run(function() { - var person = store.createRecord('person'); - expectDeprecation(function() { - person.get('isDirty'); - }, /DS.Model#isDirty has been deprecated/); - }); -}); diff --git a/packages/ember-data/tests/unit/model/rollback-test.js b/packages/ember-data/tests/unit/model/rollback-test.js deleted file mode 100644 index 0514539d925..00000000000 --- a/packages/ember-data/tests/unit/model/rollback-test.js +++ /dev/null @@ -1,36 +0,0 @@ -var env, store, Person; -var run = Ember.run; - -module("unit/model/rollback - model.rollback() - deprecated", { - setup: function() { - Person = DS.Model.extend({ - firstName: DS.attr(), - lastName: DS.attr() - }); - - env = setupStore({ person: Person }); - store = env.store; - } -}); - -test("changes to attributes can be rolled back - deprecated", function() { - var person; - run(function() { - person = store.push('person', { id: 1, firstName: 'Tom', lastName: 'Dale' }); - person.set('firstName', 'Thomas'); - }); - - equal(person.get('firstName'), 'Thomas'); - - expectDeprecation( - function() { - run(function() { - person.rollback(); - }); - }, - 'Using model.rollback() has been deprecated. Use model.rollbackAttributes() to discard any unsaved changes to a model.' - ); - - equal(person.get('firstName'), 'Tom'); - equal(person.get('hasDirtyAttributes'), false); -});