From 3202cfe0dde28284e57c182ac219285b3b90212a Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Thu, 9 Feb 2012 07:50:28 +0000
Subject: [PATCH] Alterations to active line

Now works with dynamic CM created instances
New loadingFile var to indicate the start & end of file load sequence
---
 lib/file-control.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/file-control.php b/lib/file-control.php
index 3588e59..d410aae 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -115,11 +115,14 @@ if ($_GET['action']=="save") {
 <script>
 if (action=="load") {
 	if (fileType=="text") {
+		top.ICEcoder.loadingFile = true;
 		// Reset the various states back to their initial setting
 		selectedTab = top.ICEcoder.openFiles.length;	// The tab that's currently selected
 
 		// Finally, store all data, show tabs etc
 		top.ICEcoder.createNewTab();
+		top.ICEcoder.cMInstances.push(top.ICEcoder.nextcMInstance);
+		top.ICEcoder.content.contentWindow.createNewCMInstance(top.ICEcoder.nextcMInstance);
 
 		// Set the value & innerHTML of the code textarea to that of our loaded file plus make it visible (it's hidden on _coder's load)
 		top.ICEcoder.switchMode();
@@ -131,8 +134,10 @@ if (action=="load") {
 
 		// Then clean it up, set the text cursor, update the display and get the character data
 		top.ICEcoder.contentCleanUp();
-		top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.selectedTab].setLineClass(top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab], null);
-		top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.selectedTab].setLineClass(0, "cm-s-activeLine");
+		top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab], null);
+		top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(0, "cm-s-activeLine");
+		top.ICEcoder.nextcMInstance++;
+		top.ICEcoder.loadingFile = false;
 	}
 
 	if (fileType=="image") {