Fix for line break issue discussed offline. Added <p> tags either sid…

…e of the call to x_addLineBreaks rather than within x_addLineBreaks.
thexerteproject · Jul 13, 2015 · 4a125ee · 4a125ee
1 parent 89f3450
commit 4a125ee
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/accNav.html b/modules/xerte/parent_templates/Nottingham/models_html5/accNav.html
@@ -72,7 +72,7 @@
 				}
 				$thisHeader.find("a").html(this.getAttribute("name"));
 
-				var infoString = x_addLineBreaks('<p>' + this.getAttribute("text") + '</p>'),
+				var infoString = '<p>' + x_addLineBreaks(this.getAttribute("text")) + '</p>',
 					url = this.getAttribute("url");
 
 				if (url != undefined && url != "") {

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/columnPage.html b/modules/xerte/parent_templates/Nottingham/models_html5/columnPage.html
@@ -69,7 +69,7 @@
 					$thisColumn = $column;
 				}
 
-				var infoString = x_addLineBreaks('<p>' + this.getAttribute("text") + '</p>'),
+				var infoString = '<p>' + x_addLineBreaks(this.getAttribute("text")) + '</p>',
 					url = this.getAttribute("url");
 				if (url != undefined && url != "") {
 					var newString = "";

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/modelAnswer.html b/modules/xerte/parent_templates/Nottingham/models_html5/modelAnswer.html
@@ -113,7 +113,7 @@
 			}
 
 
-			var promptString = x_addLineBreaks('<p>' + x_currentPageXML.getAttribute("prompt") + '</p>'),
+			var promptString = '<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("prompt") )+ '</p>',
 				url = x_currentPageXML.getAttribute("image");
 			if (url != undefined && url != "") {
 				if (url.split('.').pop().slice(0, -1) == "swf") {
@@ -146,7 +146,7 @@
 			}
 
 
-			var feedbackString = x_addLineBreaks('<p>' + x_currentPageXML.getAttribute("feedback") + '</p>'),
+			var feedbackString = '<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("feedback"))+ '</p>',
 				copyTxt = x_currentPageXML.getAttribute("copypasteinfo2"),
 				copyTxtFlash = x_currentPageXML.getAttribute("copypasteinfo"),
 				copyBtnLabel = x_currentPageXML.getAttribute("copyBtnLabel");

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/tabNav.html b/modules/xerte/parent_templates/Nottingham/models_html5/tabNav.html
@@ -85,7 +85,7 @@
 					.attr("href", "#tab" + i)
 					.html(this.getAttribute("name"));
 
-				var	infoString = x_addLineBreaks('<p>' + this.getAttribute("text") + '</p>'),
+				var	infoString = '<p>' + x_addLineBreaks(this.getAttribute("text")) + '</p>',
 					url = this.getAttribute("url");
 
 				if (url != undefined && url != "") {

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/tabNavExtra.html b/modules/xerte/parent_templates/Nottingham/models_html5/tabNavExtra.html
@@ -185,7 +185,7 @@
 										$paneList.addClass("delete");
 									}
 
-									var	infoString = x_addLineBreaks('<p>' + this.getAttribute("text") + '</p>'),
+									var	infoString = '<p>' + x_addLineBreaks(this.getAttribute("text"))+ '</p>',
 										url = this.getAttribute("url");
 
 									if (url != undefined && url != "") {