Fix instance removal (#85)

Shopify · Jan 30, 2017 · 17f65e0 · 17f65e0
1 parent 9774435
commit 17f65e0
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/scripts/slate/sections.js b/src/scripts/slate/sections.js
@@ -40,13 +40,17 @@ slate.Sections.prototype = $.extend({}, slate.Sections.prototype, {
   },
 
   _onSectionUnload: function(evt) {
-    this.instances = slate.utils.removeInstance(this.instances, 'id', evt.detail.sectionId);
+    var instance = slate.utils.findInstance(this.instances, 'id', evt.detail.sectionId);
 
-    this.instances.forEach(function(instance) {
-      if (typeof instance.onUnload === 'function') {
-        instance.onUnload(evt);
-      }
-    });
+    if (!instance) {
+      return;
+    }
+
+    if (typeof instance.onUnload === 'function') {
+      instance.onUnload(evt);
+    }
+
+    this.instances = slate.utils.removeInstance(this.instances, 'id', evt.detail.sectionId);
   },
 
   _onSelect: function(evt) {