resolved conflicts

1 files changed, 84 insertions, 5 deletions

diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js
index 24af127..d990291 100644
--- a/testapp/static/exam/js/add_question.js
+++ b/testapp/static/exam/js/add_question.js
@@ -22,14 +22,83 @@ function decrease(frm)
 	
 }
 
-function textareaformat()
+function setSelectionRange(input, selectionStart, selectionEnd) 
 {
+    if (input.setSelectionRange) 
+    {
+		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();
+    }
+}
 
+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);
+		}
+    }
+    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();
+			}
+		}
+    }
+}
+
+function textareaformat()
+{
 	document.getElementById('id_type').setAttribute('class','select-type');
-	
 	document.getElementById('id_points').setAttribute('class','mini-text');
     document.getElementById('id_tags').setAttribute('class','tag-text');
-
+    
+    jQuery().ready(function() 
+        { 
+            $("#id_snippet").val("#To avoid indentation errors use tabs for indentation for Python questions");
+        });
+	
+	$('#id_snippet').bind('keydown', function( event ){
+         if(navigator.userAgent.match("Gecko"))
+		{
+			c=event.which;
+		}
+		else
+		{
+			c=event.keyCode;
+		}
+		if(c==9)
+		{
+			replaceSelection(document.getElementById('id_snippet'),String.fromCharCode(9));
+			setTimeout(document.getElementById('id_snippet'),0);	
+			return false;
+		}
+      });
+      	
 	$('#id_description').bind('focus', function( event ){
          document.getElementById("id_description").rows=5;
          document.getElementById("id_description").cols=40;
@@ -53,15 +122,26 @@ function textareaformat()
          document.getElementById("id_test").rows=1;
          document.getElementById("id_test").cols=40;
       });
+      
 	$('#id_options').bind('focus', function( event ){
          document.getElementById("id_options").rows=5;
          document.getElementById("id_options").cols=40;
       });
-
 	$('#id_options').bind('blur', function( event ){
          document.getElementById("id_options").rows=1;
          document.getElementById("id_options").cols=40;
       });
+      
+      $('#id_snippet').bind('focus', function( event ){
+         document.getElementById("id_snippet").rows=5;
+         document.getElementById("id_snippet").cols=40;
+         $('#id_snippet').val("");
+      });
+	$('#id_snippet').bind('blur', function( event ){
+         document.getElementById("id_snippet").rows=1;
+         document.getElementById("id_snippet").cols=40;
+         $('#id_snippet').val("#To avoid indentation errors use tabs for indentation for Python questions");
+      });
 	
 	$('#id_type').bind('change',function(event){
 		var value = document.getElementById('id_type').value;
@@ -77,7 +157,6 @@ function textareaformat()
 			document.getElementById('label_option').innerHTML = "";
 		}
 	});
-
 		document.getElementById('my').innerHTML = document.getElementById('id_description').value ;
 		var value = document.getElementById('id_type').value;
 		if(value == 'mcq')