Merge remote-tracking branch 'upstream/master' into feature_xpath

This commit is contained in:
Mike Schwörer 2016-12-05 19:30:46 +01:00
commit da7a832ceb
No known key found for this signature in database
GPG key ID: D3C7172E0A70F8CF
7 changed files with 21 additions and 13 deletions

View file

@ -436,7 +436,8 @@ HTMLApp.prototype.set_recipe_config = function(recipe_config) {
} else if (args[j].classList.contains("toggle-string")) {
// toggle_string
args[j].value = recipe_config[i].args[j].string;
args[j].previousSibling.children[0].innerHTML = recipe_config[i].args[j].option +
args[j].previousSibling.children[0].innerHTML =
Utils.escape_html(recipe_config[i].args[j].option) +
" <span class='caret'></span>";
} else {
// all others