fix

emberjs · Sep 25, 2019 · 985add0 · 985add0
1 parent 16f6880
commit 985add0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/components/object-inspector/property.js b/app/components/object-inspector/property.js
@@ -45,6 +45,7 @@ export default Component.extend({
   showDependentKeys: and('isDepsExpanded', 'hasDependentKeys'),
 
   canCalculate: computed('model', 'isCalculated', 'isComputedProperty', function () {
+    if (this.get('isOverridden')) return false;
     if (this.get('model.isGetter') && this.get('model.isExpensive')) {
       return true;
     }

diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -497,7 +497,8 @@ export default EmberObject.extend(PortMixin, {
       objectMixins[0].properties = objectMixins[0].properties.concat(...objectMixins[1].properties).uniqBy('name');
       objectMixins.splice(1, 1);
     }
-    const index = objectMixins.findIndex(o => o.isEmberExtended);
+    let index = objectMixins.findIndex(o => o.isEmberExtended);
+    if (index < 0) index = objectMixins.length;
     mixinDetails.push(...objectMixins.slice(0, index));
 
     const objectName = mixinDetails[0].name;
@@ -521,7 +522,7 @@ export default EmberObject.extend(PortMixin, {
 
       mixinDetails.push({ name: name.toString(), properties: propertiesForMixin(mixin), expand: mixin.expand });
     });
-    mixinDetails.push(...objectMixins.slice(index+1));
+    mixinDetails.push(...objectMixins.slice(index+1, -1));
 
     fixMandatorySetters(mixinDetails);
     applyMixinOverrides(mixinDetails);