Merge pull request #6503 from livecodeian/bugfix-21155

livecodepanos · web-flow · commit fe3b22c9114d · 2018-05-01T16:46:18.000+03:00
[[ Bug 21155 ]] Fix JS error when closing stack window
diff --git a/docs/notes/bugfix-21155.md b/docs/notes/bugfix-21155.md
@@ -0,0 +1 @@
+# Fix JavaScript error when closing stack window in HTML5 standalone
diff --git a/engine/src/em-dc.js b/engine/src/em-dc.js
@@ -135,14 +135,12 @@ mergeInto(LibraryManager.library, {
 		},
 		
 		destroyWindow: function(pID) {
-			LiveCodeDC.setWindowVisible(pID, false);
-			LiveCodeDC.raiseWindow(pID);
 			var window = LiveCodeUtil.fetchObject(pID);
 			if (window)
 			{
-				window.element.removeChild(window.container.element);
 				LiveCodeDC._removeResizeMonitor(window.canvas);
-		  
+				LiveCodeDC.setWindowVisible(pID, false);
+				
 				if (window.mainWindow)
 				{
 					// TODO - handle cleanup of embedded canvas
@@ -332,9 +330,13 @@ mergeInto(LibraryManager.library, {
 		
 		_removeResizeMonitor: function(element) {
 			if (LiveCodeDC._monitorResize.watched) {
-				var index = LiveCodeDC._monitorResize.watched.indexOf(element);
-				if (index !== -1) {
-					LiveCodeDC._monitorResize.watched.splice(index, 1);
+				var index = 0;
+				while (index < LiveCodeDC._monitorResize.watched.length)
+				{
+					if (LiveCodeDC._monitorResize.watched[index].element === element)
+						LiveCodeDC._monitorResize.watched.splice(index, 1);
+					else
+						index++;
 				}
 			}
 		},

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix JavaScript error when closing stack window in HTML5 standalone`