reduce noise

emberjs · Apr 25, 2019 · 9e94535 · 9e94535
1 parent bacce7a
commit 9e94535
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/packages/store/addon/-private/system/model/internal-model.ts b/packages/store/addon/-private/system/model/internal-model.ts
@@ -323,13 +323,25 @@ export default class InternalModel {
       if (DEBUG) {
         let klass = this._record.constructor;
         let deprecations = lookupDeprecations(klass);
-        debugger;
-        ['becameError', 'becameInvalid', 'didCreate', 'didDelete', 'didLoad', 'didUpdate', 'ready', 'rolledBack'].forEach(methodName => {
+        [
+          'becameError',
+          'becameInvalid',
+          'didCreate',
+          'didDelete',
+          'didLoad',
+          'didUpdate',
+          'ready',
+          'rolledBack',
+        ].forEach(methodName => {
           if (typeof this._record[methodName] === 'function') {
-            deprecate(`Attempted to define ${methodName} on ${this._record.modelName}#${this._record.id}`, deprecations[methodName], {
-              id: 'ember-evented',
-              until: '3.12'
-            })
+            deprecate(
+              `Attempted to define ${methodName} on ${this._record.modelName}#${this._record.id}`,
+              deprecations[methodName],
+              {
+                id: 'ember-data:record-lifecycle-event-methods',
+                until: '3.12',
+              }
+            );
           }
         });
       }
@@ -539,8 +551,8 @@ export default class InternalModel {
       key,
       store,
       originatingInternalModel: this,
-      modelName: relationshipMeta.type
-    }
+      modelName: relationshipMeta.type,
+    };
 
     if (isAsync) {
       let internalModel =
@@ -1061,7 +1073,8 @@ export default class InternalModel {
     let record = this._record;
     let trigger = record.trigger;
     for (let i = 0, l = triggers.length; i < l; i++) {
-      trigger.apply(record, triggers[i]);
+      let eventName = triggers[i];
+      trigger.apply(record, eventName);
     }
 
     triggers.length = 0;

diff --git a/packages/store/addon/-private/system/model/model.js b/packages/store/addon/-private/system/model/model.js
@@ -841,7 +841,9 @@ const Model = EmberObject.extend(DeprecatedEvented, {
       fn.apply(this, args);
     }
 
-    this._super(...arguments);
+    if (this._has(name)) {
+      this._super(...arguments);
+    }
   },
 
   attr() {