1 files changed, 55 insertions, 44 deletions

diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js
index ba3f6d2..cb6807e 100644
--- a/testapp/static/exam/js/question.js
+++ b/testapp/static/exam/js/question.js
@@ -13,16 +13,16 @@ function setSelectionRange(input, selectionStart, selectionEnd)
 {
     if (input.setSelectionRange) 
     {
-	input.focus();
-	input.setSelectionRange(selectionStart, selectionEnd);
+		input.focus();
+		input.setSelectionRange(selectionStart, selectionEnd);
     }
     else if (input.createTextRange) 
     {
-	var range = input.createTextRange();
-	range.collapse(true);
-	range.moveEnd('character', selectionEnd);
-	range.moveStart('character', selectionStart);
-	range.select();
+		var range = input.createTextRange();
+		range.collapse(true);
+		range.moveEnd('character', selectionEnd);
+		range.moveStart('character', selectionStart);
+		range.select();
     }
 }
 
@@ -30,59 +30,59 @@ function replaceSelection (input, replaceString)
 {
     if (input.setSelectionRange) 
     {
-	var selectionStart = input.selectionStart;
-	var selectionEnd = input.selectionEnd;
-	input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
-	if (selectionStart != selectionEnd)
-	{ 
-	    setSelectionRange(input, selectionStart, selectionStart + 	replaceString.length);
-	}
-	else
-	{
-	    setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
-	}
+		var selectionStart = input.selectionStart;
+		var selectionEnd = input.selectionEnd;
+		input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
+		if (selectionStart != selectionEnd)
+		{ 
+			setSelectionRange(input, selectionStart, selectionStart + 	replaceString.length);
+		}
+		else
+		{
+			setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
+		}
     }
     else if (document.selection) 
     {
-	var range = document.selection.createRange();
-	if (range.parentElement() == input) 
-	{
-	    var isCollapsed = range.text == '';
-	    range.text = replaceString;
-	    if (!isCollapsed)  
-	    {
-		range.moveStart('character', -replaceString.length);
-		range.select();
-	    }
-	}
+		var range = document.selection.createRange();
+		if (range.parentElement() == input) 
+		{
+			var isCollapsed = range.text == '';
+			range.text = replaceString;
+			if (!isCollapsed)  
+			{
+				range.moveStart('character', -replaceString.length);
+				range.select();
+			}
+		}
     }
 }
 
-// We are going to catch the TAB key so that we can use it, Hooray!
 function catchTab(item,e)
 {
     if(navigator.userAgent.match("Gecko"))
     {
-	c=e.which;
+		c=e.which;
     }
     else
     {
-	c=e.keyCode;
+		c=e.keyCode;
     }
     if(c==9)
     {
-	replaceSelection(item,String.fromCharCode(9));
-	setTimeout("document.getElementById('"+item.id+"').focus();",0);	
-	return false;
+		replaceSelection(item,String.fromCharCode(9));
+		setTimeout("document.getElementById('"+item.id+"').focus();",0);	
+		return false;
     }
 }
 
 var lineObjOffsetTop = 2;
-       
-function createTextAreaWithLines(id)
+
+function addLineNumbers(id)
 {
     var el = document.createElement('DIV');
     var ta = document.getElementById(id);
+    var content = document.getElementById('snippet').value;
     ta.parentNode.insertBefore(el,ta);
     el.appendChild(ta);
     el.className='textAreaWithLines';
@@ -102,18 +102,29 @@ function createTextAreaWithLines(id)
     lineObj.style.textAlign = 'right';
     lineObj.className='lineObj';
     var string = '';
-    for(var no=1;no<200;no++)
+    split_content = content.split('\n');
+    if(id == "answer")
     {
-	if(string.length>0)string = string + '<br>';
-	string = string + no;
-    }
-    //ta.onkeydown = function() { positionLineObj(lineObj,ta); };
-    ta.onmousedown = function() { positionLineObj(lineObj,ta); };
+		for(var no=split_content.length+1;no<1000;no++)
+		{
+			if(string.length>0)string = string + '<br>';
+			string = string + no;
+		}
+	}
+	else
+	{
+		for(var no=1;no<=split_content.length;no++)
+		{
+			if(string.length>0)string = string + '<br>';
+			string = string + no;
+		}
+	}
+	ta.onmousedown = function() { positionLineObj(lineObj,ta); };
     ta.onscroll = function() { positionLineObj(lineObj,ta); };
     ta.onblur = function() { positionLineObj(lineObj,ta); };
     ta.onfocus = function() { positionLineObj(lineObj,ta); };
     ta.onmouseover = function() { positionLineObj(lineObj,ta); };
-    lineObj.innerHTML = string;    
+    lineObj.innerHTML = string;
 }
        
 function positionLineObj(obj,ta)