From b7fb17f33dbb0e7d601b79860489019baa0bbd33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Tue, 5 Apr 2016 00:45:42 +0200
Subject: [PATCH] Version 15.178.2

---
 css/{swad15.178.1.css => swad15.178.2.css} |   0
 js/{swad15.131.3.js => swad15.178.2.js}    | 106 +++++++++++++--------
 swad_changelog.h                           |   5 +-
 3 files changed, 69 insertions(+), 42 deletions(-)
 rename css/{swad15.178.1.css => swad15.178.2.css} (100%)
 rename js/{swad15.131.3.js => swad15.178.2.js} (94%)

diff --git a/css/swad15.178.1.css b/css/swad15.178.2.css
similarity index 100%
rename from css/swad15.178.1.css
rename to css/swad15.178.2.css
diff --git a/js/swad15.131.3.js b/js/swad15.178.2.js
similarity index 94%
rename from js/swad15.131.3.js
rename to js/swad15.178.2.js
index 427d4c721..2166cd068 100644
--- a/js/swad15.131.3.js
+++ b/js/swad15.178.2.js
@@ -762,89 +762,115 @@ function enableDisableAns (Formul) {
 		for (var i=0; i<Formul.elements.length; i++)
 			if (Formul.elements[i].name == 'AnsInt')
 				Formul.elements[i].disabled = false;
-			else if (Formul.elements[i].name == 'AnsMulti'		||
+			else if (Formul.elements[i].name == 'AnsMulti'	||
 				Formul.elements[i].name == 'AnsFloatMin'	||
 				Formul.elements[i].name == 'AnsFloatMax'	||
 				Formul.elements[i].name == 'AnsTF'			||
-				Formul.elements[i].name == 'AnsUni'		||
+				Formul.elements[i].name == 'AnsUni'			||
 				Formul.elements[i].name == 'Shuffle')
 				Formul.elements[i].disabled = true;
-			else enableDisableContAns(Formul.elements[i],true);
+			else {
+				enableDisableStrAns(Formul.elements[i],true);
+				enableDisableImgAns(Formul.elements[i],true);
+			}
 	}
 	else if (Formul.AnswerType[Tst_ANS_FLOAT].checked){
 		for (var i=0; i<Formul.elements.length; i++)
-			if (Formul.elements[i].name == 'AnsFloatMin' ||
+			if (Formul.elements[i].name == 'AnsFloatMin'	||
 				Formul.elements[i].name == 'AnsFloatMax')
 				Formul.elements[i].disabled = false;
-			else if (Formul.elements[i].name == 'AnsInt'   ||
-				Formul.elements[i].name == 'AnsTF'    ||
-				Formul.elements[i].name == 'AnsUni'   ||
-				Formul.elements[i].name == 'AnsMulti' ||
+			else if (Formul.elements[i].name == 'AnsInt'	||
+				Formul.elements[i].name == 'AnsTF'			||
+				Formul.elements[i].name == 'AnsUni'			||
+				Formul.elements[i].name == 'AnsMulti'		||
 				Formul.elements[i].name == 'Shuffle')
 				Formul.elements[i].disabled = true;
-			else enableDisableContAns(Formul.elements[i],true);
+			else {
+				enableDisableStrAns(Formul.elements[i],true);
+				enableDisableImgAns(Formul.elements[i],true);
+			}
 	}
 	else if (Formul.AnswerType[Tst_ANS_TRUE_FALSE].checked){
 		for (var i=0; i<Formul.elements.length; i++)
 			if (Formul.elements[i].name == 'AnsTF')
 				Formul.elements[i].disabled = false;
-			else if (Formul.elements[i].name == 'AnsInt' ||
-				Formul.elements[i].name == 'AnsFloatMin' ||
-				Formul.elements[i].name == 'AnsFloatMax' ||
-				Formul.elements[i].name == 'AnsUni' ||
-				Formul.elements[i].name == 'AnsMulti' ||
+			else if (Formul.elements[i].name == 'AnsInt'	||
+				Formul.elements[i].name == 'AnsFloatMin'	||
+				Formul.elements[i].name == 'AnsFloatMax'	||
+				Formul.elements[i].name == 'AnsUni'			||
+				Formul.elements[i].name == 'AnsMulti'		||
 				Formul.elements[i].name == 'Shuffle')
 				Formul.elements[i].disabled = true;
-			else enableDisableContAns(Formul.elements[i],true);
+			else {
+				enableDisableStrAns(Formul.elements[i],true);
+				enableDisableImgAns(Formul.elements[i],true);
+			}
 	}
 	else if (Formul.AnswerType[Tst_ANS_UNIQUE_CHOICE].checked){
 		for (var i=0; i<Formul.elements.length; i++)
-			if (Formul.elements[i].name == 'AnsUni' ||
+			if (Formul.elements[i].name == 'AnsUni'	||
 				Formul.elements[i].name == 'Shuffle')
 				Formul.elements[i].disabled = false;
-			else if (Formul.elements[i].name == 'AnsInt' ||
-					 Formul.elements[i].name == 'AnsFloatMin' ||
-					 Formul.elements[i].name == 'AnsFloatMax' ||
-					 Formul.elements[i].name == 'AnsTF' ||
+			else if (Formul.elements[i].name == 'AnsInt'		||
+					 Formul.elements[i].name == 'AnsFloatMin'	||
+					 Formul.elements[i].name == 'AnsFloatMax'	||
+					 Formul.elements[i].name == 'AnsTF'			||
 					 Formul.elements[i].name == 'AnsMulti')
 				Formul.elements[i].disabled = true;
-			else enableDisableContAns(Formul.elements[i],false);
+			else {
+				enableDisableStrAns(Formul.elements[i],false);
+				enableDisableImgAns(Formul.elements[i],false);
+			}
 	}
 	else if (Formul.AnswerType[Tst_ANS_MULTIPLE_CHOICE].checked){
 		for (var i=0; i<Formul.elements.length; i++)
-			if (Formul.elements[i].name == 'AnsMulti' ||
+			if (Formul.elements[i].name == 'AnsMulti'	||
 				Formul.elements[i].name == 'Shuffle')
 				Formul.elements[i].disabled = false;
-			else if (Formul.elements[i].name == 'AnsInt' ||
-					 Formul.elements[i].name == 'AnsFloatMin' ||
-					 Formul.elements[i].name == 'AnsFloatMax' ||
-					 Formul.elements[i].name == 'AnsTF' ||
+			else if (Formul.elements[i].name == 'AnsInt'		||
+					 Formul.elements[i].name == 'AnsFloatMin'	||
+					 Formul.elements[i].name == 'AnsFloatMax'	||
+					 Formul.elements[i].name == 'AnsTF'			||
 					 Formul.elements[i].name == 'AnsUni')
 				Formul.elements[i].disabled = true;
-			else
-				enableDisableContAns(Formul.elements[i],false);
+			else {
+				enableDisableStrAns(Formul.elements[i],false);
+				enableDisableImgAns(Formul.elements[i],false);
+			}
 	}
 	else if (Formul.AnswerType[Tst_ANS_TEXT].checked){
 		for (var i=0; i<Formul.elements.length; i++)
-			if (Formul.elements[i].name == 'AnsInt' ||
-				Formul.elements[i].name == 'AnsFloatMin' ||
-				Formul.elements[i].name == 'AnsFloatMax' ||
-				Formul.elements[i].name == 'AnsTF' ||
-				Formul.elements[i].name == 'AnsUni' ||
+			if (Formul.elements[i].name == 'AnsInt'			||
+				Formul.elements[i].name == 'AnsFloatMin'	||
+				Formul.elements[i].name == 'AnsFloatMax'	||
+				Formul.elements[i].name == 'AnsTF'			||
+				Formul.elements[i].name == 'AnsUni'			||
 				Formul.elements[i].name == 'AnsMulti')
 				Formul.elements[i].disabled = true;
-			else
-				enableDisableContAns(Formul.elements[i],false);
+			else {
+				enableDisableStrAns(Formul.elements[i],false);
+				enableDisableImgAns(Formul.elements[i],true);
+			}
 	}
 }
 
-// Activate or deactivate response contents of a test question
-function enableDisableContAns (elem, isDisabled) {
+// Activate or deactivate answer strings and feedback of a test question
+function enableDisableStrAns (elem, isDisabled) {
 	var Tst_MAX_OPTIONS_PER_QUESTION = 10;
 
-	for ( var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
-		if (elem.name == ('AnsStr' + i) ||
-			elem.name == ('FbStr'  + i))
+	for (var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
+		if (elem.name == ('AnsStr'  + i) ||
+			elem.name == ('FbStr'   + i))
+			elem.disabled = isDisabled;
+}
+
+//Activate or deactivate answer images of a test question
+function enableDisableImgAns (elem, isDisabled) {
+	var Tst_MAX_OPTIONS_PER_QUESTION = 10;
+
+	for (var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
+		if (elem.name == ('ImgAct'  + i) ||
+			elem.name == ('FileImg' + i))
 			elem.disabled = isDisabled;
 }
 
diff --git a/swad_changelog.h b/swad_changelog.h
index 1cec16a78..4ea2de779 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -134,13 +134,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.178.1 (2016-04-04)"
+#define Log_PLATFORM_VERSION	"SWAD 15.178.2 (2016-04-05)"
 #define CSS_FILE		"swad15.178.1.css"
-#define JS_FILE			"swad15.131.3.js"
+#define JS_FILE			"swad15.178.2.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
 /*
+        Version 15.178.2: Apr 04, 2016	Changes in JavaScript related to images in test questions. (198265 lines)
         Version 15.178.1: Apr 04, 2016	Changes in CSS related to images in test questions. (198240 lines)
         Version 15.178:   Apr 04, 2016	Code refactoring related to images in test questions. (198244 lines)
 					5 changes necessary in database: