RA-952: Unable to End Visit, Uncaught ReferenceError: Invalid left-ha…

…nd side in assignment
openmrs · Jan 19, 2016 · 417fa4b · 417fa4b
1 parent 23ebd15
commit 417fa4b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/omod/src/main/webapp/resources/scripts/emr.js b/omod/src/main/webapp/resources/scripts/emr.js
@@ -349,10 +349,17 @@ var emr = (function($) {
 
         applyContextModel: function(input, contextModel) {
             if (contextModel) {
+
                 $.each(contextModel, function(key, value) {
                     var pattern = new RegExp('{{\\s*' + key + '\\s*}}', 'g');
                     input = input.replace(pattern, value);
                 });
+
+                // handle substitions for patterns that have already been escaped
+                $.each(contextModel, function(key, value) {
+                    var pattern = new RegExp('%7B%7Bs*' + key + 's*%7D%7D', 'g');
+                    input = input.replace(pattern, value);
+                });
             }
             return input;
         },