Merge pull request #383 from teddyzeenny/string-model-name

Add support for passing model names to the data adapter
emberjs · Jun 5, 2015 · e3b0d5d · e3b0d5d
2 parents 8e840f2 + 8416445
commit e3b0d5d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
@@ -170,7 +170,15 @@ var DataDebug = Ember.Object.extend(PortMixin, {
       var type = this.sentTypes[message.objectId], self = this;
       this.releaseRecords();
 
-      var releaseMethod = this.get('adapter').watchRecords(type.object,
+      let typeOrName;
+      if (this.get('adapter.acceptsModelName')) {
+        // Ember >= 1.3
+        typeOrName = type.name;
+      } else {
+        // support for legacy Ember < 1.3
+        typeOrName = type.object;
+      }
+      var releaseMethod = this.get('adapter').watchRecords(typeOrName,
         function(recordsReceived) {
           self.recordsAdded(recordsReceived);
         },

diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -62,7 +62,7 @@ function inspect(value) {
     // so summarize to just first 2 props
     var ret = [], v, count = 0, broken = false;
     for (var key in value) {
-      if (value.hasOwnProperty(key)) {
+      if (!('hasOwnProperty' in value) || value.hasOwnProperty(key)) {
         if (count++ > 1) {
           broken = true;
           break;