diff --git a/resources/static/common/js/lib/ejs.js b/resources/static/common/js/lib/ejs.js index 31a9df53fb1b958f4059a2d33c1fa300d61e4cab..d2396e0bd9beb2a29ff3a773f1c8ebd2ffb2b6f1 100644 --- a/resources/static/common/js/lib/ejs.js +++ b/resources/static/common/js/lib/ejs.js @@ -152,9 +152,16 @@ EJS.Scanner = function(source, left, right) { double_left: left+'%%', double_right: '%%'+right, left_equal: left+'%=', + // set - Persona addition. The backend understands <%-, which acts + // identical to the frontend's <%=. <%= on the backend escapes + // characters to their HTML code equivalents. For unit testing, we + // write backend templates on the front end, so we have to be able to + // process <%-. Creating an alias here. Using it wherever + // left_equal is found. + left_dash: left+'%-', left_comment: left+'%#'}) - this.SplitRegexp = left=='[' ? /(\[%%)|(%%\])|(\[%=)|(\[%#)|(\[%)|(%\]\n)|(%\])|(\n)/ : new RegExp('('+this.double_left+')|(%%'+this.double_right+')|('+this.left_equal+')|('+this.left_comment+')|('+this.left_delimiter+')|('+this.right_delimiter+'\n)|('+this.right_delimiter+')|(\n)') ; + this.SplitRegexp = left=='[' ? /(\[%%)|(%%\])|(\[%=)|(\[%#)|(\[%)|(%\]\n)|(%\])|(\n)/ : new RegExp('('+this.double_left+')|(%%'+this.double_right+')|('+this.left_equal+')|('+this.left_dash+')|('+this.left_comment+')|('+this.left_delimiter+')|('+this.right_delimiter+'\n)|('+this.right_delimiter+')|(\n)') ; this.source = source; this.stag = null; @@ -297,6 +304,7 @@ EJS.Compiler.prototype = { break; case scanner.left_delimiter: case scanner.left_equal: + case scanner.left_dash: case scanner.left_comment: scanner.stag = token; if (content.length > 0) @@ -328,6 +336,7 @@ EJS.Compiler.prototype = { buff.push(content); } break; + case scanner.left_dash: case scanner.left_equal: buff.push(insert_cmd + "(EJS.Scanner.to_text(" + content + ")))"); break; diff --git a/resources/static/test/cases/pages/js/verify_secondary_address.js b/resources/static/test/cases/pages/js/verify_secondary_address.js index 8afe1e7f1030a16f0a3db3e181b2e3713e32038e..c9227af84e2ef6c0c9315349c4178142ebc26aee 100644 --- a/resources/static/test/cases/pages/js/verify_secondary_address.js +++ b/resources/static/test/cases/pages/js/verify_secondary_address.js @@ -84,7 +84,7 @@ createController(config, function() { testVisible("#congrats"); testHasClass("body", "complete"); - equal($(".website").text(), returnTo, "website is updated"); + equal($(".website").eq(0).text(), returnTo, "website is updated"); equal(doc.location.href, returnTo, "redirection occurred to correct URL"); equal(storage.getLoggedIn("https://test.domain"), "testuser@testuser.com", "logged in status set"); start();