Cool_Tools/CyberChef
1
0
Fork 0
mirror of synced 2024-12-01 09:47:20 +01:00
Code Releases Activity

The 'option' and 'editableOption' arguments can now specify a 'defaultIndex' to populate, instead of using the first in the provided list.

Browse Source
This commit is contained in:
n1474335 2018-12-25 19:02:05 +00:00
parent 8c3569ea63
commit bf24547202
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Ingredient.mjs
View File

@ -25,6 +25,7 @@ class Ingredient {
this.hint = ""; this.hint = "";
this.toggleValues = []; this.toggleValues = [];
this.target = null; this.target = null;
this.defaultIndex = 0;
if (ingredientConfig) { if (ingredientConfig) {
this._parseConfig(ingredientConfig); this._parseConfig(ingredientConfig);
@ -46,6 +47,7 @@ class Ingredient {
this.hint = ingredientConfig.hint || false; this.hint = ingredientConfig.hint || false;
this.toggleValues = ingredientConfig.toggleValues; this.toggleValues = ingredientConfig.toggleValues;
this.target = typeof ingredientConfig.target !== "undefined" ? ingredientConfig.target : null; this.target = typeof ingredientConfig.target !== "undefined" ? ingredientConfig.target : null;
this.defaultIndex = typeof ingredientConfig.defaultIndex !== "undefined" ? ingredientConfig.defaultIndex : 0;
} }

1
src/core/Operation.mjs
View File

@ -181,6 +181,7 @@ class Operation {
if (ing.hint) conf.hint = ing.hint; if (ing.hint) conf.hint = ing.hint;
if (ing.disabled) conf.disabled = ing.disabled; if (ing.disabled) conf.disabled = ing.disabled;
if (ing.target) conf.target = ing.target; if (ing.target) conf.target = ing.target;
if (ing.defaultIndex) conf.defaultIndex = ing.defaultIndex;
return conf; return conf;
}); });
} }

7
src/web/HTMLIngredient.mjs
View File

@ -26,6 +26,7 @@ class HTMLIngredient {
this.disabled = config.disabled || false; this.disabled = config.disabled || false;
this.hint = config.hint || false; this.hint = config.hint || false;
this.target = config.target; this.target = config.target;
this.defaultIndex = config.defaultIndex || 0;
this.toggleValues = config.toggleValues; this.toggleValues = config.toggleValues;
this.id = "ing-" + this.app.nextIngId(); this.id = "ing-" + this.app.nextIngId();
} }
@ -133,7 +134,7 @@ class HTMLIngredient {
} else if ((m = this.value[i].match(/\[\/([a-z0-9 -()^]+)\]/i))) { } else if ((m = this.value[i].match(/\[\/([a-z0-9 -()^]+)\]/i))) {
html += "</optgroup>"; html += "</optgroup>";
} else { } else {
html += `<option>${this.value[i]}</option>`; html += `<option ${this.defaultIndex === i ? "selected" : ""}>${this.value[i]}</option>`;
} }
} }
html += `</select> html += `</select>
@ -154,7 +155,7 @@ class HTMLIngredient {
} else if ((m = this.value[i].name.match(/\[\/([a-z0-9 -()^]+)\]/i))) { } else if ((m = this.value[i].name.match(/\[\/([a-z0-9 -()^]+)\]/i))) {
html += "</optgroup>"; html += "</optgroup>";
} else { } else {
html += `<option populate-value='${this.value[i].value}'>${this.value[i].name}</option>`; html += `<option populate-value="${this.value[i].value}">${this.value[i].name}</option>`;
} }
} }
html += `</select> html += `</select>
@ -170,7 +171,7 @@ class HTMLIngredient {
class="form-control arg inline" class="form-control arg inline"
id="${this.id}" id="${this.id}"
arg-name="${this.name}" arg-name="${this.name}"
value="${this.value[0].value}" value="${this.value[this.defaultIndex].value}"
${this.disabled ? "disabled" : ""}> ${this.disabled ? "disabled" : ""}>
${this.hint ? "<span class='bmd-help'>" + this.hint + "</span>" : ""} ${this.hint ? "<span class='bmd-help'>" + this.hint + "</span>" : ""}
<div class="input-group-append inline"> <div class="input-group-append inline">