Merge branch 'deploy_server'

3 files changed, 1 insertions, 15 deletions

diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js
index d990291..ba17492 100644
--- a/testapp/static/exam/js/add_question.js
+++ b/testapp/static/exam/js/add_question.js
@@ -77,10 +77,6 @@ function textareaformat()
 	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"))
@@ -135,14 +131,11 @@ function textareaformat()
       $('#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;
 		if(value == 'mcq')
diff --git a/testapp/static/exam/js/add_quiz.js b/testapp/static/exam/js/add_quiz.js
index 56b0e95..d5688a8 100644
--- a/testapp/static/exam/js/add_quiz.js
+++ b/testapp/static/exam/js/add_quiz.js
@@ -2,7 +2,6 @@ function test()
 {
     if (document.getElementById("id_description").value != "")
     {
-        alert("reached condition");
         document.getElementById("submit").innerHTML = "Save";
     }
 }
diff --git a/testapp/static/exam/js/edit_question.js b/testapp/static/exam/js/edit_question.js
index 8866b9a..28d95f9 100644
--- a/testapp/static/exam/js/edit_question.js
+++ b/testapp/static/exam/js/edit_question.js
@@ -152,11 +152,6 @@ function textareaformat()
 		var snippet_id = document.getElementById('id_snippet'+i);
 		$(snippet_id).bind('focus',function(event){
 			this.rows = 5;
-			$(snippet_id).val("");
-		});
-		$(snippet_id).bind('blur',function(event){
-			this.rows = 1;
-			$(snippet_id).val("#To avoid indentation errors use tab for indentation for Python questions");
 		});
 		$(snippet_id).bind('keydown', function (event){
 			catchTab(snippet_id,event);
@@ -174,7 +169,6 @@ function textareaformat()
 		jQuery().ready(function() 
         { 
             jQuery("#id_tags" + i).autocomplete("/taggit_autocomplete_modified/json", { multiple: true });
-            $(snippet_id).val("#To avoid indentation errors use tab for indentation for Python questions");
         });
 	}
 }