Merge branch 'master' into feature-async-ops

src/js/.eslintrc.json

@@ -109,6 +109,10 @@
         "OutputWaiter": false,
         "RecipeWaiter": false,
         "SeasonalWaiter": false,
-        "WindowWaiter": false
+        "WindowWaiter": false,
+
+        /* tests */
+        "TestRegister": false,
+        "TestRunner": false
     }
-}
+}

src/js/core/Dish.js

@@ -139,7 +139,7 @@ Dish.prototype.translate = function(toType) {
             this.type = Dish.BYTE_ARRAY;
             break;
         case Dish.HTML:
-            this.value = this.value ? Utils.strToByteArray(Utils.stripHtmlTags(this.value, true)) : [];
+            this.value = this.value ? Utils.strToByteArray(Utils.unescapeHtml(Utils.stripHtmlTags(this.value, true))) : [];
             this.type = Dish.BYTE_ARRAY;
             break;
         default:

src/js/core/FlowControl.js

@@ -152,7 +152,6 @@ var FlowControl = {
             maxJumps = ings[1];
 
         if (state.numJumps >= maxJumps) {
-            state.progress++;
             return state;
         }
 
@@ -180,7 +179,6 @@ var FlowControl = {
             maxJumps = ings[2];
 
         if (state.numJumps >= maxJumps) {
-            state.progress++;
             return state;
         }
 

src/js/core/Utils.js

@@ -928,6 +928,33 @@ var Utils = {
     },
 
 
+    /**
+     * Unescapes HTML tags in a string to make them render again.
+     *
+     * @param {string} str
+     * @returns string
+     *
+     * @example
+     * // return "A <script> tag"
+     * Utils.unescapeHtml("A &lt;script&gt; tag");
+     */
+    unescapeHtml: function(str) {
+        var HTML_CHARS = {
+            "&amp;":  "&",
+            "&lt;":   "<",
+            "&gt;":   ">",
+            "&quot;": '"',
+            "&#x27;": "'",
+            "&#x2F;": "/",
+            "&#x60;": "`"
+        };
+
+        return str.replace(/&#?x?[a-z0-9]{2,4};/ig, function (match) {
+            return HTML_CHARS[match] || match;
+        });
+    },
+
+
     /**
      * Expresses a number of milliseconds in a human readable format.
      *