Variable names changed from underscore to CamelCase. Eslint rules updated. #64

Gruntfile.js

@@ -7,12 +7,12 @@ module.exports = function(grunt) {
     // Tasks
     grunt.registerTask("dev",
         "A persistent task which creates a development build whenever source files are modified.",
-        ["clean:dev", "concat:css", "concat:js", "copy:html_dev", "copy:static_dev", "chmod:build", "watch"]);
+        ["clean:dev", "concat:css", "concat:js", "copy:htmlDev", "copy:staticDev", "chmod:build", "watch"]);
 
     grunt.registerTask("prod",
         "Creates a production-ready build. Use the --msg flag to add a compile message.",
-        ["eslint", "exec:stats", "clean", "jsdoc", "concat", "copy:html_dev", "copy:html_prod", "copy:html_inline",
-         "copy:static_dev", "copy:static_prod", "cssmin", "uglify:prod", "inline", "htmlmin", "chmod"]);
+        ["eslint", "exec:stats", "clean", "jsdoc", "concat", "copy:htmlDev", "copy:htmlProd", "copy:htmlInline",
+         "copy:staticDev", "copy:staticProd", "cssmin", "uglify:prod", "inline", "htmlmin", "chmod"]);
 
     grunt.registerTask("docs",
         "Compiles documentation in the /docs directory.",
@@ -20,15 +20,15 @@ module.exports = function(grunt) {
 
     grunt.registerTask("stats",
         "Provides statistics about the code base such as how many lines there are as well as details of file sizes before and after compression.",
-        ["concat:js", "uglify:prod", "exec:stats", "exec:repo_size", "exec:display_stats"]);
+        ["concat:js", "uglify:prod", "exec:stats", "exec:repoSize", "exec:displayStats"]);
 
     grunt.registerTask("release",
         "Prepares and deploys a production version of CyberChef to the gh-pages branch.",
-        ["copy:gh_pages", "exec:deploy_gh_pages"]);
+        ["copy:ghPages", "exec:deployGhPages"]);
 
     grunt.registerTask("default",
         "Lints the code base and shows stats",
-        ["eslint", "exec:stats", "exec:display_stats"]);
+        ["eslint", "exec:stats", "exec:displayStats"]);
 
     grunt.registerTask("doc", "docs");
     grunt.registerTask("lint", "eslint");
@@ -50,7 +50,7 @@ module.exports = function(grunt) {
 
 
     // JS includes
-    var js_files = [
+    var jsFiles = [
         // Third party framework libraries
         "src/js/lib/jquery-2.1.1.js",
         "src/js/lib/bootstrap-3.3.6.js",
@@ -179,10 +179,10 @@ module.exports = function(grunt) {
  * limitations under the License.\n\
  */\n';
 
-    var template_options = {
+    var templateOptions = {
         data: {
-            compile_msg: grunt.option("compile-msg") || grunt.option("msg") || "",
-            codebase_stats: grunt.file.read("src/static/stats.txt").split("\n").join("<br>")
+            compileMsg: grunt.option("compile-msg") || grunt.option("msg") || "",
+            codebaseStats: grunt.file.read("src/static/stats.txt").split("\n").join("<br>")
         }
     };
 
@@ -220,7 +220,7 @@ module.exports = function(grunt) {
         },
         concat: {
             options: {
-                process: template_options
+                process: templateOptions
             },
             css: {
                 options: {
@@ -242,43 +242,43 @@ module.exports = function(grunt) {
                 options: {
                     banner: '"use strict";\n'
                 },
-                src: js_files,
+                src: jsFiles,
                 dest: "build/dev/scripts.js"
             }
         },
         copy: {
-            html_dev: {
+            htmlDev: {
                 options: {
                     process: function(content, srcpath) {
-                        return grunt.template.process(content, template_options);
+                        return grunt.template.process(content, templateOptions);
                     }
                 },
                 src: "src/html/index.html",
                 dest: "build/dev/index.html"
             },
-            html_prod: {
+            htmlProd: {
                 options: {
                     process: function(content, srcpath) {
-                        return grunt.template.process(content, template_options);
+                        return grunt.template.process(content, templateOptions);
                     }
                 },
                 src: "src/html/index.html",
                 dest: "build/prod/index.html"
             },
-            html_inline: {
+            htmlInline: {
                 options: {
                     process: function(content, srcpath) {
                         // TODO: Do all this in Jade
                         content = content.replace(
                             '<a href="cyberchef.htm" style="float: left; margin-left: 10px; margin-right: 80px;" download>Download CyberChef<img src="images/download-24x24.png" /></a>',
                             '<span style="float: left; margin-left: 10px;">Compile time: ' + grunt.template.today("dd/mm/yyyy HH:MM:ss") + " UTC</span>");
-                        return grunt.template.process(content, template_options);
+                        return grunt.template.process(content, templateOptions);
                     }
                 },
                 src: "src/html/index.html",
                 dest: "build/prod/cyberchef.htm"
             },
-            static_dev: {
+            staticDev: {
                 files: [
                     {
                         expand: true,
@@ -293,7 +293,7 @@ module.exports = function(grunt) {
                     }
                 ]
             },
-            static_prod: {
+            staticProd: {
                 files: [
                     {
                         expand: true,
@@ -308,13 +308,13 @@ module.exports = function(grunt) {
                     }
                 ]
             },
-            gh_pages: {
+            ghPages: {
                 options: {
                     process: function(content, srcpath) {
                         // Add Google Analytics code to index.html
                         content = content.replace("</body></html>",
                             grunt.file.read("src/static/ga.html") + "</body></html>");
-                        return grunt.template.process(content, template_options);
+                        return grunt.template.process(content, templateOptions);
                     }
                 },
                 src: "build/prod/index.html",
@@ -331,12 +331,12 @@ module.exports = function(grunt) {
                 ASCIIOnly: true,
                 beautify: {
                     beautify: false,
-                    inline_script: true,
-                    ascii_only: true,
-                    screw_ie8: true
+                    inline_script: true, // eslint-disable-line camelcase
+                    ascii_only: true, // eslint-disable-line camelcase
+                    screw_ie8: true // eslint-disable-line camelcase
                 },
                 compress: {
-                    screw_ie8: true
+                    screw_ie8: true // eslint-disable-line camelcase
                 },
                 banner: banner
             },
@@ -408,7 +408,7 @@ module.exports = function(grunt) {
             }
         },
         exec: {
-            repo_size: {
+            repoSize: {
                 command: [
                     "git ls-files | wc -l | xargs printf '\n%b\ttracked files\n'",
                     "du -hs | egrep -o '^[^\t]*' | xargs printf '%b\trepository size\n'"
@@ -443,13 +443,13 @@ module.exports = function(grunt) {
                     ].join(" >> src/static/stats.txt;") + " >> src/static/stats.txt;",
                 stderr: false
             },
-            display_stats: {
+            displayStats: {
                 command: "cat src/static/stats.txt"
             },
-            clean_git: {
+            cleanGit: {
                 command: "git gc --prune=now --aggressive"
             },
-            deploy_gh_pages: {
+            deployGhPages: {
                 command: [
                         "git add build/prod/index.html -v",
                         "COMMIT_HASH=$(git rev-parse HEAD)",
@@ -471,15 +471,15 @@ module.exports = function(grunt) {
             },
             html: {
                 files: "src/html/**/*.html",
-                tasks: ["copy:html_dev", "chmod:build"]
+                tasks: ["copy:htmlDev", "chmod:build"]
             },
             static: {
                 files: ["src/static/**/*", "src/static/**/.*"],
-                tasks: ["copy:static_dev", "chmod:build"]
+                tasks: ["copy:staticDev", "chmod:build"]
             },
             grunt: {
                 files: "Gruntfile.js",
-                tasks: ["clean:dev", "concat:css", "concat:js", "copy:html_dev", "copy:static_dev", "chmod:build"]
+                tasks: ["clean:dev", "concat:css", "concat:js", "copy:htmlDev", "copy:staticDev", "chmod:build"]
             }
         },
     });

src/css/structure/layout.css

@@ -105,8 +105,8 @@ textarea,
     border: none;
 }
 
-#op_list,
-#rec_list {
+#op-list,
+#rec-list {
     position: absolute;
     top: 43px;
     bottom: 0;
@@ -116,13 +116,13 @@ textarea,
     padding: 0;
 }
 
-.op_list {
+.op-list {
     list-style-type: none;
     margin: 0;
     padding: 0;
 }
 
-#rec_list {
+#rec-list {
     bottom: 120px; /* Linked to #controls height */
     overflow: auto;
 }
@@ -137,7 +137,7 @@ textarea,
 #controls {
     position: absolute;
     width: 100%;
-    height: 120px;  /* Linked to #rec_list bottom */
+    height: 120px;  /* Linked to #rec-list bottom */
     bottom: 0;
     padding: 10px;
 }

src/css/themes/classic.css

@@ -30,13 +30,13 @@
     border-top-width: 0;
 }
 
-.op_list .operation { /*blue*/
+.op-list .operation { /*blue*/
     color: #3a87ad;
     background-color: #d9edf7;
     border-color: #bce8f1;
 }
 
-#rec_list .operation { /*green*/
+#rec-list .operation { /*green*/
     color: #468847;
     background-color: #dff0d8;
     border-color: #d6e9c6;

src/html/index.html

@@ -58,13 +58,13 @@
                 <div id="operations" class="split split-horizontal no-select">
                     <div class="title no-select">Operations</div>
                     <input type="search" class="form-control" id="search" placeholder="Search..." autocomplete="off">
-                    <ul class="op_list" id="search-results"></ul>
+                    <ul class="op-list" id="search-results"></ul>
                     <div class="panel-group no-select" id="categories"></div>
                 </div>
                 
                 <div id="recipe" class="split split-horizontal no-select">
                     <div class="title no-select">Recipe</div>
-                    <ul id="rec_list" class="no-select"></ul>
+                    <ul id="rec-list" class="no-select"></ul>
                     
                     <div id="controls" class="no-select">
                         <div id="operational-controls">
@@ -252,7 +252,7 @@
                             <li><span style="font-weight: bold">To remove:</span> hit the red cross or drag out of the list below</li>
                         </ul>
                         <br>
-                        <ul id="edit-favourites-list" class="op_list"></ul>
+                        <ul id="edit-favourites-list" class="op-list"></ul>
                         <div class="option-item">
                         </div>
                     </div>
@@ -336,7 +336,7 @@
                                 <div role='tabpanel' class='tab-pane' id='stats'>
                                     <br>
                                     <p>If you're a nerd like me, you might find statistics really fun! Here's some about the CyberChef code base:</p>
-                                    <br><pre><%= codebase_stats %></pre>
+                                    <br><pre><%= codebaseStats %></pre>
                                 </div>
                                 <div role='tabpanel' class='tab-pane' id='about' style="padding: 20px;">
                                     <h4>What</h4>

src/js/.eslintrc.json

@@ -58,6 +58,9 @@
         "quotes": ["error", "double", {
             "avoidEscape": true
         }],
+        "camelcase": ["error", {
+            "properties": "always"
+        }],
         "semi": ["error", "always"],
         "unicode-bom": "error"
     },

src/js/core/Chef.js

@@ -15,10 +15,10 @@ var Chef = function() {
 /**
  * Runs the recipe over the input.
  *
- * @param {string} input_text - The input data as a string
- * @param {Object[]} recipe_config - The recipe configuration object
+ * @param {string} inputText - The input data as a string
+ * @param {Object[]} recipeConfig - The recipe configuration object
  * @param {Object} options - The options object storing various user choices
- * @param {boolean} options.attemp_highlight - Whether or not to attempt highlighting
+ * @param {boolean} options.attempHighlight - Whether or not to attempt highlighting
  * @param {number} progress - The position in the recipe to start from
  * @param {number} [step] - The number of operations to execute
  *
@@ -30,41 +30,41 @@ var Chef = function() {
  * @returns {number} response.duration - The number of ms it took to execute the recipe
  * @returns {number} response.error - The error object thrown by a failed operation (false if no error)
 */
-Chef.prototype.bake = function(input_text, recipe_config, options, progress, step) {
-    var start_time  = new Date().getTime(),
-        recipe      = new Recipe(recipe_config),
-        contains_fc = recipe.contains_flow_control(),
-        error       = false;
+Chef.prototype.bake = function(inputText, recipeConfig, options, progress, step) {
+    var startTime  = new Date().getTime(),
+        recipe     = new Recipe(recipeConfig),
+        containsFc = recipe.containsFlowControl(),
+        error      = false;
 
-    // Reset attempt_highlight flag
-    if (options.hasOwnProperty("attempt_highlight")) {
-        options.attempt_highlight = true;
+    // Reset attemptHighlight flag
+    if (options.hasOwnProperty("attemptHighlight")) {
+        options.attemptHighlight = true;
     }
 
-    if (contains_fc) options.attempt_highlight = false;
+    if (containsFc) options.attemptHighlight = false;
 
     // Clean up progress
-    if (progress >= recipe_config.length) {
+    if (progress >= recipeConfig.length) {
         progress = 0;
     }
 
     if (step) {
         // Unset breakpoint on this step
-        recipe.set_breakpoint(progress, false);
+        recipe.setBreakpoint(progress, false);
         // Set breakpoint on next step
-        recipe.set_breakpoint(progress + 1, true);
+        recipe.setBreakpoint(progress + 1, true);
     }
 
     // If stepping with flow control, we have to start from the beginning
     // but still want to skip all previous breakpoints
-    if (progress > 0 && contains_fc) {
-        recipe.remove_breaks_up_to(progress);
+    if (progress > 0 && containsFc) {
+        recipe.removeBreaksUpTo(progress);
         progress = 0;
     }
 
     // If starting from scratch, load data
     if (progress === 0) {
-        this.dish.set(input_text, Dish.STRING);
+        this.dish.set(inputText, Dish.STRING);
     }
 
     try {
@@ -80,10 +80,10 @@ Chef.prototype.bake = function(input_text, recipe_config, options, progress, ste
         result: this.dish.type === Dish.HTML ?
             this.dish.get(Dish.HTML) :
             this.dish.get(Dish.STRING),
-        type: Dish.enum_lookup(this.dish.type),
+        type: Dish.enumLookup(this.dish.type),
         progress: progress,
         options: options,
-        duration: new Date().getTime() - start_time,
+        duration: new Date().getTime() - startTime,
         error: error
     };
 };
@@ -103,18 +103,18 @@ Chef.prototype.bake = function(input_text, recipe_config, options, progress, ste
  * This will only actually execute the recipe if auto-bake is enabled, otherwise it will just load
  * the recipe, ingredients and dish.
  *
- * @param {Object[]} recipe_config - The recipe configuration object
+ * @param {Object[]} recipeConfig - The recipe configuration object
  * @returns {number} The time it took to run the silent bake in milliseconds.
 */
-Chef.prototype.silent_bake = function(recipe_config) {
-    var start_time = new Date().getTime(),
-        recipe     = new Recipe(recipe_config),
-        dish       = new Dish("", Dish.STRING);
+Chef.prototype.silentBake = function(recipeConfig) {
+    var startTime = new Date().getTime(),
+        recipe    = new Recipe(recipeConfig),
+        dish      = new Dish("", Dish.STRING);
 
     try {
         recipe.execute(dish);
     } catch(err) {
         // Suppress all errors
     }
-    return new Date().getTime() - start_time;
+    return new Date().getTime() - startTime;
 };

src/js/core/Dish.js

@@ -6,7 +6,7 @@
  * @license Apache-2.0
  *
  * @class
- * @param {byte_array|string|number} value - The value of the input data.
+ * @param {byteArray|string|number} value - The value of the input data.
  * @param {number} type - The data type of value, see Dish enums.
  */
 var Dish = function(value, type) {
@@ -45,12 +45,12 @@ Dish.HTML = 3;
  * Returns the data type enum for the given type string.
  *
  * @static
- * @param {string} type_str - The name of the data type.
+ * @param {string} typeStr - The name of the data type.
  * @returns {number} The data type enum value.
  */
-Dish.type_enum = function(type_str) {
-    switch (type_str) {
-        case "byte_array":
+Dish.typeEnum = function(typeStr) {
+    switch (typeStr) {
+        case "byteArray":
         case "Byte array":
             return Dish.BYTE_ARRAY;
         case "string":
@@ -72,13 +72,13 @@ Dish.type_enum = function(type_str) {
  * Returns the data type string for the given type enum.
  *
  * @static
- * @param {string} type_enum - The enum value of the data type.
+ * @param {string} typeEnum - The enum value of the data type.
  * @returns {number} The data type as a string.
  */
-Dish.enum_lookup = function(type_enum) {
-    switch (type_enum) {
+Dish.enumLookup = function(typeEnum) {
+    switch (typeEnum) {
         case Dish.BYTE_ARRAY:
-            return "byte_array";
+            return "byteArray";
         case Dish.STRING:
             return "string";
         case Dish.NUMBER:
@@ -94,7 +94,7 @@ Dish.enum_lookup = function(type_enum) {
 /**
  * Sets the data value and type and then validates them.
  *
- * @param {byte_array|string|number} value - The value of the input data.
+ * @param {byteArray|string|number} value - The value of the input data.
  * @param {number} type - The data type of value, see Dish enums.
  */
 Dish.prototype.set = function(value, type) {
@@ -103,7 +103,7 @@ Dish.prototype.set = function(value, type) {
     
     if (!this.valid()) {
         var sample = Utils.truncate(JSON.stringify(this.value), 13);
-        throw "Data is not a valid " + Dish.enum_lookup(type) + ": " + sample;
+        throw "Data is not a valid " + Dish.enumLookup(type) + ": " + sample;
     }
 };
 
@@ -112,7 +112,7 @@ Dish.prototype.set = function(value, type) {
  * Returns the value of the data in the type format specified.
  *
  * @param {number} type - The data type of value, see Dish enums.
- * @returns {byte_array|string|number} The value of the output data.
+ * @returns {byteArray|string|number} The value of the output data.
  */
 Dish.prototype.get = function(type) {
     if (this.type !== type) {
@@ -125,36 +125,36 @@ Dish.prototype.get = function(type) {
 /**
  * Translates the data to the given type format.
  *
- * @param {number} to_type - The data type of value, see Dish enums.
+ * @param {number} toType - The data type of value, see Dish enums.
  */
-Dish.prototype.translate = function(to_type) {
-    // Convert data to intermediate byte_array type
+Dish.prototype.translate = function(toType) {
+    // Convert data to intermediate byteArray type
     switch (this.type) {
         case Dish.STRING:
-            this.value = this.value ? Utils.str_to_byte_array(this.value) : [];
+            this.value = this.value ? Utils.strToByteArray(this.value) : [];
             this.type = Dish.BYTE_ARRAY;
             break;
         case Dish.NUMBER:
-            this.value = typeof this.value == "number" ? Utils.str_to_byte_array(this.value.toString()) : [];
+            this.value = typeof this.value == "number" ? Utils.strToByteArray(this.value.toString()) : [];
             this.type = Dish.BYTE_ARRAY;
             break;
         case Dish.HTML:
-            this.value = this.value ? Utils.str_to_byte_array(Utils.strip_html_tags(this.value, true)) : [];
+            this.value = this.value ? Utils.strToByteArray(Utils.stripHtmlTags(this.value, true)) : [];
             this.type = Dish.BYTE_ARRAY;
             break;
         default:
             break;
     }
     
-    // Convert from byte_array to to_type
-    switch (to_type) {
+    // Convert from byteArray to toType
+    switch (toType) {
         case Dish.STRING:
         case Dish.HTML:
-            this.value = this.value ? Utils.byte_array_to_utf8(this.value) : "";
+            this.value = this.value ? Utils.byteArrayToUtf8(this.value) : "";
             this.type = Dish.STRING;
             break;
         case Dish.NUMBER:
-            this.value = this.value ? parseFloat(Utils.byte_array_to_utf8(this.value)) : 0;
+            this.value = this.value ? parseFloat(Utils.byteArrayToUtf8(this.value)) : 0;
             this.type = Dish.NUMBER;
             break;
         default:

src/js/core/FlowControl.js

@@ -31,31 +31,31 @@ var FlowControl = {
      * @param {Object} state - The current state of the recipe.
      * @param {number} state.progress - The current position in the recipe.
      * @param {Dish} state.dish - The Dish being operated on.
-     * @param {Operation[]} state.op_list - The list of operations in the recipe.
+     * @param {Operation[]} state.opList - The list of operations in the recipe.
      * @returns {Object} The updated state of the recipe.
      */
-    run_fork: function(state) {
-        var op_list       = state.op_list,
-            input_type    = op_list[state.progress].input_type,
-            output_type   = op_list[state.progress].output_type,
-            input         = state.dish.get(input_type),
-            ings          = op_list[state.progress].get_ing_values(),
-            split_delim   = ings[0],
-            merge_delim   = ings[1],
-            ignore_errors = ings[2],
-            sub_op_list   = [],
-            inputs        = [];
+    runFork: function(state) {
+        var opList       = state.opList,
+            inputType    = opList[state.progress].inputType,
+            outputType   = opList[state.progress].outputType,
+            input        = state.dish.get(inputType),
+            ings         = opList[state.progress].getIngValues(),
+            splitDelim   = ings[0],
+            mergeDelim   = ings[1],
+            ignoreErrors = ings[2],
+            subOpList    = [],
+            inputs       = [];
         
         if (input)
-            inputs = input.split(split_delim);
+            inputs = input.split(splitDelim);
         
-        // Create sub_op_list for each tranche to operate on
+        // Create subOpList for each tranche to operate on
         // (all remaining operations unless we encounter a Merge)
-        for (var i = state.progress + 1; i < op_list.length; i++) {
-            if (op_list[i].name === "Merge" && !op_list[i].is_disabled()) {
+        for (var i = state.progress + 1; i < opList.length; i++) {
+            if (opList[i].name === "Merge" && !opList[i].isDisabled()) {
                 break;
             } else {
-                sub_op_list.push(op_list[i]);
+                subOpList.push(opList[i]);
             }
         }
         
@@ -63,23 +63,23 @@ var FlowControl = {
             output = "",
             progress = 0;
             
-        recipe.add_operations(sub_op_list);
+        recipe.addOperations(subOpList);
         
         // Run recipe over each tranche
         for (i = 0; i < inputs.length; i++) {
-            var dish = new Dish(inputs[i], input_type);
+            var dish = new Dish(inputs[i], inputType);
             try {
                 progress = recipe.execute(dish, 0);
             } catch(err) {
-                if (!ignore_errors) {
+                if (!ignoreErrors) {
                     throw err;
                 }
                 progress = err.progress + 1;
             }
-            output += dish.get(output_type) + merge_delim;
+            output += dish.get(outputType) + mergeDelim;
         }
         
-        state.dish.set(output, output_type);
+        state.dish.set(output, outputType);
         state.progress += progress;
         return state;
     },
@@ -91,10 +91,10 @@ var FlowControl = {
      * @param {Object} state - The current state of the recipe.
      * @param {number} state.progress - The current position in the recipe.
      * @param {Dish} state.dish - The Dish being operated on.
-     * @param {Operation[]} state.op_list - The list of operations in the recipe.
+     * @param {Operation[]} state.opList - The list of operations in the recipe.
      * @returns {Object} The updated state of the recipe.
      */
-    run_merge: function(state) {
+    runMerge: function(state) {
         // No need to actually do anything here. The fork operation will
         // merge when it sees this operation.
         return state;
@@ -118,22 +118,22 @@ var FlowControl = {
      * @param {Object} state - The current state of the recipe.
      * @param {number} state.progress - The current position in the recipe.
      * @param {Dish} state.dish - The Dish being operated on.
-     * @param {Operation[]} state.op_list - The list of operations in the recipe.
-     * @param {number} state.num_jumps - The number of jumps taken so far.
+     * @param {Operation[]} state.opList - The list of operations in the recipe.
+     * @param {number} state.numJumps - The number of jumps taken so far.
      * @returns {Object} The updated state of the recipe.
      */
-    run_jump: function(state) {
-        var ings      = state.op_list[state.progress].get_ing_values(),
-            jump_num  = ings[0],
-            max_jumps = ings[1];
+    runJump: function(state) {
+        var ings     = state.opList[state.progress].getIngValues(),
+            jumpNum  = ings[0],
+            maxJumps = ings[1];
         
-        if (state.num_jumps >= max_jumps) {
+        if (state.numJumps >= maxJumps) {
             state.progress++;
             return state;
         }
         
-        state.progress += jump_num;
-        state.num_jumps++;
+        state.progress += jumpNum;
+        state.numJumps++;
         return state;
     },
     
@@ -144,25 +144,25 @@ var FlowControl = {
      * @param {Object} state - The current state of the recipe.
      * @param {number} state.progress - The current position in the recipe.
      * @param {Dish} state.dish - The Dish being operated on.
-     * @param {Operation[]} state.op_list - The list of operations in the recipe.
-     * @param {number} state.num_jumps - The number of jumps taken so far.
+     * @param {Operation[]} state.opList - The list of operations in the recipe.
+     * @param {number} state.numJumps - The number of jumps taken so far.
      * @returns {Object} The updated state of the recipe.
      */
-    run_cond_jump: function(state) {
-        var ings      = state.op_list[state.progress].get_ing_values(),
-            dish      = state.dish,
-            regex_str = ings[0],
-            jump_num  = ings[1],
-            max_jumps = ings[2];
+    runCondJump: function(state) {
+        var ings     = state.opList[state.progress].getIngValues(),
+            dish     = state.dish,
+            regexStr = ings[0],
+            jumpNum  = ings[1],
+            maxJumps = ings[2];
         
-        if (state.num_jumps >= max_jumps) {
+        if (state.numJumps >= maxJumps) {
             state.progress++;
             return state;
         }
         
-        if (regex_str !== "" && dish.get(Dish.STRING).search(regex_str) > -1) {
-            state.progress += jump_num;
-            state.num_jumps++;
+        if (regexStr !== "" && dish.get(Dish.STRING).search(regexStr) > -1) {
+            state.progress += jumpNum;
+            state.numJumps++;
         }
         
         return state;
@@ -175,11 +175,11 @@ var FlowControl = {
      * @param {Object} state - The current state of the recipe.
      * @param {number} state.progress - The current position in the recipe.
      * @param {Dish} state.dish - The Dish being operated on.
-     * @param {Operation[]} state.op_list - The list of operations in the recipe.
+     * @param {Operation[]} state.opList - The list of operations in the recipe.
      * @returns {Object} The updated state of the recipe.
      */
-    run_return: function(state) {
-        state.progress = state.op_list.length;
+    runReturn: function(state) {
+        state.progress = state.opList.length;
         return state;
     },
     

src/js/core/Ingredient.js

@@ -6,15 +6,15 @@
  * @license Apache-2.0
  *
  * @class
- * @param {Object} ingredient_config
+ * @param {Object} ingredientConfig
  */
-var Ingredient = function(ingredient_config) {
+var Ingredient = function(ingredientConfig) {
     this.name  = "";
     this.type  = "";
     this.value = null;
     
-    if (ingredient_config) {
-        this._parse_config(ingredient_config);
+    if (ingredientConfig) {
+        this._parseConfig(ingredientConfig);
     }
 };
 
@@ -23,11 +23,11 @@ var Ingredient = function(ingredient_config) {
  * Reads and parses the given config.
  *
  * @private
- * @param {Object} ingredient_config
+ * @param {Object} ingredientConfig
  */
-Ingredient.prototype._parse_config = function(ingredient_config) {
-    this.name = ingredient_config.name;
-    this.type = ingredient_config.type;
+Ingredient.prototype._parseConfig = function(ingredientConfig) {
+    this.name = ingredientConfig.name;
+    this.type = ingredientConfig.type;
 };
 
 
@@ -36,7 +36,7 @@ Ingredient.prototype._parse_config = function(ingredient_config) {
  *
  * @returns {*}
  */
-Ingredient.prototype.get_config = function() {
+Ingredient.prototype.getConfig = function() {
     return this.value;
 };
 
@@ -46,7 +46,7 @@ Ingredient.prototype.get_config = function() {
  *
  * @param {*} value
  */
-Ingredient.prototype.set_value = function(value) {
+Ingredient.prototype.setValue = function(value) {
     this.value = Ingredient.prepare(value, this.type);
 };
 
@@ -61,14 +61,14 @@ Ingredient.prototype.set_value = function(value) {
 */
 Ingredient.prepare = function(data, type) {
     switch (type) {
-        case "binary_string":
-        case "binary_short_string":
-        case "editable_option":
-            return Utils.parse_escaped_chars(data);
-        case "byte_array":
+        case "binaryString":
+        case "binaryShortString":
+        case "editableOption":
+            return Utils.parseEscapedChars(data);
+        case "byteArray":
             if (typeof data == "string") {
                 data = data.replace(/\s+/g, "");
-                return Utils.hex_to_byte_array(data);
+                return Utils.hexToByteArray(data);
             } else {
                 return data;
             }

src/js/core/Operation.js

@@ -6,23 +6,23 @@
  * @license Apache-2.0
  *
  * @class
- * @param {string} operation_name
- * @param {Object} operation_config
+ * @param {string} operationName
+ * @param {Object} operationConfig
  */
-var Operation = function(operation_name, operation_config) {
-    this.name              = operation_name;
-    this.description       = "";
-    this.input_type        = -1;
-    this.output_type       = -1;
-    this.run               = null;
-    this.highlight         = null;
-    this.highlight_reverse = null;
-    this.breakpoint        = false;
-    this.disabled          = false;
-    this.ing_list          = [];
+var Operation = function(operationName, operationConfig) {
+    this.name             = operationName;
+    this.description      = "";
+    this.inputType        = -1;
+    this.outputType       = -1;
+    this.run              = null;
+    this.highlight        = null;
+    this.highlightReverse = null;
+    this.breakpoint       = false;
+    this.disabled         = false;
+    this.ingList          = [];
     
-    if (operation_config) {
-        this._parse_config(operation_config);
+    if (operationConfig) {
+        this._parseConfig(operationConfig);
     }
 };
 
@@ -31,21 +31,21 @@ var Operation = function(operation_name, operation_config) {
  * Reads and parses the given config.
  *
  * @private
- * @param {Object} operation_config
+ * @param {Object} operationConfig
  */
-Operation.prototype._parse_config = function(operation_config) {
-    this.description       = operation_config.description;
-    this.input_type        = Dish.type_enum(operation_config.input_type);
-    this.output_type       = Dish.type_enum(operation_config.output_type);
-    this.run               = operation_config.run;
-    this.highlight         = operation_config.highlight;
-    this.highlight_reverse = operation_config.highlight_reverse;
-    this.flow_control      = operation_config.flow_control;
-
-    for (var a = 0; a < operation_config.args.length; a++) {
-        var ingredient_config = operation_config.args[a];
-        var ingredient = new Ingredient(ingredient_config);
-        this.add_ingredient(ingredient);
+Operation.prototype._parseConfig = function(operationConfig) {
+    this.description      = operationConfig.description;
+    this.inputType        = Dish.typeEnum(operationConfig.inputType);
+    this.outputType       = Dish.typeEnum(operationConfig.outputType);
+    this.run              = operationConfig.run;
+    this.highlight        = operationConfig.highlight;
+    this.highlightReverse = operationConfig.highlightReverse;
+    this.flowControl      = operationConfig.flowControl;
+
+    for (var a = 0; a < operationConfig.args.length; a++) {
+        var ingredientConfig = operationConfig.args[a];
+        var ingredient = new Ingredient(ingredientConfig);
+        this.addIngredient(ingredient);
     }
 };
 
@@ -55,19 +55,19 @@ Operation.prototype._parse_config = function(operation_config) {
  *
  * @returns {Object}
  */
-Operation.prototype.get_config = function() {
-    var ingredient_config = [];
+Operation.prototype.getConfig = function() {
+    var ingredientConfig = [];
     
-    for (var o = 0; o < this.ing_list.length; o++) {
-        ingredient_config.push(this.ing_list[o].get_config());
+    for (var o = 0; o < this.ingList.length; o++) {
+        ingredientConfig.push(this.ingList[o].getConfig());
     }
     
-    var operation_config = {
+    var operationConfig = {
         "op": this.name,
-        "args": ingredient_config
+        "args": ingredientConfig
     };
     
-    return operation_config;
+    return operationConfig;
 };
 
 
@@ -76,19 +76,19 @@ Operation.prototype.get_config = function() {
  *
  * @param {Ingredient} ingredient
  */
-Operation.prototype.add_ingredient = function(ingredient) {
-    this.ing_list.push(ingredient);
+Operation.prototype.addIngredient = function(ingredient) {
+    this.ingList.push(ingredient);
 };
 
 
 /**
  * Set the Ingredient values for this Operation.
  *
- * @param {Object[]} ing_values
+ * @param {Object[]} ingValues
  */
-Operation.prototype.set_ing_values = function(ing_values) {
-    for (var i = 0; i < ing_values.length; i++) {
-        this.ing_list[i].set_value(ing_values[i]);
+Operation.prototype.setIngValues = function(ingValues) {
+    for (var i = 0; i < ingValues.length; i++) {
+        this.ingList[i].setValue(ingValues[i]);
     }
 };
 
@@ -98,12 +98,12 @@ Operation.prototype.set_ing_values = function(ing_values) {
  *
  * @returns {Object[]}
  */
-Operation.prototype.get_ing_values = function() {
-    var ing_values = [];
-    for (var i = 0; i < this.ing_list.length; i++) {
-        ing_values.push(this.ing_list[i].value);
+Operation.prototype.getIngValues = function() {
+    var ingValues = [];
+    for (var i = 0; i < this.ingList.length; i++) {
+        ingValues.push(this.ingList[i].value);
     }
-    return ing_values;
+    return ingValues;
 };
 
 
@@ -112,7 +112,7 @@ Operation.prototype.get_ing_values = function() {
  *
  * @param {boolean} value
  */
-Operation.prototype.set_breakpoint = function(value) {
+Operation.prototype.setBreakpoint = function(value) {
     this.breakpoint = !!value;
 };
 
@@ -122,7 +122,7 @@ Operation.prototype.set_breakpoint = function(value) {
  *
  * @returns {boolean}
  */
-Operation.prototype.is_breakpoint = function() {
+Operation.prototype.isBreakpoint = function() {
     return this.breakpoint;
 };
 
@@ -132,7 +132,7 @@ Operation.prototype.is_breakpoint = function() {
  *
  * @param {boolean} value
  */
-Operation.prototype.set_disabled = function(value) {
+Operation.prototype.setDisabled = function(value) {
     this.disabled = !!value;
 };
 
@@ -142,7 +142,7 @@ Operation.prototype.set_disabled = function(value) {
  *
  * @returns {boolean}
  */
-Operation.prototype.is_disabled = function() {
+Operation.prototype.isDisabled = function() {
     return this.disabled;
 };
 
@@ -152,6 +152,6 @@ Operation.prototype.is_disabled = function() {
  *
  * @returns {boolean}
  */
-Operation.prototype.is_flow_control = function() {
-    return this.flow_control;
+Operation.prototype.isFlowControl = function() {
+    return this.flowControl;
 };

src/js/core/Recipe.js

@@ -6,13 +6,13 @@
  * @license Apache-2.0
  *
  * @class
- * @param {Object} recipe_config
+ * @param {Object} recipeConfig
  */
-var Recipe = function(recipe_config) {
-    this.op_list = [];
+var Recipe = function(recipeConfig) {
+    this.opList = [];
     
-    if (recipe_config) {
-        this._parse_config(recipe_config);
+    if (recipeConfig) {
+        this._parseConfig(recipeConfig);
     }
 };
 
@@ -21,17 +21,17 @@ var Recipe = function(recipe_config) {
  * Reads and parses the given config.
  *
  * @private
- * @param {Object} recipe_config
+ * @param {Object} recipeConfig
  */
-Recipe.prototype._parse_config = function(recipe_config) {
-    for (var c = 0; c < recipe_config.length; c++) {
-        var operation_name = recipe_config[c].op;
-        var operation_config = OperationConfig[operation_name];
-        var operation = new Operation(operation_name, operation_config);
-        operation.set_ing_values(recipe_config[c].args);
-        operation.set_breakpoint(recipe_config[c].breakpoint);
-        operation.set_disabled(recipe_config[c].disabled);
-        this.add_operation(operation);
+Recipe.prototype._parseConfig = function(recipeConfig) {
+    for (var c = 0; c < recipeConfig.length; c++) {
+        var operationName = recipeConfig[c].op;
+        var operationConfig = OperationConfig[operationName];
+        var operation = new Operation(operationName, operationConfig);
+        operation.setIngValues(recipeConfig[c].args);
+        operation.setBreakpoint(recipeConfig[c].breakpoint);
+        operation.setDisabled(recipeConfig[c].disabled);
+        this.addOperation(operation);
     }
 };
 
@@ -41,14 +41,14 @@ Recipe.prototype._parse_config = function(recipe_config) {
  *
  * @returns {*}
  */
-Recipe.prototype.get_config = function() {
-    var recipe_config = [];
+Recipe.prototype.getConfig = function() {
+    var recipeConfig = [];
     
-    for (var o = 0; o < this.op_list.length; o++) {
-        recipe_config.push(this.op_list[o].get_config());
+    for (var o = 0; o < this.opList.length; o++) {
+        recipeConfig.push(this.opList[o].getConfig());
     }
     
-    return recipe_config;
+    return recipeConfig;
 };
 
 
@@ -57,8 +57,8 @@ Recipe.prototype.get_config = function() {
  *
  * @param {Operation} operation
  */
-Recipe.prototype.add_operation = function(operation) {
-    this.op_list.push(operation);
+Recipe.prototype.addOperation = function(operation) {
+    this.opList.push(operation);
 };
 
 
@@ -67,8 +67,8 @@ Recipe.prototype.add_operation = function(operation) {
  *
  * @param {Operation[]} operations
  */
-Recipe.prototype.add_operations = function(operations) {
-    this.op_list = this.op_list.concat(operations);
+Recipe.prototype.addOperations = function(operations) {
+    this.opList = this.opList.concat(operations);
 };
 
 
@@ -78,9 +78,9 @@ Recipe.prototype.add_operations = function(operations) {
  * @param {number} position - The index of the Operation
  * @param {boolean} value
  */
-Recipe.prototype.set_breakpoint = function(position, value) {
+Recipe.prototype.setBreakpoint = function(position, value) {
     try {
-        this.op_list[position].set_breakpoint(value);
+        this.opList[position].setBreakpoint(value);
     } catch (err) {
         // Ignore index error
     }
@@ -93,9 +93,9 @@ Recipe.prototype.set_breakpoint = function(position, value) {
  *
  * @param {number} pos
  */
-Recipe.prototype.remove_breaks_up_to = function(pos) {
+Recipe.prototype.removeBreaksUpTo = function(pos) {
     for (var i = 0; i < pos; i++) {
-        this.op_list[i].set_breakpoint(false);
+        this.opList[i].setBreakpoint(false);
     }
 };
 
@@ -105,9 +105,9 @@ Recipe.prototype.remove_breaks_up_to = function(pos) {
  *
  * @returns {boolean}
  */
-Recipe.prototype.contains_flow_control = function() {
-    for (var i = 0; i < this.op_list.length; i++) {
-        if (this.op_list[i].is_flow_control()) return true;
+Recipe.prototype.containsFlowControl = function() {
+    for (var i = 0; i < this.opList.length; i++) {
+        if (this.opList[i].isFlowControl()) return true;
     }
     return false;
 };
@@ -117,17 +117,17 @@ Recipe.prototype.contains_flow_control = function() {
  * Returns the index of the last Operation index that will be executed, taking into account disabled
  * Operations and breakpoints.
  *
- * @param {number} [start_index=0] - The index to start searching from
+ * @param {number} [startIndex=0] - The index to start searching from
  * @returns (number}
  */
-Recipe.prototype.last_op_index = function(start_index) {
-    var i = start_index + 1 || 0,
+Recipe.prototype.lastOpIndex = function(startIndex) {
+    var i = startIndex + 1 || 0,
         op;
         
-    for (; i < this.op_list.length; i++) {
-        op = this.op_list[i];
-        if (op.is_disabled()) return i-1;
-        if (op.is_breakpoint()) return i-1;
+    for (; i < this.opList.length; i++) {
+        op = this.opList[i];
+        if (op.isDisabled()) return i-1;
+        if (op.isBreakpoint()) return i-1;
     }
     
     return i-1;
@@ -138,58 +138,58 @@ Recipe.prototype.last_op_index = function(start_index) {
  * Executes each operation in the recipe over the given Dish.
  *
  * @param {Dish} dish
- * @param {number} [start_from=0] - The index of the Operation to start executing from
+ * @param {number} [startFrom=0] - The index of the Operation to start executing from
  * @returns {number} - The final progress through the recipe
  */
-Recipe.prototype.execute = function(dish, start_from) {
-    start_from = start_from || 0;
-    var op, input, output, num_jumps = 0;
+Recipe.prototype.execute = function(dish, startFrom) {
+    startFrom = startFrom || 0;
+    var op, input, output, numJumps = 0;
     
-    for (var i = start_from; i < this.op_list.length; i++) {
-        op = this.op_list[i];
-        if (op.is_disabled()) {
+    for (var i = startFrom; i < this.opList.length; i++) {
+        op = this.opList[i];
+        if (op.isDisabled()) {
             continue;
         }
-        if (op.is_breakpoint()) {
+        if (op.isBreakpoint()) {
             return i;
         }
         
         try {
-            input = dish.get(op.input_type);
+            input = dish.get(op.inputType);
             
-            if (op.is_flow_control()) {
+            if (op.isFlowControl()) {
                 // Package up the current state
                 var state = {
                     "progress" : i,
                     "dish"     : dish,
-                    "op_list"  : this.op_list,
-                    "num_jumps" : num_jumps
+                    "opList"  : this.opList,
+                    "numJumps" : numJumps
                 };
                 
                 state = op.run(state);
                 i = state.progress;
-                num_jumps = state.num_jumps;
+                numJumps = state.numJumps;
             } else {
-                output = op.run(input, op.get_ing_values());
-                dish.set(output, op.output_type);
+                output = op.run(input, op.getIngValues());
+                dish.set(output, op.outputType);
             }
         } catch (err) {
             var e = typeof err == "string" ? { message: err } : err;
 
             e.progress = i;
             if (e.fileName) {
-                e.display_str = op.name + " - " + e.name + " in " +
+                e.displayStr = op.name + " - " + e.name + " in " +
                     e.fileName + " on line " + e.lineNumber +
-                    ".<br><br>Message: " + (e.display_str || e.message);
+                    ".<br><br>Message: " + (e.displayStr || e.message);
             } else {
-                e.display_str = op.name + " - " + (e.display_str || e.message);
+                e.displayStr = op.name + " - " + (e.displayStr || e.message);
             }
             
             throw e;
         }
     }
     
-    return this.op_list.length;
+    return this.opList.length;
 };
 
 
@@ -198,17 +198,17 @@ Recipe.prototype.execute = function(dish, start_from) {
  *
  * @returns {string}
  */
-Recipe.prototype.to_string = function() {
-    return JSON.stringify(this.get_config());
+Recipe.prototype.toString = function() {
+    return JSON.stringify(this.getConfig());
 };
 
 
 /**
  * Creates a Recipe from a given configuration string.
  *
- * @param {string} recipe_str
+ * @param {string} recipeStr
  */
-Recipe.prototype.from_string = function(recipe_str) {
-    var recipe_config = JSON.parse(recipe_str);
-    this._parse_config(recipe_config);
+Recipe.prototype.fromString = function(recipeStr) {
+    var recipeConfig = JSON.parse(recipeStr);
+    this._parseConfig(recipeConfig);
 };

src/js/operations/Base.js

@@ -22,7 +22,7 @@ var Base = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to: function(input, args) {
+    runTo: function(input, args) {
         if (!input) {
             throw ("Error: Input must be a number");
         }
@@ -41,7 +41,7 @@ var Base = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_from: function(input, args) {
+    runFrom: function(input, args) {
         var radix = args[0] || Base.DEFAULT_RADIX;
         if (radix < 2 || radix > 36) {
             throw "Error: Radix argument must be between 2 and 36";

src/js/operations/Base64.js

@@ -36,13 +36,13 @@ var Base64 = {
     /**
      * To Base64 operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to: function(input, args) {
+    runTo: function(input, args) {
         var alphabet = args[0] || Base64.ALPHABET;
-        return Utils.to_base64(input, alphabet);
+        return Utils.toBase64(input, alphabet);
     },
 
 
@@ -57,13 +57,13 @@ var Base64 = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from: function(input, args) {
+    runFrom: function(input, args) {
         var alphabet = args[0] || Base64.ALPHABET,
-            remove_non_alph_chars = args[1];
+            removeNonAlphChars = args[1];
 
-        return Utils.from_base64(input, alphabet, "byte_array", remove_non_alph_chars);
+        return Utils.fromBase64(input, alphabet, "byteArray", removeNonAlphChars);
     },
 
 
@@ -76,15 +76,15 @@ var Base64 = {
     /**
      * To Base32 operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_32: function(input, args) {
+    runTo32: function(input, args) {
         if (!input) return "";
 
         var alphabet = args[0] ?
-                Utils.expand_alph_range(args[0]).join("") : "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=",
+                Utils.expandAlphRange(args[0]).join("") : "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=",
             output = "",
             chr1, chr2, chr3, chr4, chr5,
             enc1, enc2, enc3, enc4, enc5, enc6, enc7, enc8,
@@ -130,21 +130,21 @@ var Base64 = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_32: function(input, args) {
+    runFrom32: function(input, args) {
         if (!input) return [];
 
         var alphabet = args[0] ?
-                Utils.expand_alph_range(args[0]).join("") : "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=",
-            remove_non_alph_chars = args[0];
+                Utils.expandAlphRange(args[0]).join("") : "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=",
+            removeNonAlphChars = args[0];
 
         var output = [],
             chr1, chr2, chr3, chr4, chr5,
             enc1, enc2, enc3, enc4, enc5, enc6, enc7, enc8,
             i = 0;
 
-        if (remove_non_alph_chars) {
+        if (removeNonAlphChars) {
             var re = new RegExp("[^" + alphabet.replace(/[\]\\\-^]/g, "\\$&") + "]", "g");
             input = input.replace(re, "");
         }
@@ -190,21 +190,21 @@ var Base64 = {
     /**
      * Show Base64 offsets operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {html}
      */
-    run_offsets: function(input, args) {
+    runOffsets: function(input, args) {
         var alphabet = args[0] || Base64.ALPHABET,
-            show_variable = args[1],
-            offset0 = Utils.to_base64(input, alphabet),
-            offset1 = Utils.to_base64([0].concat(input), alphabet),
-            offset2 = Utils.to_base64([0, 0].concat(input), alphabet),
+            showVariable = args[1],
+            offset0 = Utils.toBase64(input, alphabet),
+            offset1 = Utils.toBase64([0].concat(input), alphabet),
+            offset2 = Utils.toBase64([0, 0].concat(input), alphabet),
             len0 = offset0.indexOf("="),
             len1 = offset1.indexOf("="),
             len2 = offset2.indexOf("="),
             script = "<script type='application/javascript'>$('[data-toggle=\"tooltip\"]').tooltip()</script>",
-            static_section = "",
+            staticSection = "",
             padding = "";
 
         if (input.length < 1) {
@@ -213,28 +213,28 @@ var Base64 = {
 
         // Highlight offset 0
         if (len0 % 4 === 2) {
-            static_section = offset0.slice(0, -3);
+            staticSection = offset0.slice(0, -3);
             offset0 = "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64(static_section, alphabet).slice(0, -2)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64(staticSection, alphabet).slice(0, -2)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset0.substr(offset0.length - 3, 1) + "</span>" +
                 "<span class='hlred'>" + offset0.substr(offset0.length - 2) + "</span>";
         } else if (len0 % 4 === 3) {
-            static_section = offset0.slice(0, -2);
+            staticSection = offset0.slice(0, -2);
             offset0 = "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64(static_section, alphabet).slice(0, -1)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64(staticSection, alphabet).slice(0, -1)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset0.substr(offset0.length - 2, 1) + "</span>" +
                 "<span class='hlred'>" + offset0.substr(offset0.length - 1) + "</span>";
         } else {
-            static_section = offset0;
+            staticSection = offset0;
             offset0 = "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64(static_section, alphabet)) + "'>" +
-                static_section + "</span>";
+                Utils.escapeHtml(Utils.fromBase64(staticSection, alphabet)) + "'>" +
+                staticSection + "</span>";
         }
 
-        if (!show_variable) {
-            offset0 = static_section;
+        if (!showVariable) {
+            offset0 = staticSection;
         }
 
 
@@ -243,28 +243,28 @@ var Base64 = {
             "<span class='hlgreen'>" + offset1.substr(1, 1) + "</span>";
         offset1 = offset1.substr(2);
         if (len1 % 4 === 2) {
-            static_section = offset1.slice(0, -3);
+            staticSection = offset1.slice(0, -3);
             offset1 = padding + "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AA" + static_section, alphabet).slice(1, -2)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64("AA" + staticSection, alphabet).slice(1, -2)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset1.substr(offset1.length - 3, 1) + "</span>" +
                 "<span class='hlred'>" + offset1.substr(offset1.length - 2) + "</span>";
         } else if (len1 % 4 === 3) {
-            static_section = offset1.slice(0, -2);
+            staticSection = offset1.slice(0, -2);
             offset1 = padding + "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AA" + static_section, alphabet).slice(1, -1)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64("AA" + staticSection, alphabet).slice(1, -1)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset1.substr(offset1.length - 2, 1) + "</span>" +
                 "<span class='hlred'>" + offset1.substr(offset1.length - 1) + "</span>";
         } else {
-            static_section = offset1;
+            staticSection = offset1;
             offset1 = padding +  "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AA" + static_section, alphabet).slice(1)) + "'>" +
-                static_section + "</span>";
+                Utils.escapeHtml(Utils.fromBase64("AA" + staticSection, alphabet).slice(1)) + "'>" +
+                staticSection + "</span>";
         }
 
-        if (!show_variable) {
-            offset1 = static_section;
+        if (!showVariable) {
+            offset1 = staticSection;
         }
 
         // Highlight offset 2
@@ -272,31 +272,31 @@ var Base64 = {
             "<span class='hlgreen'>" + offset2.substr(2, 1) + "</span>";
         offset2 = offset2.substr(3);
         if (len2 % 4 === 2) {
-            static_section = offset2.slice(0, -3);
+            staticSection = offset2.slice(0, -3);
             offset2 = padding + "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AAA" + static_section, alphabet).slice(2, -2)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64("AAA" + staticSection, alphabet).slice(2, -2)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset2.substr(offset2.length - 3, 1) + "</span>" +
                 "<span class='hlred'>" + offset2.substr(offset2.length - 2) + "</span>";
         } else if (len2 % 4 === 3) {
-            static_section = offset2.slice(0, -2);
+            staticSection = offset2.slice(0, -2);
             offset2 = padding + "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AAA" + static_section, alphabet).slice(2, -2)) + "'>" +
-                static_section + "</span>" +
+                Utils.escapeHtml(Utils.fromBase64("AAA" + staticSection, alphabet).slice(2, -2)) + "'>" +
+                staticSection + "</span>" +
                 "<span class='hlgreen'>" + offset2.substr(offset2.length - 2, 1) + "</span>" +
                 "<span class='hlred'>" + offset2.substr(offset2.length - 1) + "</span>";
         } else {
-            static_section = offset2;
+            staticSection = offset2;
             offset2 = padding +  "<span data-toggle='tooltip' data-placement='top' title='" +
-                Utils.escape_html(Utils.from_base64("AAA" + static_section, alphabet).slice(2)) + "'>" +
-                static_section + "</span>";
+                Utils.escapeHtml(Utils.fromBase64("AAA" + staticSection, alphabet).slice(2)) + "'>" +
+                staticSection + "</span>";
         }
 
-        if (!show_variable) {
-            offset2 = static_section;
+        if (!showVariable) {
+            offset2 = staticSection;
         }
 
-        return (show_variable ? "Characters highlighted in <span class='hlgreen'>green</span> could change if the input is surrounded by more data." +
+        return (showVariable ? "Characters highlighted in <span class='hlgreen'>green</span> could change if the input is surrounded by more data." +
             "\nCharacters highlighted in <span class='hlred'>red</span> are for padding purposes only." +
             "\nUnhighlighted characters are <span data-toggle='tooltip' data-placement='top' title='Tooltip on left'>static</span>." +
             "\nHover over the static sections to see what they decode to on their own.\n" +
@@ -317,7 +317,7 @@ var Base64 = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_to: function(pos, args) {
+    highlightTo: function(pos, args) {
         pos[0].start = Math.floor(pos[0].start / 3 * 4);
         pos[0].end = Math.ceil(pos[0].end / 3 * 4);
         return pos;
@@ -332,7 +332,7 @@ var Base64 = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_from: function(pos, args) {
+    highlightFrom: function(pos, args) {
         pos[0].start = Math.ceil(pos[0].start / 4 * 3);
         pos[0].end = Math.floor(pos[0].end / 4 * 3);
         return pos;

src/js/operations/BitwiseOp.js

@@ -15,14 +15,14 @@ var BitwiseOp = {
      * Runs bitwise operations across the input data.
      *
      * @private
-     * @param {byte_array} input
-     * @param {byte_array} key
+     * @param {byteArray} input
+     * @param {byteArray} key
      * @param {function} func - The bitwise calculation to carry out
-     * @param {boolean} null_preserving
+     * @param {boolean} nullPreserving
      * @param {string} scheme
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    _bit_op: function (input, key, func, null_preserving, scheme) {
+    _bitOp: function (input, key, func, nullPreserving, scheme) {
         if (!key || !key.length) key = [0];
         var result = [],
             x = null,
@@ -32,9 +32,9 @@ var BitwiseOp = {
         for (var i = 0; i < input.length; i++) {
             k = key[i % key.length];
             o = input[i];
-            x = null_preserving && (o === 0 || o === k) ? o : func(o, k);
+            x = nullPreserving && (o === 0 || o === k) ? o : func(o, k);
             result.push(x);
-            if (scheme !== "Standard" && !(null_preserving && (o === 0 || o === k))) {
+            if (scheme !== "Standard" && !(nullPreserving && (o === 0 || o === k))) {
                 switch (scheme) {
                     case "Input differential":
                         key[i % key.length] = x;
@@ -69,18 +69,18 @@ var BitwiseOp = {
     /**
      * XOR operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_xor: function (input, args) {
+    runXor: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || ""),
             scheme = args[1],
-            null_preserving = args[2];
+            nullPreserving = args[2];
         
-        key = Utils.word_array_to_byte_array(key);
+        key = Utils.wordArrayToByteArray(key);
             
-        return BitwiseOp._bit_op(input, key, BitwiseOp._xor, null_preserving, scheme);
+        return BitwiseOp._bitOp(input, key, BitwiseOp._xor, nullPreserving, scheme);
     },
     
     
@@ -113,42 +113,42 @@ var BitwiseOp = {
     /**
      * XOR Brute Force operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_xor_brute: function (input, args) {
-        var key_length = parseInt(args[0], 10),
-            sample_length = args[1],
-            sample_offset = args[2],
-            null_preserving = args[3],
+    runXorBrute: function (input, args) {
+        var keyLength = parseInt(args[0], 10),
+            sampleLength = args[1],
+            sampleOffset = args[2],
+            nullPreserving = args[3],
             differential = args[4],
             crib = args[5],
-            print_key = args[6],
-            output_hex = args[7],
+            printKey = args[6],
+            outputHex = args[7],
             regex;
         
         var output = "",
             result,
-            result_utf8;
+            resultUtf8;
         
-        input = input.slice(sample_offset, sample_offset + sample_length);
+        input = input.slice(sampleOffset, sampleOffset + sampleLength);
         
         if (crib !== "") {
             regex = new RegExp(crib, "im");
         }
         
         
-        for (var key = 1, l = Math.pow(256, key_length); key < l; key++) {
-            result = BitwiseOp._bit_op(input, Utils.hex_to_byte_array(key.toString(16)), BitwiseOp._xor, null_preserving, differential);
-            result_utf8 = Utils.byte_array_to_utf8(result);
-            if (crib !== "" && result_utf8.search(regex) === -1) continue;
-            if (print_key) output += "Key = " + Utils.hex(key, (2*key_length)) + ": ";
-            if (output_hex)
-                output += Utils.byte_array_to_hex(result) + "\n";
+        for (var key = 1, l = Math.pow(256, keyLength); key < l; key++) {
+            result = BitwiseOp._bitOp(input, Utils.hexToByteArray(key.toString(16)), BitwiseOp._xor, nullPreserving, differential);
+            resultUtf8 = Utils.byteArrayToUtf8(result);
+            if (crib !== "" && resultUtf8.search(regex) === -1) continue;
+            if (printKey) output += "Key = " + Utils.hex(key, (2*keyLength)) + ": ";
+            if (outputHex)
+                output += Utils.byteArrayToHex(result) + "\n";
             else
-                output += Utils.printable(result_utf8, false) + "\n";
-            if (print_key) output += "\n";
+                output += Utils.printable(resultUtf8, false) + "\n";
+            if (printKey) output += "\n";
         }
         return output;
     },
@@ -157,72 +157,72 @@ var BitwiseOp = {
     /**
      * NOT operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_not: function (input, args) {
-        return BitwiseOp._bit_op(input, null, BitwiseOp._not);
+    runNot: function (input, args) {
+        return BitwiseOp._bitOp(input, null, BitwiseOp._not);
     },
     
     
     /**
      * AND operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_and: function (input, args) {
+    runAnd: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.word_array_to_byte_array(key);
+        key = Utils.wordArrayToByteArray(key);
         
-        return BitwiseOp._bit_op(input, key, BitwiseOp._and);
+        return BitwiseOp._bitOp(input, key, BitwiseOp._and);
     },
     
     
     /**
      * OR operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_or: function (input, args) {
+    runOr: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.word_array_to_byte_array(key);
+        key = Utils.wordArrayToByteArray(key);
         
-        return BitwiseOp._bit_op(input, key, BitwiseOp._or);
+        return BitwiseOp._bitOp(input, key, BitwiseOp._or);
     },
     
     
     /**
      * ADD operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_add: function (input, args) {
+    runAdd: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.word_array_to_byte_array(key);
+        key = Utils.wordArrayToByteArray(key);
         
-        return BitwiseOp._bit_op(input, key, BitwiseOp._add);
+        return BitwiseOp._bitOp(input, key, BitwiseOp._add);
     },
     
     
     /**
      * SUB operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_sub: function (input, args) {
+    runSub: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string || "");
-        key = Utils.word_array_to_byte_array(key);
+        key = Utils.wordArrayToByteArray(key);
         
-        return BitwiseOp._bit_op(input, key, BitwiseOp._sub);
+        return BitwiseOp._bitOp(input, key, BitwiseOp._sub);
     },
     
     

src/js/operations/ByteRepr.js

@@ -30,13 +30,13 @@ var ByteRepr = {
     /**
      * To Hex operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_hex: function(input, args) {
-        var delim = Utils.char_rep[args[0] || "Space"];
-        return Utils.to_hex(input, delim, 2);
+    runToHex: function(input, args) {
+        var delim = Utils.charRep[args[0] || "Space"];
+        return Utils.toHex(input, delim, 2);
     },
 
 
@@ -45,11 +45,11 @@ var ByteRepr = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_hex: function(input, args) {
+    runFromHex: function(input, args) {
         var delim = args[0] || "Space";
-        return Utils.from_hex(input, delim, 2);
+        return Utils.fromHex(input, delim, 2);
     },
 
 
@@ -66,8 +66,8 @@ var ByteRepr = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_charcode: function(input, args) {
-        var delim = Utils.char_rep[args[0] || "Space"],
+    runToCharcode: function(input, args) {
+        var delim = Utils.charRep[args[0] || "Space"],
             base = args[1],
             output = "",
             padding = 2,
@@ -87,11 +87,11 @@ var ByteRepr = {
                 else if (ordinal < 4294967296) padding = 8;
                 else padding = 2;
 
-                if (padding > 2) app.options.attempt_highlight = false;
+                if (padding > 2) app.options.attemptHighlight = false;
 
                 output += Utils.hex(ordinal, padding) + delim;
             } else {
-                app.options.attempt_highlight = false;
+                app.options.attemptHighlight = false;
                 output += ordinal.toString(base) + delim;
             }
         }
@@ -105,10 +105,10 @@ var ByteRepr = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_charcode: function(input, args) {
-        var delim = Utils.char_rep[args[0] || "Space"],
+    runFromCharcode: function(input, args) {
+        var delim = Utils.charRep[args[0] || "Space"],
             base = args[1],
             bites = input.split(delim),
             i = 0;
@@ -118,7 +118,7 @@ var ByteRepr = {
         }
 
         if (base !== 16) {
-            app.options.attempt_highlight = false;
+            app.options.attemptHighlight = false;
         }
 
         // Split into groups of 2 if the whole string is concatenated and
@@ -134,7 +134,7 @@ var ByteRepr = {
         for (i = 0; i < bites.length; i++) {
             latin1 += Utils.chr(parseInt(bites[i], base));
         }
-        return Utils.str_to_byte_array(latin1);
+        return Utils.strToByteArray(latin1);
     },
 
 
@@ -147,8 +147,8 @@ var ByteRepr = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_to: function(pos, args) {
-        var delim = Utils.char_rep[args[0] || "Space"],
+    highlightTo: function(pos, args) {
+        var delim = Utils.charRep[args[0] || "Space"],
             len = delim === "\r\n" ? 1 : delim.length;
 
         pos[0].start = pos[0].start * (2 + len);
@@ -172,8 +172,8 @@ var ByteRepr = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_from: function(pos, args) {
-        var delim = Utils.char_rep[args[0] || "Space"],
+    highlightFrom: function(pos, args) {
+        var delim = Utils.charRep[args[0] || "Space"],
             len = delim === "\r\n" ? 1 : delim.length,
             width = len + 2;
 
@@ -194,12 +194,12 @@ var ByteRepr = {
     /**
      * To Decimal operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_decimal: function(input, args) {
-        var delim = Utils.char_rep[args[0]];
+    runToDecimal: function(input, args) {
+        var delim = Utils.charRep[args[0]];
         return input.join(delim);
     },
 
@@ -209,16 +209,16 @@ var ByteRepr = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_decimal: function(input, args) {
-        var delim = Utils.char_rep[args[0]];
-        var byte_str = input.split(delim), output = [];
-        if (byte_str[byte_str.length-1] === "")
-            byte_str = byte_str.slice(0, byte_str.length-1);
-
-        for (var i = 0; i < byte_str.length; i++) {
-            output[i] = parseInt(byte_str[i], 10);
+    runFromDecimal: function(input, args) {
+        var delim = Utils.charRep[args[0]];
+        var byteStr = input.split(delim), output = [];
+        if (byteStr[byteStr.length-1] === "")
+            byteStr = byteStr.slice(0, byteStr.length-1);
+
+        for (var i = 0; i < byteStr.length; i++) {
+            output[i] = parseInt(byteStr[i], 10);
         }
         return output;
     },
@@ -227,12 +227,12 @@ var ByteRepr = {
     /**
      * To Binary operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_binary: function(input, args) {
-        var delim = Utils.char_rep[args[0] || "Space"],
+    runToBinary: function(input, args) {
+        var delim = Utils.charRep[args[0] || "Space"],
             output = "",
             padding = 8;
 
@@ -253,18 +253,18 @@ var ByteRepr = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_binary: function(input, args) {
+    runFromBinary: function(input, args) {
         if (args[0] !== "None") {
-            var delim_regex = Utils.regex_rep[args[0] || "Space"];
-            input = input.replace(delim_regex, "");
+            var delimRegex = Utils.regexRep[args[0] || "Space"];
+            input = input.replace(delimRegex, "");
         }
 
         var output = [];
-        var byte_len = 8;
-        for (var i = 0; i < input.length; i += byte_len) {
-            output.push(parseInt(input.substr(i, byte_len), 2));
+        var byteLen = 8;
+        for (var i = 0; i < input.length; i += byteLen) {
+            output.push(parseInt(input.substr(i, byteLen), 2));
         }
         return output;
     },
@@ -279,8 +279,8 @@ var ByteRepr = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_to_binary: function(pos, args) {
-        var delim = Utils.char_rep[args[0] || "Space"];
+    highlightToBinary: function(pos, args) {
+        var delim = Utils.charRep[args[0] || "Space"];
         pos[0].start = pos[0].start * (8 + delim.length);
         pos[0].end = pos[0].end * (8 + delim.length) - delim.length;
         return pos;
@@ -296,8 +296,8 @@ var ByteRepr = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_from_binary: function(pos, args) {
-        var delim = Utils.char_rep[args[0] || "Space"];
+    highlightFromBinary: function(pos, args) {
+        var delim = Utils.charRep[args[0] || "Space"];
         pos[0].start = pos[0].start === 0 ? 0 : Math.floor(pos[0].start / (8 + delim.length));
         pos[0].end = pos[0].end === 0 ? 0 : Math.ceil(pos[0].end / (8 + delim.length));
         return pos;
@@ -318,40 +318,40 @@ var ByteRepr = {
     /**
      * To Hex Content operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_hex_content: function(input, args) {
+    runToHexContent: function(input, args) {
         var convert = args[0];
         var spaces = args[1];
         if (convert === "All chars") {
-            var result = "|" + Utils.to_hex(input) + "|";
+            var result = "|" + Utils.toHex(input) + "|";
             if (!spaces) result = result.replace(/ /g, "");
             return result;
         }
 
         var output = "",
-            in_hex = false,
-            convert_spaces = convert === "Only special chars including spaces",
+            inHex = false,
+            convertSpaces = convert === "Only special chars including spaces",
             b;
         for (var i = 0; i < input.length; i++) {
             b = input[i];
-            if ((b === 32 && convert_spaces) || (b < 48 && b !== 32) || (b > 57 && b < 65) || (b > 90 && b < 97) || b > 122) {
-                if (!in_hex) {
+            if ((b === 32 && convertSpaces) || (b < 48 && b !== 32) || (b > 57 && b < 65) || (b > 90 && b < 97) || b > 122) {
+                if (!inHex) {
                     output += "|";
-                    in_hex = true;
+                    inHex = true;
                 } else if (spaces) output += " ";
-                output += Utils.to_hex([b]);
+                output += Utils.toHex([b]);
             } else {
-                if (in_hex) {
+                if (inHex) {
                     output += "|";
-                    in_hex = false;
+                    inHex = false;
                 }
                 output += Utils.chr(input[i]);
             }
         }
-        if (in_hex) output += "|";
+        if (inHex) output += "|";
         return output;
     },
 
@@ -361,9 +361,9 @@ var ByteRepr = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from_hex_content: function(input, args) {
+    runFromHexContent: function(input, args) {
         var regex = /\|([a-f\d ]{2,})\|/gi;
         var output = [], m, i = 0;
         while ((m = regex.exec(input))) {
@@ -372,7 +372,7 @@ var ByteRepr = {
                 output.push(Utils.ord(input[i++]));
 
             // Add match
-            var bytes = Utils.from_hex(m[1]);
+            var bytes = Utils.fromHex(m[1]);
             if (bytes) {
                 for (var a = 0; a < bytes.length;)
                     output.push(bytes[a++]);

src/js/operations/CharEnc.js

@@ -25,21 +25,21 @@ var CharEnc = {
      * @returns {string}
      */
     run: function(input, args) {
-        var input_format = args[0],
-            output_format = args[1];
+        var inputFormat = args[0],
+            outputFormat = args[1];
             
-        if (input_format === "Windows-1251") {
-            input = Utils.win1251_to_unicode(input);
+        if (inputFormat === "Windows-1251") {
+            input = Utils.win1251ToUnicode(input);
             input = CryptoJS.enc.Utf8.parse(input);
         } else {
-            input = Utils.format[input_format].parse(input);
+            input = Utils.format[inputFormat].parse(input);
         }
         
-        if (output_format === "Windows-1251") {
+        if (outputFormat === "Windows-1251") {
             input = CryptoJS.enc.Utf8.stringify(input);
-            return Utils.unicode_to_win1251(input);
+            return Utils.unicodeToWin1251(input);
         } else {
-            return Utils.format[output_format].stringify(input);
+            return Utils.format[outputFormat].stringify(input);
         }
     },
     

src/js/operations/Checksum.js

@@ -12,11 +12,11 @@ var Checksum = {
     /**
      * Fletcher-8 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_fletcher8: function(input, args) {
+    runFletcher8: function(input, args) {
         var a = 0,
             b = 0;
         
@@ -32,11 +32,11 @@ var Checksum = {
     /**
      * Fletcher-16 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_fletcher16: function(input, args) {
+    runFletcher16: function(input, args) {
         var a = 0,
             b = 0;
         
@@ -52,11 +52,11 @@ var Checksum = {
     /**
      * Fletcher-32 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_fletcher32: function(input, args) {
+    runFletcher32: function(input, args) {
         var a = 0,
             b = 0;
         
@@ -72,11 +72,11 @@ var Checksum = {
     /**
      * Fletcher-64 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_fletcher64: function(input, args) {
+    runFletcher64: function(input, args) {
         var a = 0,
             b = 0;
         
@@ -92,11 +92,11 @@ var Checksum = {
     /**
      * Adler-32 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_adler32: function(input, args) {
+    runAdler32: function(input, args) {
         var MOD_ADLER = 65521,
             a = 1,
             b = 0;
@@ -116,16 +116,16 @@ var Checksum = {
     /**
      * CRC-32 Checksum operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_crc32: function(input, args) {
-        var crc_table = window.crc_table || (window.crc_table = Checksum._gen_crc_table()),
+    runCRC32: function(input, args) {
+        var crcTable = window.crcTable || (window.crcTable = Checksum._genCRCTable()),
             crc = 0 ^ (-1);
         
         for (var i = 0; i < input.length; i++) {
-            crc = (crc >>> 8) ^ crc_table[(crc ^ input[i]) & 0xff];
+            crc = (crc >>> 8) ^ crcTable[(crc ^ input[i]) & 0xff];
         }
         
         return Utils.hex((crc ^ (-1)) >>> 0);
@@ -136,20 +136,20 @@ var Checksum = {
      * TCP/IP Checksum operation.
      *
      * @author GCHQ Contributor [1]
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      *
      * @example
      * // returns '3f2c'
-     * Checksum.run_tcp_ip([0x45,0x00,0x00,0x87,0xa3,0x1b,0x40,0x00,0x40,0x06,
+     * Checksum.runTcpIp([0x45,0x00,0x00,0x87,0xa3,0x1b,0x40,0x00,0x40,0x06,
      *                      0x00,0x00,0xac,0x11,0x00,0x04,0xac,0x11,0x00,0x03])
      *
      * // returns 'a249'
-     * Checksum.run_tcp_ip([0x45,0x00,0x01,0x11,0x3f,0x74,0x40,0x00,0x40,0x06,
+     * Checksum.runTcpIp([0x45,0x00,0x01,0x11,0x3f,0x74,0x40,0x00,0x40,0x06,
      *                      0x00,0x00,0xac,0x11,0x00,0x03,0xac,0x11,0x00,0x04])
      */
-    run_tcp_ip: function(input, args) {
+    runTCPIP: function(input, args) {
         var csum = 0;
         
         for (var i = 0; i < input.length; i++) {
@@ -172,19 +172,19 @@ var Checksum = {
      * @private
      * @returns {array}
      */
-    _gen_crc_table: function() {
+    _genCRCTable: function() {
         var c,
-            crc_table = [];
+            crcTable = [];
         
         for (var n = 0; n < 256; n++) {
             c = n;
             for (var k = 0; k < 8; k++) {
                 c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
             }
-            crc_table[n] = c;
+            crcTable[n] = c;
         }
         
-        return crc_table;
+        return crcTable;
     },
 
 };

src/js/operations/Cipher.js

@@ -53,7 +53,7 @@ var Cipher = {
      *
      * @private
      * @param {function} algo - The CryptoJS algorithm to use
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {function} args
      * @returns {string}
      */
@@ -63,8 +63,8 @@ var Cipher = {
             salt = Utils.format[args[2].option].parse(args[2].string || ""),
             mode = CryptoJS.mode[args[3]],
             padding = CryptoJS.pad[args[4]],
-            result_option = args[5].toLowerCase(),
-            output_format = args[6];
+            resultOption = args[5].toLowerCase(),
+            outputFormat = args[6];
 
         if (iv.sigBytes === 0) {
             // Use passphrase rather than key. Need to convert it to a string.
@@ -79,13 +79,13 @@ var Cipher = {
         });
 
         var result = "";
-        if (result_option === "show all") {
-            result += "Key:  " + encrypted.key.toString(Utils.format[output_format]);
-            result += "\nIV:   " + encrypted.iv.toString(Utils.format[output_format]);
-            if (encrypted.salt) result += "\nSalt: " + encrypted.salt.toString(Utils.format[output_format]);
-            result += "\n\nCiphertext: " + encrypted.ciphertext.toString(Utils.format[output_format]);
+        if (resultOption === "show all") {
+            result += "Key:  " + encrypted.key.toString(Utils.format[outputFormat]);
+            result += "\nIV:   " + encrypted.iv.toString(Utils.format[outputFormat]);
+            if (encrypted.salt) result += "\nSalt: " + encrypted.salt.toString(Utils.format[outputFormat]);
+            result += "\n\nCiphertext: " + encrypted.ciphertext.toString(Utils.format[outputFormat]);
         } else {
-            result = encrypted[result_option].toString(Utils.format[output_format]);
+            result = encrypted[resultOption].toString(Utils.format[outputFormat]);
         }
 
         return result;
@@ -97,7 +97,7 @@ var Cipher = {
      *
      * @private
      * @param {function} algo - The CryptoJS algorithm to use
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {function} args
      * @returns {string}
      */
@@ -107,15 +107,15 @@ var Cipher = {
             salt = Utils.format[args[2].option].parse(args[2].string || ""),
             mode = CryptoJS.mode[args[3]],
             padding = CryptoJS.pad[args[4]],
-            input_format = args[5],
-            output_format = args[6];
+            inputFormat = args[5],
+            outputFormat = args[6];
 
         // The ZeroPadding option causes a crash when the input length is 0
         if (!input.length) {
             return "No input";
         }
 
-        var ciphertext = Utils.format[input_format].parse(input);
+        var ciphertext = Utils.format[inputFormat].parse(input);
 
         if (iv.sigBytes === 0) {
             // Use passphrase rather than key. Need to convert it to a string.
@@ -133,7 +133,7 @@ var Cipher = {
 
         var result;
         try {
-            result = decrypted.toString(Utils.format[output_format]);
+            result = decrypted.toString(Utils.format[outputFormat]);
         } catch (err) {
             result = "Decrypt error: " + err.message;
         }
@@ -149,7 +149,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_aes_enc: function (input, args) {
+    runAesEnc: function (input, args) {
         return Cipher._enc(CryptoJS.AES, input, args);
     },
 
@@ -161,7 +161,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_aes_dec: function (input, args) {
+    runAesDec: function (input, args) {
         return Cipher._dec(CryptoJS.AES, input, args);
     },
 
@@ -173,7 +173,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_des_enc: function (input, args) {
+    runDesEnc: function (input, args) {
         return Cipher._enc(CryptoJS.DES, input, args);
     },
 
@@ -185,7 +185,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_des_dec: function (input, args) {
+    runDesDec: function (input, args) {
         return Cipher._dec(CryptoJS.DES, input, args);
     },
 
@@ -197,7 +197,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_triple_des_enc: function (input, args) {
+    runTripleDesEnc: function (input, args) {
         return Cipher._enc(CryptoJS.TripleDES, input, args);
     },
 
@@ -209,7 +209,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_triple_des_dec: function (input, args) {
+    runTripleDesDec: function (input, args) {
         return Cipher._dec(CryptoJS.TripleDES, input, args);
     },
 
@@ -221,7 +221,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_rabbit_enc: function (input, args) {
+    runRabbitEnc: function (input, args) {
         return Cipher._enc(CryptoJS.Rabbit, input, args);
     },
 
@@ -233,7 +233,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_rabbit_dec: function (input, args) {
+    runRabbitDec: function (input, args) {
         return Cipher._dec(CryptoJS.Rabbit, input, args);
     },
 
@@ -256,20 +256,20 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_blowfish_enc: function (input, args) {
+    runBlowfishEnc: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string).toString(Utils.format.Latin1),
             mode = args[1],
-            output_format = args[2];
+            outputFormat = args[2];
 
         if (key.length === 0) return "Enter a key";
 
-        var enc_hex = blowfish.encrypt(input, key, {
+        var encHex = blowfish.encrypt(input, key, {
                 outputType: 1,
                 cipherMode: Cipher.BLOWFISH_MODES.indexOf(mode)
             }),
-            enc = CryptoJS.enc.Hex.parse(enc_hex);
+            enc = CryptoJS.enc.Hex.parse(encHex);
 
-        return enc.toString(Utils.format[output_format]);
+        return enc.toString(Utils.format[outputFormat]);
     },
 
 
@@ -280,14 +280,14 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_blowfish_dec: function (input, args) {
+    runBlowfishDec: function (input, args) {
         var key = Utils.format[args[0].option].parse(args[0].string).toString(Utils.format.Latin1),
             mode = args[1],
-            input_format = args[2];
+            inputFormat = args[2];
 
         if (key.length === 0) return "Enter a key";
 
-        input = Utils.format[input_format].parse(input);
+        input = Utils.format[inputFormat].parse(input);
 
         return blowfish.decrypt(input.toString(CryptoJS.enc.Base64), key, {
             outputType: 0, // This actually means inputType. The library is weird.
@@ -314,16 +314,16 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_pbkdf2: function (input, args) {
-        var key_size = args[0] / 32,
+    runPbkdf2: function (input, args) {
+        var keySize = args[0] / 32,
             iterations = args[1],
             salt = CryptoJS.enc.Hex.parse(args[2] || ""),
-            input_format = args[3],
-            output_format = args[4],
-            passphrase = Utils.format[input_format].parse(input),
-            key = CryptoJS.PBKDF2(passphrase, salt, { keySize: key_size, iterations: iterations });
+            inputFormat = args[3],
+            outputFormat = args[4],
+            passphrase = Utils.format[inputFormat].parse(input),
+            key = CryptoJS.PBKDF2(passphrase, salt, { keySize: keySize, iterations: iterations });
 
-        return key.toString(Utils.format[output_format]);
+        return key.toString(Utils.format[outputFormat]);
     },
 
 
@@ -334,16 +334,16 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_evpkdf: function (input, args) {
-        var key_size = args[0] / 32,
+    runEvpkdf: function (input, args) {
+        var keySize = args[0] / 32,
             iterations = args[1],
             salt = CryptoJS.enc.Hex.parse(args[2] || ""),
-            input_format = args[3],
-            output_format = args[4],
-            passphrase = Utils.format[input_format].parse(input),
-            key = CryptoJS.EvpKDF(passphrase, salt, { keySize: key_size, iterations: iterations });
+            inputFormat = args[3],
+            outputFormat = args[4],
+            passphrase = Utils.format[inputFormat].parse(input),
+            key = CryptoJS.EvpKDF(passphrase, salt, { keySize: keySize, iterations: iterations });
 
-        return key.toString(Utils.format[output_format]);
+        return key.toString(Utils.format[outputFormat]);
     },
 
 
@@ -354,7 +354,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_rc4: function (input, args) {
+    runRc4: function (input, args) {
         var message = Utils.format[args[1]].parse(input),
             passphrase = Utils.format[args[0].option].parse(args[0].string),
             encrypted = CryptoJS.RC4.encrypt(message, passphrase);
@@ -376,7 +376,7 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_rc4drop: function (input, args) {
+    runRc4drop: function (input, args) {
         var message = Utils.format[args[1]].parse(input),
             passphrase = Utils.format[args[0].option].parse(args[0].string),
             drop = args[3],
@@ -394,13 +394,13 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_vigenere_enc: function (input, args) {
+    runVigenereEnc: function (input, args) {
         var alphabet = "abcdefghijklmnopqrstuvwxyz",
             key = args[0].toLowerCase(),
             output = "",
             fail = 0,
-            key_index,
-            msg_index,
+            keyIndex,
+            msgIndex,
             chr;
 
         if (!key) return "No key entered";
@@ -412,17 +412,17 @@ var Cipher = {
                 // for chars not in alphabet
                 chr = key[(i - fail) % key.length];
                 // Get the location in the vigenere square of the key char
-                key_index = alphabet.indexOf(chr);
+                keyIndex = alphabet.indexOf(chr);
                 // Get the location in the vigenere square of the message char
-                msg_index = alphabet.indexOf(input[i]);
+                msgIndex = alphabet.indexOf(input[i]);
                 // Get the encoded letter by finding the sum of indexes modulo 26 and finding
                 // the letter corresponding to that
-                output += alphabet[(key_index + msg_index) % 26];
+                output += alphabet[(keyIndex + msgIndex) % 26];
             } else if (alphabet.indexOf(input[i].toLowerCase()) >= 0) {
                 chr = key[(i - fail) % key.length].toLowerCase();
-                key_index = alphabet.indexOf(chr);
-                msg_index = alphabet.indexOf(input[i].toLowerCase());
-                output += alphabet[(key_index + msg_index) % 26].toUpperCase();
+                keyIndex = alphabet.indexOf(chr);
+                msgIndex = alphabet.indexOf(input[i].toLowerCase());
+                output += alphabet[(keyIndex + msgIndex) % 26].toUpperCase();
             } else {
                 output += input[i];
                 fail++;
@@ -441,13 +441,13 @@ var Cipher = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_vigenere_dec: function (input, args) {
+    runVigenereDec: function (input, args) {
         var alphabet = "abcdefghijklmnopqrstuvwxyz",
             key = args[0].toLowerCase(),
             output = "",
             fail = 0,
-            key_index,
-            msg_index,
+            keyIndex,
+            msgIndex,
             chr;
 
         if (!key) return "No key entered";
@@ -456,16 +456,16 @@ var Cipher = {
         for (var i = 0; i < input.length; i++) {
             if (alphabet.indexOf(input[i]) >= 0) {
                 chr = key[(i - fail) % key.length];
-                key_index = alphabet.indexOf(chr);
-                msg_index = alphabet.indexOf(input[i]);
+                keyIndex = alphabet.indexOf(chr);
+                msgIndex = alphabet.indexOf(input[i]);
                 // Subtract indexes from each other, add 26 just in case the value is negative,
                 // modulo to remove if neccessary
-                output += alphabet[(msg_index - key_index + alphabet.length ) % 26];
+                output += alphabet[(msgIndex - keyIndex + alphabet.length ) % 26];
             } else if (alphabet.indexOf(input[i].toLowerCase()) >= 0) {
                 chr = key[(i - fail) % key.length].toLowerCase();
-                key_index = alphabet.indexOf(chr);
-                msg_index = alphabet.indexOf(input[i].toLowerCase());
-                output += alphabet[(msg_index + alphabet.length - key_index) % 26].toUpperCase();
+                keyIndex = alphabet.indexOf(chr);
+                msgIndex = alphabet.indexOf(input[i].toLowerCase());
+                output += alphabet[(msgIndex + alphabet.length - keyIndex) % 26].toUpperCase();
             } else {
                 output += input[i];
                 fail++;
@@ -490,18 +490,18 @@ var Cipher = {
     /**
      * Substitute operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_substitute: function (input, args) {
-        var plaintext = Utils.str_to_byte_array(Utils.expand_alph_range(args[0]).join()),
-            ciphertext = Utils.str_to_byte_array(Utils.expand_alph_range(args[1]).join()),
+    runSubstitute: function (input, args) {
+        var plaintext = Utils.strToByteArray(Utils.expandAlphRange(args[0]).join()),
+            ciphertext = Utils.strToByteArray(Utils.expandAlphRange(args[1]).join()),
             output = [],
             index = -1;
 
         if (plaintext.length !== ciphertext.length) {
-            output = Utils.str_to_byte_array("Warning: Plaintext and Ciphertext lengths differ\n\n");
+            output = Utils.strToByteArray("Warning: Plaintext and Ciphertext lengths differ\n\n");
         }
 
         for (var i = 0; i < input.length; i++) {

src/js/operations/Code.js

@@ -29,10 +29,10 @@ var Code = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_syntax_highlight: function(input, args) {
+    runSyntaxHighlight: function(input, args) {
         var language = args[0],
-            line_nums = args[1];
-        return "<code class='prettyprint'>" + prettyPrintOne(Utils.escape_html(input), language, line_nums) + "</code>";
+            lineNums = args[1];
+        return "<code class='prettyprint'>" + prettyPrintOne(Utils.escapeHtml(input), language, lineNums) + "</code>";
     },
 
 
@@ -49,9 +49,9 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_xml_beautify: function(input, args) {
-        var indent_str = args[0];
-        return vkbeautify.xml(input, indent_str);
+    runXmlBeautify: function(input, args) {
+        var indentStr = args[0];
+        return vkbeautify.xml(input, indentStr);
     },
 
 
@@ -62,10 +62,10 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_json_beautify: function(input, args) {
-        var indent_str = args[0];
+    runJsonBeautify: function(input, args) {
+        var indentStr = args[0];
         if (!input) return "";
-        return vkbeautify.json(input, indent_str);
+        return vkbeautify.json(input, indentStr);
     },
 
 
@@ -76,9 +76,9 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_css_beautify: function(input, args) {
-        var indent_str = args[0];
-        return vkbeautify.css(input, indent_str);
+    runCssBeautify: function(input, args) {
+        var indentStr = args[0];
+        return vkbeautify.css(input, indentStr);
     },
 
 
@@ -89,9 +89,9 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sql_beautify: function(input, args) {
-        var indent_str = args[0];
-        return vkbeautify.sql(input, indent_str);
+    runSqlBeautify: function(input, args) {
+        var indentStr = args[0];
+        return vkbeautify.sql(input, indentStr);
     },
 
 
@@ -108,9 +108,9 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_xml_minify: function(input, args) {
-        var preserve_comments = args[0];
-        return vkbeautify.xmlmin(input, preserve_comments);
+    runXmlMinify: function(input, args) {
+        var preserveComments = args[0];
+        return vkbeautify.xmlmin(input, preserveComments);
     },
 
 
@@ -121,7 +121,7 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_json_minify: function(input, args) {
+    runJsonMinify: function(input, args) {
         if (!input) return "";
         return vkbeautify.jsonmin(input);
     },
@@ -134,9 +134,9 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_css_minify: function(input, args) {
-        var preserve_comments = args[0];
-        return vkbeautify.cssmin(input, preserve_comments);
+    runCssMinify: function(input, args) {
+        var preserveComments = args[0];
+        return vkbeautify.cssmin(input, preserveComments);
     },
 
 
@@ -147,7 +147,7 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sql_minify: function(input, args) {
+    runSqlMinify: function(input, args) {
         return vkbeautify.sqlmin(input);
     },
 
@@ -175,48 +175,48 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_generic_beautify: function(input, args) {
+    runGenericBeautify: function(input, args) {
         var code = input,
             t = 0,
-            preserved_tokens = [],
+            preservedTokens = [],
             m;
 
         // Remove strings
         var sstrings = /'([^'\\]|\\.)*'/g;
         while ((m = sstrings.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             sstrings.lastIndex = m.index;
         }
 
         var dstrings = /"([^"\\]|\\.)*"/g;
         while ((m = dstrings.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             dstrings.lastIndex = m.index;
         }
 
         // Remove comments
         var scomments = /\/\/[^\n\r]*/g;
         while ((m = scomments.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             scomments.lastIndex = m.index;
         }
 
         var mcomments = /\/\*[\s\S]*?\*\//gm;
         while ((m = mcomments.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             mcomments.lastIndex = m.index;
         }
 
         var hcomments = /(^|\n)#[^\n\r#]+/g;
         while ((m = hcomments.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             hcomments.lastIndex = m.index;
         }
 
         // Remove regexes
         var regexes = /\/.*?[^\\]\/[gim]{0,3}/gi;
         while ((m = regexes.exec(code))) {
-            code = preserve_token(code, m, t++);
+            code = preserveToken(code, m, t++);
             regexes.lastIndex = m.index;
         }
 
@@ -287,19 +287,19 @@ var Code = {
 
 
         // Replace preserved tokens
-        var ptokens = /###preserved_token(\d+)###/g;
+        var ptokens = /###preservedToken(\d+)###/g;
         while ((m = ptokens.exec(code))) {
             var ti = parseInt(m[1], 10);
-            code = code.substring(0, m.index) + preserved_tokens[ti] + code.substring(m.index + m[0].length);
+            code = code.substring(0, m.index) + preservedTokens[ti] + code.substring(m.index + m[0].length);
             ptokens.lastIndex = m.index;
         }
 
         return code;
 
-        function preserve_token(str, match, t) {
-            preserved_tokens[t] = match[0];
+        function preserveToken(str, match, t) {
+            preservedTokens[t] = match[0];
             return str.substring(0, match.index) +
-                "###preserved_token" + t + "###" +
+                "###preservedToken" + t + "###" +
                 str.substring(match.index + match[0].length);
         }
     },
@@ -325,7 +325,7 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_xpath:function(input, args) {
+    runXpath:function(input, args) {
         var query = args[0],
             delimiter = args[1];
 
@@ -344,7 +344,7 @@ var Code = {
         }
 
         var serializer = new XMLSerializer();
-        var node_to_string = function(node) {
+        var nodeToString = function(node) {
             switch (node.nodeType) {
                 case Node.ELEMENT_NODE: return serializer.serializeToString(node);
                 case Node.ATTRIBUTE_NODE: return node.value;
@@ -357,7 +357,7 @@ var Code = {
         return Object.keys(result).map(function(key) {
             return result[key];
         }).slice(0, -1) // all values except last (length)
-        .map(node_to_string)
+        .map(nodeToString)
         .join(delimiter);
     },
 
@@ -382,7 +382,7 @@ var Code = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_css_query: function(input, args) {
+    runCssQuery: function(input, args) {
         var query = args[0],
             delimiter = args[1];
 
@@ -400,7 +400,7 @@ var Code = {
             return "Invalid CSS Selector. Details:\n" + err.message;
         }
 
-        var node_to_string = function(node) {
+        var nodeToString = function(node) {
             switch (node.nodeType) {
                 case Node.ELEMENT_NODE: return node.outerHTML;
                 case Node.ATTRIBUTE_NODE: return node.value;
@@ -415,7 +415,7 @@ var Code = {
             .map(function(_, i) {
                 return result[i];
             })
-            .map(node_to_string)
+            .map(nodeToString)
             .join(delimiter);
     },
 

src/js/operations/Compress.js

@@ -44,11 +44,11 @@ var Compress = {
     /**
      * Raw Deflate operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_raw_deflate: function(input, args) {
+    runRawDeflate: function(input, args) {
         var deflate = new Zlib.RawDeflate(input, {
             compressionType: Compress.RAW_COMPRESSION_TYPE_LOOKUP[args[0]]
         });
@@ -81,20 +81,20 @@ var Compress = {
      * @default
      */
     RAW_BUFFER_TYPE_LOOKUP: {
-        "Adaptive"  : Zlib.RawInflate.BufferType.ADAPTIVE,
-        "Block"     : Zlib.RawInflate.BufferType.BLOCK,
+        "Adaptive" : Zlib.RawInflate.BufferType.ADAPTIVE,
+        "Block"    : Zlib.RawInflate.BufferType.BLOCK,
     },
     
     /**
      * Raw Inflate operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_raw_inflate: function(input, args) {
+    runRawInflate: function(input, args) {
         // Deal with character encoding issues
-        input = Utils.str_to_byte_array(Utils.byte_array_to_utf8(input));
+        input = Utils.strToByteArray(Utils.byteArrayToUtf8(input));
         var inflate = new Zlib.RawInflate(input, {
                 index: args[0],
                 bufferSize: args[1],
@@ -140,11 +140,11 @@ var Compress = {
     /**
      * Zlib Deflate operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_zlib_deflate: function(input, args) {
+    runZlibDeflate: function(input, args) {
         var deflate = new Zlib.Deflate(input, {
             compressionType: Compress.ZLIB_COMPRESSION_TYPE_LOOKUP[args[0]]
         });
@@ -164,13 +164,13 @@ var Compress = {
     /**
      * Zlib Inflate operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_zlib_inflate: function(input, args) {
+    runZlibInflate: function(input, args) {
         // Deal with character encoding issues
-        input = Utils.str_to_byte_array(Utils.byte_array_to_utf8(input));
+        input = Utils.strToByteArray(Utils.byteArrayToUtf8(input));
         var inflate = new Zlib.Inflate(input, {
             index: args[0],
             bufferSize: args[1],
@@ -191,11 +191,11 @@ var Compress = {
     /**
      * Gzip operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_gzip: function(input, args) {
+    runGzip: function(input, args) {
         var filename = args[1],
             comment = args[2],
             options = {
@@ -224,13 +224,13 @@ var Compress = {
     /**
      * Gunzip operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_gunzip: function(input, args) {
+    runGunzip: function(input, args) {
         // Deal with character encoding issues
-        input = Utils.str_to_byte_array(Utils.byte_array_to_utf8(input));
+        input = Utils.strToByteArray(Utils.byteArrayToUtf8(input));
         var gunzip = new Zlib.Gunzip(input);
         return Array.prototype.slice.call(gunzip.decompress());
     },
@@ -262,15 +262,15 @@ var Compress = {
     /**
      * Zip operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_pkzip: function(input, args) {
-        var password = Utils.str_to_byte_array(args[2]),
+    runPkzip: function(input, args) {
+        var password = Utils.strToByteArray(args[2]),
             options = {
-                filename: Utils.str_to_byte_array(args[0]),
-                comment: Utils.str_to_byte_array(args[1]),
+                filename: Utils.strToByteArray(args[0]),
+                comment: Utils.strToByteArray(args[1]),
                 compressionMethod: Compress.ZIP_COMPRESSION_METHOD_LOOKUP[args[3]],
                 os: Compress.ZIP_OS_LOOKUP[args[4]],
                 deflateOption: {
@@ -295,13 +295,13 @@ var Compress = {
     /**
      * Unzip operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_pkunzip: function(input, args) {
+    runPkunzip: function(input, args) {
         var options = {
-                password: Utils.str_to_byte_array(args[0]),
+                password: Utils.strToByteArray(args[0]),
                 verify: args[1]
             },
             file = "",
@@ -313,7 +313,7 @@ var Compress = {
         
         window.uzip = unzip;
         for (var i = 0; i < filenames.length; i++) {
-            file = Utils.byte_array_to_utf8(unzip.decompress(filenames[i]));
+            file = Utils.byteArrayToUtf8(unzip.decompress(filenames[i]));
             output += "<div class='panel panel-default'>" +
                 "<div class='panel-heading' role='tab' id='heading" + i + "'>" +
                 "<h4 class='panel-title'>" +
@@ -322,7 +322,7 @@ var Compress = {
                 filenames[i] + "<span class='pull-right'>" + file.length.toLocaleString() + " bytes</span></a></h4></div>" +
                 "<div id='collapse" + i + "' class='panel-collapse collapse' role='tabpanel' aria-labelledby='heading" + i + "'>" +
                 "<div class='panel-body'>" +
-                Utils.escape_html(file) + "</div></div></div>";
+                Utils.escapeHtml(file) + "</div></div></div>";
         }
         
         return output + "</div>";
@@ -332,17 +332,17 @@ var Compress = {
     /**
      * Bzip2 Decompress operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_bzip2_decompress: function(input, args) {
+    runBzip2Decompress: function(input, args) {
         var compressed = new Uint8Array(input),
-            bzip2_reader,
+            bzip2Reader,
             plain = "";
             
-        bzip2_reader = bzip2.array(compressed);
-        plain = bzip2.simple(bzip2_reader);
+        bzip2Reader = bzip2.array(compressed);
+        plain = bzip2.simple(bzip2Reader);
         return plain;
     },
     

src/js/operations/Convert.js

@@ -64,12 +64,12 @@ var Convert = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_distance: function (input, args) {
-        var input_units = args[0],
-            output_units = args[1];
+    runDistance: function (input, args) {
+        var inputUnits = args[0],
+            outputUnits = args[1];
 
-        input = input * Convert.DISTANCE_FACTOR[input_units];
-        return input / Convert.DISTANCE_FACTOR[output_units];
+        input = input * Convert.DISTANCE_FACTOR[inputUnits];
+        return input / Convert.DISTANCE_FACTOR[outputUnits];
         // TODO Remove rounding errors (e.g. 1.000000000001)
     },
 
@@ -145,12 +145,12 @@ var Convert = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_data_size: function (input, args) {
-        var input_units = args[0],
-            output_units = args[1];
+    runDataSize: function (input, args) {
+        var inputUnits = args[0],
+            outputUnits = args[1];
 
-        input = input * Convert.DATA_FACTOR[input_units];
-        return input / Convert.DATA_FACTOR[output_units];
+        input = input * Convert.DATA_FACTOR[inputUnits];
+        return input / Convert.DATA_FACTOR[outputUnits];
     },
 
 
@@ -225,12 +225,12 @@ var Convert = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_area: function (input, args) {
-        var input_units = args[0],
-            output_units = args[1];
+    runArea: function (input, args) {
+        var inputUnits = args[0],
+            outputUnits = args[1];
 
-        input = input * Convert.AREA_FACTOR[input_units];
-        return input / Convert.AREA_FACTOR[output_units];
+        input = input * Convert.AREA_FACTOR[inputUnits];
+        return input / Convert.AREA_FACTOR[outputUnits];
     },
 
 
@@ -336,12 +336,12 @@ var Convert = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_mass: function (input, args) {
-        var input_units = args[0],
-            output_units = args[1];
+    runMass: function (input, args) {
+        var inputUnits = args[0],
+            outputUnits = args[1];
 
-        input = input * Convert.MASS_FACTOR[input_units];
-        return input / Convert.MASS_FACTOR[output_units];
+        input = input * Convert.MASS_FACTOR[inputUnits];
+        return input / Convert.MASS_FACTOR[outputUnits];
     },
 
 
@@ -401,12 +401,12 @@ var Convert = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_speed: function (input, args) {
-        var input_units = args[0],
-            output_units = args[1];
+    runSpeed: function (input, args) {
+        var inputUnits = args[0],
+            outputUnits = args[1];
 
-        input = input * Convert.SPEED_FACTOR[input_units];
-        return input / Convert.SPEED_FACTOR[output_units];
+        input = input * Convert.SPEED_FACTOR[inputUnits];
+        return input / Convert.SPEED_FACTOR[outputUnits];
     },
 
 };

src/js/operations/DateTime.js

@@ -24,7 +24,7 @@ var DateTime = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_from_unix_timestamp: function(input, args) {
+    runFromUnixTimestamp: function(input, args) {
         var units = args[0],
             d;
         
@@ -55,7 +55,7 @@ var DateTime = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_to_unix_timestamp: function(input, args) {
+    runToUnixTimestamp: function(input, args) {
         var units = args[0],
             d = moment(input);
         
@@ -130,21 +130,21 @@ var DateTime = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_translate_format: function(input, args) {
-        var input_format = args[1],
-            input_timezone = args[2],
-            output_format = args[3],
-            output_timezone = args[4],
+    runTranslateFormat: function(input, args) {
+        var inputFormat = args[1],
+            inputTimezone = args[2],
+            outputFormat = args[3],
+            outputTimezone = args[4],
             date;
 
         try {
-            date = moment.tz(input, input_format, input_timezone);
+            date = moment.tz(input, inputFormat, inputTimezone);
             if (!date || date.format() === "Invalid date") throw Error;
         } catch(err) {
             return "Invalid format.\n\n" + DateTime.FORMAT_EXAMPLES;
         }
         
-        return date.tz(output_timezone).format(output_format);
+        return date.tz(outputTimezone).format(outputFormat);
     },
     
     
@@ -155,14 +155,14 @@ var DateTime = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_parse: function(input, args) {
-        var input_format = args[1],
-            input_timezone = args[2],
+    runParse: function(input, args) {
+        var inputFormat = args[1],
+            inputTimezone = args[2],
             date,
             output = "";
             
         try {
-            date = moment.tz(input, input_format, input_timezone);
+            date = moment.tz(input, inputFormat, inputTimezone);
             if (!date || date.format() === "Invalid date") throw Error;
         } catch(err) {
             return "Invalid format.\n\n" + DateTime.FORMAT_EXAMPLES;

src/js/operations/Endian.js

@@ -32,39 +32,39 @@ var Endian = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_swap_endianness: function(input, args) {
-        var data_format = args[0],
-            word_length = args[1],
-            pad_incomplete_words = args[2],
+    runSwapEndianness: function(input, args) {
+        var dataFormat = args[0],
+            wordLength = args[1],
+            padIncompleteWords = args[2],
             data = [],
             result = [],
             words = [],
             i = 0,
             j = 0;
             
-        if (word_length <= 0) {
+        if (wordLength <= 0) {
             return "Word length must be greater than 0";
         }
             
         // Convert input to raw data based on specified data format
-        switch (data_format) {
+        switch (dataFormat) {
             case "Hex":
-                data = Utils.from_hex(input);
+                data = Utils.fromHex(input);
                 break;
             case "Raw":
-                data = Utils.str_to_byte_array(input);
+                data = Utils.strToByteArray(input);
                 break;
             default:
                 data = input;
         }
         
         // Split up into words
-        for (i = 0; i < data.length; i += word_length) {
-            var word = data.slice(i, i + word_length);
+        for (i = 0; i < data.length; i += wordLength) {
+            var word = data.slice(i, i + wordLength);
             
             // Pad word if too short
-            if (pad_incomplete_words && word.length < word_length){
-                for (j = word.length; j < word_length; j++) {
+            if (padIncompleteWords && word.length < wordLength){
+                for (j = word.length; j < wordLength; j++) {
                     word.push(0);
                 }
             }
@@ -81,11 +81,11 @@ var Endian = {
         }
         
         // Convert data back to specified data format
-        switch (data_format) {
+        switch (dataFormat) {
             case "Hex":
-                return Utils.to_hex(result);
+                return Utils.toHex(result);
             case "Raw":
-                return Utils.byte_array_to_utf8(result);
+                return Utils.byteArrayToUtf8(result);
             default:
                 return result;
         }

src/js/operations/Entropy.js

@@ -18,14 +18,14 @@ var Entropy = {
     /**
      * Entropy operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {html}
      */
-    run_entropy: function(input, args) {
-        var chunk_size = args[0],
+    runEntropy: function(input, args) {
+        var chunkSize = args[0],
             output = "",
-            entropy = Entropy._calc_entropy(input);
+            entropy = Entropy._calcEntropy(input);
         
         output += "Shannon entropy: " + entropy + "\n" +
             "<br><canvas id='chart-area'></canvas><br>\n" +
@@ -35,14 +35,14 @@ var Entropy = {
             "The following results show the entropy of chunks of the input data. Chunks with particularly high entropy could suggest encrypted or compressed sections.\n\n" +
             "<br><script>\
                 var canvas = document.getElementById('chart-area'),\
-                    parent_rect = canvas.parentNode.getBoundingClientRect(),\
+                    parentRect = canvas.parentNode.getBoundingClientRect(),\
                     entropy = " + entropy + ",\
-                    height = parent_rect.height * 0.25;\
+                    height = parentRect.height * 0.25;\
                 \
-                canvas.width = parent_rect.width * 0.95;\
+                canvas.width = parentRect.width * 0.95;\
                 canvas.height = height > 150 ? 150 : height;\
                 \
-                CanvasComponents.draw_scale_bar(canvas, entropy, 8, [\
+                CanvasComponents.drawScaleBar(canvas, entropy, 8, [\
                     {\
                         label: 'English text',\
                         min: 3.5,\
@@ -55,11 +55,11 @@ var Entropy = {
                 ]);\
             </script>";
         
-        var chunk_entropy = 0;
-        if (chunk_size !== 0) {
-            for (var i = 0; i < input.length; i += chunk_size) {
-                chunk_entropy = Entropy._calc_entropy(input.slice(i, i+chunk_size));
-                output += "Bytes " + i + " to " + (i+chunk_size) + ": " + chunk_entropy + "\n";
+        var chunkEntropy = 0;
+        if (chunkSize !== 0) {
+            for (var i = 0; i < input.length; i += chunkSize) {
+                chunkEntropy = Entropy._calcEntropy(input.slice(i, i+chunkSize));
+                output += "Bytes " + i + " to " + (i+chunkSize) + ": " + chunkEntropy + "\n";
             }
         } else {
             output += "Chunk size cannot be 0.";
@@ -78,17 +78,17 @@ var Entropy = {
     /**
      * Frequency distribution operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {html}
      */
-    run_freq_distrib: function (input, args) {
+    runFreqDistrib: function (input, args) {
         if (!input.length) return "No data";
         
         var distrib = new Array(256),
             percentages = new Array(256),
             len = input.length,
-            show_zeroes = args[0];
+            showZeroes = args[0];
         
         // Initialise distrib to 0
         for (var i = 0; i < 256; i++) {
@@ -115,19 +115,19 @@ var Entropy = {
             "\n\nByte   Percentage\n" +
             "<script>\
                 var canvas = document.getElementById('chart-area'),\
-                    parent_rect = canvas.parentNode.getBoundingClientRect(),\
+                    parentRect = canvas.parentNode.getBoundingClientRect(),\
                     scores = " + JSON.stringify(percentages) + ";\
                 \
-                canvas.width = parent_rect.width * 0.95;\
-                canvas.height = parent_rect.height * 0.9;\
+                canvas.width = parentRect.width * 0.95;\
+                canvas.height = parentRect.height * 0.9;\
                 \
-                CanvasComponents.draw_bar_chart(canvas, scores, 'Byte', 'Frequency %', 16, 6);\
+                CanvasComponents.drawBarChart(canvas, scores, 'Byte', 'Frequency %', 16, 6);\
             </script>";
                 
         for (i = 0; i < 256; i++) {
-            if (distrib[i] || show_zeroes) {
+            if (distrib[i] || showZeroes) {
                 output += " " + Utils.hex(i, 2) + "    (" +
-                        Utils.pad_right(percentages[i].toFixed(2).replace(".00", "") + "%)", 8) +
+                        Utils.padRight(percentages[i].toFixed(2).replace(".00", "") + "%)", 8) +
                         Array(Math.ceil(percentages[i])+1).join("|") + "\n";
             }
         }
@@ -140,13 +140,13 @@ var Entropy = {
      * Calculates the Shannon entropy for a given chunk of data.
      *
      * @private
-     * @param {byte_array} data
+     * @param {byteArray} data
      * @returns {number}
      */
-    _calc_entropy: function(data) {
+    _calcEntropy: function(data) {
         var prob = [],
             uniques = data.unique(),
-            str = Utils.byte_array_to_chars(data);
+            str = Utils.byteArrayToChars(data);
             
         for (var i = 0; i < uniques.length; i++) {
             prob.push(str.count(Utils.chr(uniques[i])) / data.length);

src/js/operations/Extract.js

@@ -14,25 +14,25 @@ var Extract = {
      *
      * @private
      * @param {string} input
-     * @param {RegExp} search_regex
-     * @param {RegExp} remove_regex - A regular expression defining results to remove from the
+     * @param {RegExp} searchRegex
+     * @param {RegExp} removeRegex - A regular expression defining results to remove from the
      *      final list
-     * @param {boolean} include_total - Whether or not to include the total number of results
+     * @param {boolean} includeTotal - Whether or not to include the total number of results
      * @returns {string}
      */
-    _search: function(input, search_regex, remove_regex, include_total) {
+    _search: function(input, searchRegex, removeRegex, includeTotal) {
         var output = "",
             total = 0,
             match;
             
-        while ((match = search_regex.exec(input))) {
-            if (remove_regex && remove_regex.test(match[0]))
+        while ((match = searchRegex.exec(input))) {
+            if (removeRegex && removeRegex.test(match[0]))
                 continue;
             total++;
             output += match[0] + "\n";
         }
         
-        if (include_total)
+        if (includeTotal)
             output = "Total found: " + total + "\n\n" + output;
             
         return output;
@@ -57,13 +57,13 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_strings: function(input, args) {
-        var min_len = args[0] || Extract.MIN_STRING_LEN,
-            display_total = args[1],
+    runStrings: function(input, args) {
+        var minLen = args[0] || Extract.MIN_STRING_LEN,
+            displayTotal = args[1],
             strings = "[A-Z\\d/\\-:.,_$%'\"()<>= !\\[\\]{}@]",
-            regex = new RegExp(strings + "{" + min_len + ",}", "ig");
+            regex = new RegExp(strings + "{" + minLen + ",}", "ig");
             
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -90,37 +90,37 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_ip: function(input, args) {
-        var include_ipv4  = args[0],
-            include_ipv6  = args[1],
-            remove_local  = args[2],
-            display_total = args[3],
+    runIp: function(input, args) {
+        var includeIpv4  = args[0],
+            includeIpv6  = args[1],
+            removeLocal  = args[2],
+            displayTotal = args[3],
             ipv4 = "(?:(?:\\d|[01]?\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d\\d|\\d)(?:\\/\\d{1,2})?",
             ipv6 = "((?=.*::)(?!.*::.+::)(::)?([\\dA-F]{1,4}:(:|\\b)|){5}|([\\dA-F]{1,4}:){6})((([\\dA-F]{1,4}((?!\\3)::|:\\b|(?![\\dA-F])))|(?!\\2\\3)){2}|(((2[0-4]|1\\d|[1-9])?\\d|25[0-5])\\.?\\b){4})",
             ips  = "";
         
-        if (include_ipv4 && include_ipv6) {
+        if (includeIpv4 && includeIpv6) {
             ips = ipv4 + "|" + ipv6;
-        } else if (include_ipv4) {
+        } else if (includeIpv4) {
             ips = ipv4;
-        } else if (include_ipv6) {
+        } else if (includeIpv6) {
             ips = ipv6;
         }
         
         if (ips) {
             var regex = new RegExp(ips, "ig");
             
-            if (remove_local) {
+            if (removeLocal) {
                 var ten = "10\\..+",
                     oneninetwo = "192\\.168\\..+",
                     oneseventwo = "172\\.(?:1[6-9]|2\\d|3[01])\\..+",
                     onetwoseven = "127\\..+",
-                    remove_regex = new RegExp("^(?:" + ten + "|" + oneninetwo +
+                    removeRegex = new RegExp("^(?:" + ten + "|" + oneninetwo +
                         "|" + oneseventwo + "|" + onetwoseven + ")");
                         
-                return Extract._search(input, regex, remove_regex, display_total);
+                return Extract._search(input, regex, removeRegex, displayTotal);
             } else {
-                return Extract._search(input, regex, null, display_total);
+                return Extract._search(input, regex, null, displayTotal);
             }
         } else {
             return "";
@@ -135,11 +135,11 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_email: function(input, args) {
-        var display_total = args[0],
+    runEmail: function(input, args) {
+        var displayTotal = args[0],
             regex = /\w[-.\w]*@[-\w]+(?:\.[-\w]+)*\.[A-Z]{2,4}/ig;
             
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -150,11 +150,11 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_mac: function(input, args) {
-        var display_total = args[0],
+    runMac: function(input, args) {
+        var displayTotal = args[0],
             regex = /[A-F\d]{2}(?:[:-][A-F\d]{2}){5}/ig;
             
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -165,8 +165,8 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_urls: function(input, args) {
-        var display_total = args[0],
+    runUrls: function(input, args) {
+        var displayTotal = args[0],
             protocol = "[A-Z]+://",
             hostname = "[-\\w]+(?:\\.\\w[-\\w]*)+",
             port = ":\\d+",
@@ -175,7 +175,7 @@ var Extract = {
         path += "(?:[.!,?]+[^.!,?;\"'<>()\\[\\]{}\\s\\x7F-\\xFF]+)*";
         var regex = new RegExp(protocol + hostname + "(?:" + port +
             ")?(?:" + path + ")?", "ig");
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -186,14 +186,14 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_domains: function(input, args) {
-        var display_total = args[0],
+    runDomains: function(input, args) {
+        var displayTotal = args[0],
             protocol = "https?://",
             hostname = "[-\\w\\.]+",
             tld = "\\.(?:com|net|org|biz|info|co|uk|onion|int|mobi|name|edu|gov|mil|eu|ac|ae|af|de|ca|ch|cn|cy|es|gb|hk|il|in|io|tv|me|nl|no|nz|ro|ru|tr|us|az|ir|kz|uz|pk)+",
             regex = new RegExp("(?:" + protocol + ")?" + hostname + tld, "ig");
         
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -215,29 +215,29 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_file_paths: function(input, args) {
-        var include_win_path = args[0],
-            include_unix_path = args[1],
-            display_total = args[2],
-            win_drive = "[A-Z]:\\\\",
-            win_name = "[A-Z\\d][A-Z\\d\\- '_\\(\\)]{0,61}",
-            win_ext = "[A-Z\\d]{1,6}",
-            win_path = win_drive + "(?:" + win_name + "\\\\?)*" + win_name +
-                "(?:\\." + win_ext + ")?",
-            unix_path = "(?:/[A-Z\\d.][A-Z\\d\\-.]{0,61})+",
-            file_paths = "";
+    runFilePaths: function(input, args) {
+        var includeWinPath = args[0],
+            includeUnixPath = args[1],
+            displayTotal = args[2],
+            winDrive = "[A-Z]:\\\\",
+            winName = "[A-Z\\d][A-Z\\d\\- '_\\(\\)]{0,61}",
+            winExt = "[A-Z\\d]{1,6}",
+            winPath = winDrive + "(?:" + winName + "\\\\?)*" + winName +
+                "(?:\\." + winExt + ")?",
+            unixPath = "(?:/[A-Z\\d.][A-Z\\d\\-.]{0,61})+",
+            filePaths = "";
         
-        if (include_win_path && include_unix_path) {
-            file_paths = win_path + "|" + unix_path;
-        } else if (include_win_path) {
-            file_paths = win_path;
-        } else if (include_unix_path) {
-            file_paths = unix_path;
+        if (includeWinPath && includeUnixPath) {
+            filePaths = winPath + "|" + unixPath;
+        } else if (includeWinPath) {
+            filePaths = winPath;
+        } else if (includeUnixPath) {
+            filePaths = unixPath;
         }
         
-        if (file_paths) {
-            var regex = new RegExp(file_paths, "ig");
-            return Extract._search(input, regex, null, display_total);
+        if (filePaths) {
+            var regex = new RegExp(filePaths, "ig");
+            return Extract._search(input, regex, null, displayTotal);
         } else {
             return "";
         }
@@ -251,14 +251,14 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_dates: function(input, args) {
-        var display_total = args[0],
+    runDates: function(input, args) {
+        var displayTotal = args[0],
             date1 = "(?:19|20)\\d\\d[- /.](?:0[1-9]|1[012])[- /.](?:0[1-9]|[12][0-9]|3[01])", // yyyy-mm-dd
             date2 = "(?:0[1-9]|[12][0-9]|3[01])[- /.](?:0[1-9]|1[012])[- /.](?:19|20)\\d\\d", // dd/mm/yyyy
             date3 = "(?:0[1-9]|1[012])[- /.](?:0[1-9]|[12][0-9]|3[01])[- /.](?:19|20)\\d\\d", // mm/dd/yyyy
             regex = new RegExp(date1 + "|" + date2 + "|" + date3, "ig");
             
-        return Extract._search(input, regex, null, display_total);
+        return Extract._search(input, regex, null, displayTotal);
     },
     
     
@@ -269,28 +269,28 @@ var Extract = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_all_idents: function(input, args) {
+    runAllIdents: function(input, args) {
         var output = "";
         output += "IP addresses\n";
-        output += Extract.run_ip(input, [true, true, false]);
+        output += Extract.runIp(input, [true, true, false]);
         
         output += "\nEmail addresses\n";
-        output += Extract.run_email(input, []);
+        output += Extract.runEmail(input, []);
         
         output += "\nMAC addresses\n";
-        output += Extract.run_mac(input, []);
+        output += Extract.runMac(input, []);
         
         output += "\nURLs\n";
-        output += Extract.run_urls(input, []);
+        output += Extract.runUrls(input, []);
         
         output += "\nDomain names\n";
-        output += Extract.run_domains(input, []);
+        output += Extract.runDomains(input, []);
         
         output += "\nFile paths\n";
-        output += Extract.run_file_paths(input, [true, true]);
+        output += Extract.runFilePaths(input, [true, true]);
         
         output += "\nDates\n";
-        output += Extract.run_dates(input, []);
+        output += Extract.runDates(input, []);
         return output;
     },
 

src/js/operations/FileType.js

@@ -12,12 +12,12 @@ var FileType = {
     /**
      * Detect File Type operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_detect: function(input, args) {
-        var type = FileType._magic_type(input);
+    runDetect: function(input, args) {
+        var type = FileType._magicType(input);
 
         if (!type) {
             return "Unknown file type. Have you tried checking the entropy of this data to determine whether it might be encrypted or compressed?";
@@ -43,26 +43,26 @@ var FileType = {
     /**
      * Scan for Embedded Files operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_scan_for_embedded_files: function(input, args) {
+    runScanForEmbeddedFiles: function(input, args) {
         var output = "Scanning data for 'magic bytes' which may indicate embedded files. The following results may be false positives and should not be treat as reliable. Any suffiently long file is likely to contain these magic bytes coincidentally.\n",
             type,
-            ignore_common = args[0],
-            common_exts = ["ico", "ttf", ""],
-            num_found = 0,
-            num_common_found = 0;
+            ignoreCommon = args[0],
+            commonExts = ["ico", "ttf", ""],
+            numFound = 0,
+            numCommonFound = 0;
 
         for (var i = 0; i < input.length; i++) {
-            type = FileType._magic_type(input.slice(i));
+            type = FileType._magicType(input.slice(i));
             if (type) {
-                if (ignore_common && common_exts.indexOf(type.ext) > -1) {
-                    num_common_found++;
+                if (ignoreCommon && commonExts.indexOf(type.ext) > -1) {
+                    numCommonFound++;
                     continue;
                 }
-                num_found++;
+                numFound++;
                 output += "\nOffset " + i + " (0x" + Utils.hex(i) + "):\n" +
                     "  File extension: " + type.ext + "\n" +
                     "  MIME type:      " + type.mime + "\n";
@@ -73,13 +73,13 @@ var FileType = {
             }
         }
 
-        if (num_found === 0) {
+        if (numFound === 0) {
             output += "\nNo embedded files were found.";
         }
 
-        if (num_common_found > 0) {
-            output += "\n\n" + num_common_found;
-            output += num_common_found === 1 ?
+        if (numCommonFound > 0) {
+            output += "\n\n" + numCommonFound;
+            output += numCommonFound === 1 ?
                 " file type was detected that has a common byte sequence. This is likely to be a false positive." :
                 " file types were detected that have common byte sequences. These are likely to be false positives.";
             output += " Run this operation with the 'Ignore common byte sequences' option unchecked to see details.";
@@ -94,13 +94,13 @@ var FileType = {
      * extension and mime type.
      *
      * @private
-     * @param {byte_array} buf
+     * @param {byteArray} buf
      * @returns {Object} type
      * @returns {string} type.ext - File extension
      * @returns {string} type.mime - Mime type
      * @returns {string} [type.desc] - Description
      */
-    _magic_type: function (buf) {
+    _magicType: function (buf) {
         if (!(buf && buf.length > 1)) {
             return null;
         }

src/js/operations/HTML.js

@@ -27,35 +27,35 @@ var HTML = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_entity: function(input, args) {
-        var convert_all = args[0],
+    runToEntity: function(input, args) {
+        var convertAll = args[0],
             numeric = args[1] === "Numeric entities",
             hexa = args[1] === "Hex entities";
 
-        var charcodes = Utils.str_to_charcode(input);
+        var charcodes = Utils.strToCharcode(input);
         var output = "";
 
         for (var i = 0; i < charcodes.length; i++) {
-            if (convert_all && numeric) {
+            if (convertAll && numeric) {
                 output += "&#" + charcodes[i] + ";";
-            } else if (convert_all && hexa) {
+            } else if (convertAll && hexa) {
                 output += "&#x" + Utils.hex(charcodes[i]) + ";";
-            } else if (convert_all) {
-                output += HTML._byte_to_entity[charcodes[i]] || "&#" + charcodes[i] + ";";
+            } else if (convertAll) {
+                output += HTML._byteToEntity[charcodes[i]] || "&#" + charcodes[i] + ";";
             } else if (numeric) {
-                if (charcodes[i] > 255 || HTML._byte_to_entity.hasOwnProperty(charcodes[i])) {
+                if (charcodes[i] > 255 || HTML._byteToEntity.hasOwnProperty(charcodes[i])) {
                     output += "&#" + charcodes[i] + ";";
                 } else {
                     output += Utils.chr(charcodes[i]);
                 }
             } else if (hexa) {
-                if (charcodes[i] > 255 || HTML._byte_to_entity.hasOwnProperty(charcodes[i])) {
+                if (charcodes[i] > 255 || HTML._byteToEntity.hasOwnProperty(charcodes[i])) {
                     output += "&#x" + Utils.hex(charcodes[i]) + ";";
                 } else {
                     output += Utils.chr(charcodes[i]);
                 }
             } else {
-                output += HTML._byte_to_entity[charcodes[i]] || (
+                output += HTML._byteToEntity[charcodes[i]] || (
                     charcodes[i] > 255 ?
                         "&#" + charcodes[i] + ";" :
                         Utils.chr(charcodes[i])
@@ -73,7 +73,7 @@ var HTML = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_from_entity: function(input, args) {
+    runFromEntity: function(input, args) {
         var regex = /&(#?x?[a-zA-Z0-9]{1,8});/g,
             output = "",
             m,
@@ -85,7 +85,7 @@ var HTML = {
                 output += input[i++];
 
             // Add match
-            var bite = HTML._entity_to_byte[m[1]];
+            var bite = HTML._entityToByte[m[1]];
             if (bite) {
                 output += Utils.chr(bite);
             } else if (!bite && m[1][0] === "#" && m[1].length > 1 && /^#\d{1,5}$/.test(m[1])) {
@@ -130,17 +130,17 @@ var HTML = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_strip_tags: function(input, args) {
-        var remove_indentation = args[0],
-            remove_line_breaks = args[1];
+    runStripTags: function(input, args) {
+        var removeIndentation = args[0],
+            removeLineBreaks = args[1];
 
-        input = Utils.strip_html_tags(input);
+        input = Utils.stripHtmlTags(input);
 
-        if (remove_indentation) {
+        if (removeIndentation) {
             input = input.replace(/\n[ \f\t]+/g, "\n");
         }
 
-        if (remove_line_breaks) {
+        if (removeLineBreaks) {
             input = input.replace(/^\s*\n/, "") // first line
                          .replace(/(\n\s*){2,}/g, "\n"); // all others
         }
@@ -156,7 +156,7 @@ var HTML = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_parse_colour_code: function(input, args) {
+    runParseColourCode: function(input, args) {
         var m = null,
             r = 0, g = 0, b = 0, a = 1;
 
@@ -177,7 +177,7 @@ var HTML = {
             var h_ = parseFloat(m[1]) / 360,
                 s_ = parseFloat(m[2]) / 100,
                 l_ = parseFloat(m[3]) / 100,
-                rgb_ = HTML._hsl_to_rgb(h_, s_, l_);
+                rgb_ = HTML._hslToRgb(h_, s_, l_);
 
             r = rgb_[0];
             g = rgb_[1];
@@ -195,7 +195,7 @@ var HTML = {
             b = Math.round(255 * (1 - y_) * (1 - k_));
         }
 
-        var hsl_ = HTML._rgb_to_hsl(r, g, b),
+        var hsl_ = HTML._rgbToHsl(r, g, b),
             h = Math.round(hsl_[0] * 360),
             s = Math.round(hsl_[1] * 100),
             l = Math.round(hsl_[2] * 100),
@@ -210,9 +210,9 @@ var HTML = {
         k = k.toFixed(2);
 
         var hex = "#" +
-                Utils.pad_left(Math.round(r).toString(16), 2) +
-                Utils.pad_left(Math.round(g).toString(16), 2) +
-                Utils.pad_left(Math.round(b).toString(16), 2),
+                Utils.padLeft(Math.round(r).toString(16), 2) +
+                Utils.padLeft(Math.round(g).toString(16), 2) +
+                Utils.padLeft(Math.round(b).toString(16), 2),
             rgb  = "rgb(" + r + ", " + g + ", " + b + ")",
             rgba = "rgba(" + r + ", " + g + ", " + b + ", " + a + ")",
             hsl  = "hsl(" + h + ", " + s + "%, " + l + "%)",
@@ -237,7 +237,7 @@ var HTML = {
                     var color = e.color.toRGB();\
                     document.getElementById('input-text').value = 'rgba(' +\
                         color.r + ', ' + color.g + ', ' + color.b + ', ' + color.a + ')';\
-                    window.app.auto_bake();\
+                    window.app.autoBake();\
                 });\
             </script>";
     },
@@ -246,7 +246,7 @@ var HTML = {
 
     /**
      * Converts an HSL color value to RGB. Conversion formula
-     * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+     * adapted from http://en.wikipedia.org/wiki/HSL_colorSpace.
      * Assumes h, s, and l are contained in the set [0, 1] and
      * returns r, g, and b in the set [0, 255].
      *
@@ -258,7 +258,7 @@ var HTML = {
      * @param {number} l - The lightness
      * @return {Array} The RGB representation
      */
-    _hsl_to_rgb: function(h, s, l){
+    _hslToRgb: function(h, s, l){
         var r, g, b;
 
         if (s === 0){
@@ -286,7 +286,7 @@ var HTML = {
 
     /**
      * Converts an RGB color value to HSL. Conversion formula
-     * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+     * adapted from http://en.wikipedia.org/wiki/HSL_colorSpace.
      * Assumes r, g, and b are contained in the set [0, 255] and
      * returns h, s, and l in the set [0, 1].
      *
@@ -298,7 +298,7 @@ var HTML = {
      * @param {number} b - The blue color value
      * @return {Array} The HSL representation
      */
-    _rgb_to_hsl: function(r, g, b) {
+    _rgbToHsl: function(r, g, b) {
         r /= 255; g /= 255; b /= 255;
         var max = Math.max(r, g, b),
             min = Math.min(r, g, b),
@@ -327,7 +327,7 @@ var HTML = {
      * @private
      * @constant
      */
-    _byte_to_entity: {
+    _byteToEntity: {
         34 : "&quot;",
         38 : "&amp;",
         39 : "&apos;",
@@ -591,7 +591,7 @@ var HTML = {
      * @private
      * @constant
      */
-    _entity_to_byte : {
+    _entityToByte : {
         "quot" : 34,
         "amp" : 38,
         "apos" : 39,

src/js/operations/HTTP.js

@@ -18,11 +18,11 @@ var HTTP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_strip_headers: function(input, args) {
-        var header_end = input.indexOf("\r\n\r\n") +
-            (header_end < 0) ? input.indexOf("\n\n") + 2 : header_end + 4;
+    runStripHeaders: function(input, args) {
+        var headerEnd = input.indexOf("\r\n\r\n") +
+            (headerEnd < 0) ? input.indexOf("\n\n") + 2 : headerEnd + 4;
             
-        return (header_end < 2) ? input : input.slice(header_end, input.length);
+        return (headerEnd < 2) ? input : input.slice(headerEnd, input.length);
     },
     
     
@@ -33,8 +33,8 @@ var HTTP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_user_agent: function(input, args) {
-        var ua = UAS_parser.parse(input);
+    runParseUserAgent: function(input, args) {
+        var ua = UAS_parser.parse(input); // eslint-disable-line camelcase
         
         return "Type: " + ua.type + "\n" +
             "Family: " + ua.uaFamily + "\n" +

src/js/operations/Hash.js

@@ -18,8 +18,8 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_md2: function (input, args) {
-        return Utils.to_hex_fast(CryptoApi.hash("md2", input, {}));
+    runMD2: function (input, args) {
+        return Utils.toHexFast(CryptoApi.hash("md2", input, {}));
     },
 
 
@@ -30,8 +30,8 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_md4: function (input, args) {
-        return Utils.to_hex_fast(CryptoApi.hash("md4", input, {}));
+    runMD4: function (input, args) {
+        return Utils.toHexFast(CryptoApi.hash("md4", input, {}));
     },
 
     
@@ -42,7 +42,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_md5: function (input, args) {
+    runMD5: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input); // Cast to WordArray
         return CryptoJS.MD5(input).toString(CryptoJS.enc.Hex);
     },
@@ -55,8 +55,8 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha0: function (input, args) {
-        return Utils.to_hex_fast(CryptoApi.hash("sha0", input, {}));
+    runSHA0: function (input, args) {
+        return Utils.toHexFast(CryptoApi.hash("sha0", input, {}));
     },
     
     
@@ -67,7 +67,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha1: function (input, args) {
+    runSHA1: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.SHA1(input).toString(CryptoJS.enc.Hex);
     },
@@ -80,7 +80,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha224: function (input, args) {
+    runSHA224: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.SHA224(input).toString(CryptoJS.enc.Hex);
     },
@@ -93,7 +93,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha256: function (input, args) {
+    runSHA256: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.SHA256(input).toString(CryptoJS.enc.Hex);
     },
@@ -106,7 +106,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha384: function (input, args) {
+    runSHA384: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.SHA384(input).toString(CryptoJS.enc.Hex);
     },
@@ -119,7 +119,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha512: function (input, args) {
+    runSHA512: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.SHA512(input).toString(CryptoJS.enc.Hex);
     },
@@ -138,11 +138,11 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sha3: function (input, args) {
+    runSHA3: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
-        var sha3_length = args[0],
+        var sha3Length = args[0],
             options = {
-                outputLength: parseInt(sha3_length, 10)
+                outputLength: parseInt(sha3Length, 10)
             };
         return CryptoJS.SHA3(input, options).toString(CryptoJS.enc.Hex);
     },
@@ -155,7 +155,7 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_ripemd160: function (input, args) {
+    runRIPEMD160: function (input, args) {
         input = CryptoJS.enc.Latin1.parse(input);
         return CryptoJS.RIPEMD160(input).toString(CryptoJS.enc.Hex);
     },
@@ -174,8 +174,8 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_hmac: function (input, args) {
-        var hash_func = args[1];
+    runHMAC: function (input, args) {
+        var hashFunc = args[1];
         input = CryptoJS.enc.Latin1.parse(input);
         var execute = {
             "MD5": CryptoJS.HmacMD5(input, args[0]),
@@ -187,7 +187,7 @@ var Hash = {
             "SHA3": CryptoJS.HmacSHA3(input, args[0]),
             "RIPEMD-160": CryptoJS.HmacRIPEMD160(input, args[0]),
         };
-        return execute[hash_func].toString(CryptoJS.enc.Hex);
+        return execute[hashFunc].toString(CryptoJS.enc.Hex);
     },
     
     
@@ -198,29 +198,29 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_all: function (input, args) {
-        var byte_array = Utils.str_to_byte_array(input),
-            output = "MD2:         " + Hash.run_md2(input, []) +
-                "\nMD4:         " + Hash.run_md4(input, []) +
-                "\nMD5:         " + Hash.run_md5(input, []) +
-                "\nSHA0:        " + Hash.run_sha0(input, []) +
-                "\nSHA1:        " + Hash.run_sha1(input, []) +
-                "\nSHA2 224:    " + Hash.run_sha224(input, []) +
-                "\nSHA2 256:    " + Hash.run_sha256(input, []) +
-                "\nSHA2 384:    " + Hash.run_sha384(input, []) +
-                "\nSHA2 512:    " + Hash.run_sha512(input, []) +
-                "\nSHA3 224:    " + Hash.run_sha3(input, ["224"]) +
-                "\nSHA3 256:    " + Hash.run_sha3(input, ["256"]) +
-                "\nSHA3 384:    " + Hash.run_sha3(input, ["384"]) +
-                "\nSHA3 512:    " + Hash.run_sha3(input, ["512"]) +
-                "\nRIPEMD-160:  " + Hash.run_ripemd160(input, []) +
+    runAll: function (input, args) {
+        var byteArray = Utils.strToByteArray(input),
+            output = "MD2:         " + Hash.runMD2(input, []) +
+                "\nMD4:         " + Hash.runMD4(input, []) +
+                "\nMD5:         " + Hash.runMD5(input, []) +
+                "\nSHA0:        " + Hash.runSHA0(input, []) +
+                "\nSHA1:        " + Hash.runSHA1(input, []) +
+                "\nSHA2 224:    " + Hash.runSHA224(input, []) +
+                "\nSHA2 256:    " + Hash.runSHA256(input, []) +
+                "\nSHA2 384:    " + Hash.runSHA384(input, []) +
+                "\nSHA2 512:    " + Hash.runSHA512(input, []) +
+                "\nSHA3 224:    " + Hash.runSHA3(input, ["224"]) +
+                "\nSHA3 256:    " + Hash.runSHA3(input, ["256"]) +
+                "\nSHA3 384:    " + Hash.runSHA3(input, ["384"]) +
+                "\nSHA3 512:    " + Hash.runSHA3(input, ["512"]) +
+                "\nRIPEMD-160:  " + Hash.runRIPEMD160(input, []) +
                 "\n\nChecksums:" +
-                "\nFletcher-8:  " + Checksum.run_fletcher8(byte_array, []) +
-                "\nFletcher-16: " + Checksum.run_fletcher16(byte_array, []) +
-                "\nFletcher-32: " + Checksum.run_fletcher32(byte_array, []) +
-                "\nFletcher-64: " + Checksum.run_fletcher64(byte_array, []) +
-                "\nAdler-32:    " + Checksum.run_adler32(byte_array, []) +
-                "\nCRC-32:      " + Checksum.run_crc32(byte_array, []);
+                "\nFletcher-8:  " + Checksum.runFletcher8(byteArray, []) +
+                "\nFletcher-16: " + Checksum.runFletcher16(byteArray, []) +
+                "\nFletcher-32: " + Checksum.runFletcher32(byteArray, []) +
+                "\nFletcher-64: " + Checksum.runFletcher64(byteArray, []) +
+                "\nAdler-32:    " + Checksum.runAdler32(byteArray, []) +
+                "\nCRC-32:      " + Checksum.runCRC32(byteArray, []);
                 
         return output;
     },
@@ -233,38 +233,38 @@ var Hash = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_analyse: function(input, args) {
+    runAnalyse: function(input, args) {
         input = input.replace(/\s/g, "");
     
         var output = "",
-            byte_length = input.length / 2,
-            bit_length = byte_length * 8,
-            possible_hash_functions = [];
+            byteLength = input.length / 2,
+            bitLength = byteLength * 8,
+            possibleHashFunctions = [];
         
         if (!/^[a-f0-9]+$/i.test(input)) {
             return "Invalid hash";
         }
         
         output += "Hash length: " + input.length + "\n" +
-            "Byte length: " + byte_length + "\n" +
-            "Bit length:  " + bit_length + "\n\n" +
+            "Byte length: " + byteLength + "\n" +
+            "Bit length:  " + bitLength + "\n\n" +
             "Based on the length, this hash could have been generated by one of the following hashing functions:\n";
                 
-        switch (bit_length) {
+        switch (bitLength) {
             case 4:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "Fletcher-4",
                     "Luhn algorithm",
                     "Verhoeff algorithm",
                 ];
                 break;
             case 8:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "Fletcher-8",
                 ];
                 break;
             case 16:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "BSD checksum",
                     "CRC-16",
                     "SYSV checksum",
@@ -272,21 +272,21 @@ var Hash = {
                 ];
                 break;
             case 32:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "CRC-32",
                     "Fletcher-32",
                     "Adler-32",
                 ];
                 break;
             case 64:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "CRC-64",
                     "RIPEMD-64",
                     "SipHash",
                 ];
                 break;
             case 128:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "MD5",
                     "MD4",
                     "MD2",
@@ -297,7 +297,7 @@ var Hash = {
                 ];
                 break;
             case 160:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "SHA-1",
                     "SHA-0",
                     "FSB-160",
@@ -308,13 +308,13 @@ var Hash = {
                 ];
                 break;
             case 192:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "Tiger",
                     "HAVAL-192",
                 ];
                 break;
             case 224:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "SHA-224",
                     "SHA3-224",
                     "ECOH-224",
@@ -323,7 +323,7 @@ var Hash = {
                 ];
                 break;
             case 256:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "SHA-256",
                     "SHA3-256",
                     "BLAKE-256",
@@ -338,12 +338,12 @@ var Hash = {
                 ];
                 break;
             case 320:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "RIPEMD-320",
                 ];
                 break;
             case 384:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "SHA-384",
                     "SHA3-384",
                     "ECOH-384",
@@ -351,7 +351,7 @@ var Hash = {
                 ];
                 break;
             case 512:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "SHA-512",
                     "SHA3-512",
                     "BLAKE-512",
@@ -366,18 +366,18 @@ var Hash = {
                 ];
                 break;
             case 1024:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "Fowler-Noll-Vo",
                 ];
                 break;
             default:
-                possible_hash_functions = [
+                possibleHashFunctions = [
                     "Unknown"
                 ];
                 break;
         }
         
-        return output + possible_hash_functions.join("\n");
+        return output + possibleHashFunctions.join("\n");
     },
     
 };

src/js/operations/Hexdump.js

@@ -30,14 +30,14 @@ var Hexdump = {
     /**
      * To Hexdump operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to: function(input, args) {
+    runTo: function(input, args) {
         var length = args[0] || Hexdump.WIDTH;
-        var upper_case = args[1];
-        var include_final_length = args[2];
+        var upperCase = args[1];
+        var includeFinalLength = args[2];
         
         var output = "", padding = 2;
         for (var i = 0; i < input.length; i += length) {
@@ -47,18 +47,18 @@ var Hexdump = {
                 hexa += Utils.hex(buff[j], padding) + " ";
             }
             
-            var line_no = Utils.hex(i, 8);
+            var lineNo = Utils.hex(i, 8);
             
-            if (upper_case) {
+            if (upperCase) {
                 hexa = hexa.toUpperCase();
-                line_no = line_no.toUpperCase();
+                lineNo = lineNo.toUpperCase();
             }
             
-            output += line_no + "  " +
-                Utils.pad_right(hexa, (length*(padding+1))) +
-                " |" + Utils.pad_right(Utils.printable(Utils.byte_array_to_chars(buff)), buff.length) + "|\n";
+            output += lineNo + "  " +
+                Utils.padRight(hexa, (length*(padding+1))) +
+                " |" + Utils.padRight(Utils.printable(Utils.byteArrayToChars(buff)), buff.length) + "|\n";
                 
-            if (include_final_length && i+buff.length === input.length) {
+            if (includeFinalLength && i+buff.length === input.length) {
                 output += Utils.hex(i+buff.length, 8) + "\n";
             }
         }
@@ -72,15 +72,15 @@ var Hexdump = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from: function(input, args) {
+    runFrom: function(input, args) {
         var output = [],
             regex = /^\s*(?:[\dA-F]{4,16}:?)?\s*((?:[\dA-F]{2}\s){1,8}(?:\s|[\dA-F]{2}-)(?:[\dA-F]{2}\s){1,8}|(?:[\dA-F]{2}\s|[\dA-F]{4}\s)+)/igm,
             block, line;
             
         while ((block = regex.exec(input))) {
-            line = Utils.from_hex(block[1].replace(/-/g, " "));
+            line = Utils.fromHex(block[1].replace(/-/g, " "));
             for (var i = 0; i < line.length; i++) {
                 output.push(line[i]);
             }
@@ -90,7 +90,7 @@ var Hexdump = {
         var w = (width - 13) / 4;
         // w should be the specified width of the hexdump and therefore a round number
         if (Math.floor(w) !== w || input.indexOf("\r") !== -1 || output.indexOf(13) !== -1) {
-            app.options.attempt_highlight = false;
+            app.options.attemptHighlight = false;
         }
         return output;
     },
@@ -105,7 +105,7 @@ var Hexdump = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_to: function(pos, args) {
+    highlightTo: function(pos, args) {
         // Calculate overall selection
         var w = args[0] || 16,
             width = 14 + (w*4),
@@ -125,32 +125,32 @@ var Hexdump = {
         pos[0].end = line*width + 10 + offset*3 - 1;
         
         // Set up multiple selections for bytes
-        var start_line_num = Math.floor(pos[0].start / width);
-        var end_line_num = Math.floor(pos[0].end / width);
+        var startLineNum = Math.floor(pos[0].start / width);
+        var endLineNum = Math.floor(pos[0].end / width);
         
-        if (start_line_num === end_line_num) {
+        if (startLineNum === endLineNum) {
             pos.push(pos[0]);
         } else {
             start = pos[0].start;
-            end = (start_line_num+1) * width - w - 5;
+            end = (startLineNum+1) * width - w - 5;
             pos.push({ start: start, end: end });
             while (end < pos[0].end) {
-                start_line_num++;
-                start = start_line_num * width + 10;
-                end = (start_line_num+1) * width - w - 5;
+                startLineNum++;
+                start = startLineNum * width + 10;
+                end = (startLineNum+1) * width - w - 5;
                 if (end > pos[0].end) end = pos[0].end;
                 pos.push({ start: start, end: end });
             }
         }
         
         // Set up multiple selections for ASCII
-        var len = pos.length, line_num = 0;
+        var len = pos.length, lineNum = 0;
         start = 0;
         end = 0;
         for (var i = 1; i < len; i++) {
-            line_num = Math.floor(pos[i].start / width);
-            start = (((pos[i].start - (line_num * width)) - 10) / 3) + (width - w -2) + (line_num * width);
-            end = (((pos[i].end + 1 - (line_num * width)) - 10) / 3) + (width - w -2) + (line_num * width);
+            lineNum = Math.floor(pos[i].start / width);
+            start = (((pos[i].start - (lineNum * width)) - 10) / 3) + (width - w -2) + (lineNum * width);
+            end = (((pos[i].end + 1 - (lineNum * width)) - 10) / 3) + (width - w -2) + (lineNum * width);
             pos.push({ start: start, end: end });
         }
         return pos;
@@ -166,7 +166,7 @@ var Hexdump = {
      * @param {Object[]} args
      * @returns {Object[]} pos
      */
-    highlight_from: function(pos, args) {
+    highlightFrom: function(pos, args) {
         var w = args[0] || 16;
         var width = 14 + (w*4);
         

src/js/operations/IP.js

@@ -34,26 +34,26 @@ var IP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_ip_range: function (input, args) {
-        var include_network_info = args[0],
-            enumerate_addresses = args[1],
-            allow_large_list = args[2];
+    runParseIpRange: function (input, args) {
+        var includeNetworkInfo = args[0],
+            enumerateAddresses = args[1],
+            allowLargeList = args[2];
         
         // Check what type of input we are looking at
-        var ipv4_cidr_regex = /^\s*((?:\d{1,3}\.){3}\d{1,3})\/(\d\d?)\s*$/,
-            ipv4_range_regex = /^\s*((?:\d{1,3}\.){3}\d{1,3})\s*-\s*((?:\d{1,3}\.){3}\d{1,3})\s*$/,
-            ipv6_cidr_regex = /^\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\/(\d\d?\d?)\s*$/i,
-            ipv6_range_regex = /^\s*(((?=.*::)(?!.*::[^-]+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*-\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\17)::|:\b|(?![\dA-F])))|(?!\16\17)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*$/i,
+        var ipv4CidrRegex = /^\s*((?:\d{1,3}\.){3}\d{1,3})\/(\d\d?)\s*$/,
+            ipv4RangeRegex = /^\s*((?:\d{1,3}\.){3}\d{1,3})\s*-\s*((?:\d{1,3}\.){3}\d{1,3})\s*$/,
+            ipv6CidrRegex = /^\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\/(\d\d?\d?)\s*$/i,
+            ipv6RangeRegex = /^\s*(((?=.*::)(?!.*::[^-]+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*-\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\17)::|:\b|(?![\dA-F])))|(?!\16\17)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*$/i,
             match;
         
-        if ((match = ipv4_cidr_regex.exec(input))) {
-            return IP._ipv4_cidr_range(match, include_network_info, enumerate_addresses, allow_large_list);
-        } else if ((match = ipv4_range_regex.exec(input))) {
-            return IP._ipv4_hyphenated_range(match, include_network_info, enumerate_addresses, allow_large_list);
-        } else if ((match = ipv6_cidr_regex.exec(input))) {
-            return IP._ipv6_cidr_range(match, include_network_info);
-        } else if ((match = ipv6_range_regex.exec(input))) {
-            return IP._ipv6_hyphenated_range(match, include_network_info);
+        if ((match = ipv4CidrRegex.exec(input))) {
+            return IP._ipv4CidrRange(match, includeNetworkInfo, enumerateAddresses, allowLargeList);
+        } else if ((match = ipv4RangeRegex.exec(input))) {
+            return IP._ipv4HyphenatedRange(match, includeNetworkInfo, enumerateAddresses, allowLargeList);
+        } else if ((match = ipv6CidrRegex.exec(input))) {
+            return IP._ipv6CidrRange(match, includeNetworkInfo);
+        } else if ((match = ipv6RangeRegex.exec(input))) {
+            return IP._ipv6HyphenatedRange(match, includeNetworkInfo);
         } else {
             return "Invalid input.\n\nEnter either a CIDR range (e.g. 10.0.0.0/24) or a hyphenated range (e.g. 10.0.0.0 - 10.0.1.0). IPv6 also supported.";
         }
@@ -64,12 +64,12 @@ var IP = {
      * @constant
      * @default
      */
-    IPv4_REGEX: /^\s*((?:\d{1,3}\.){3}\d{1,3})\s*$/,
+    IPV4_REGEX: /^\s*((?:\d{1,3}\.){3}\d{1,3})\s*$/,
     /**
      * @constant
      * @default
      */
-    IPv6_REGEX: /^\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*$/i,
+    IPV6_REGEX: /^\s*(((?=.*::)(?!.*::.+::)(::)?([\dA-F]{1,4}:(:|\b)|){5}|([\dA-F]{1,4}:){6})((([\dA-F]{1,4}((?!\4)::|:\b|(?![\dA-F])))|(?!\3\4)){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4}))\s*$/i,
     
     /**
      * Parse IPv6 address operation.
@@ -78,14 +78,14 @@ var IP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_ipv6: function (input, args) {
+    runParseIpv6: function (input, args) {
         var match,
             output = "";
         
-        if ((match = IP.IPv6_REGEX.exec(input))) {
-            var ipv6 = IP._str_to_ipv6(match[1]),
-                longhand = IP._ipv6_to_str(ipv6),
-                shorthand = IP._ipv6_to_str(ipv6, true);
+        if ((match = IP.IPV6_REGEX.exec(input))) {
+            var ipv6 = IP._strToIpv6(match[1]),
+                longhand = IP._ipv6ToStr(ipv6),
+                shorthand = IP._ipv6ToStr(ipv6, true);
                 
             output += "Longhand:  " + longhand + "\nShorthand: " + shorthand + "\n";
             
@@ -102,13 +102,13 @@ var IP = {
                 ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0xffff) {
                 // IPv4-mapped IPv6 address
                 output += "\nIPv4-mapped IPv6 address detected. IPv6 clients will be handled natively by default, and IPv4 clients appear as IPv6 clients at their IPv4-mapped IPv6 address.";
-                output += "\nMapped IPv4 address: " + IP._ipv4_to_str((ipv6[6] << 16) + ipv6[7]);
+                output += "\nMapped IPv4 address: " + IP._ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
                 output += "\nIPv4-mapped IPv6 addresses range: ::ffff:0:0/96";
             } else if (ipv6[0] === 0 && ipv6[1] === 0 && ipv6[2] === 0 &&
                 ipv6[3] === 0 && ipv6[4] === 0xffff && ipv6[5] === 0) {
                 // IPv4-translated address
                 output += "\nIPv4-translated address detected. Used by Stateless IP/ICMP Translation (SIIT). See RFCs 6145 and 6052 for more details.";
-                output += "\nTranslated IPv4 address: " + IP._ipv4_to_str((ipv6[6] << 16) + ipv6[7]);
+                output += "\nTranslated IPv4 address: " + IP._ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
                 output += "\nIPv4-translated addresses range: ::ffff:0:0:0/96";
             } else if (ipv6[0] === 0x100) {
                 // Discard prefix per RFC 6666
@@ -118,50 +118,50 @@ var IP = {
                 ipv6[3] === 0 && ipv6[4] === 0 && ipv6[5] === 0) {
                 // IPv4/IPv6 translation per RFC 6052
                 output += "\n'Well-Known' prefix for IPv4/IPv6 translation detected. See RFC 6052 for more details.";
-                output += "\nTranslated IPv4 address: " + IP._ipv4_to_str((ipv6[6] << 16) + ipv6[7]);
+                output += "\nTranslated IPv4 address: " + IP._ipv4ToStr((ipv6[6] << 16) + ipv6[7]);
                 output += "\n'Well-Known prefix range: 64:ff9b::/96";
             } else if (ipv6[0] === 0x2001 && ipv6[1] === 0) {
                 // Teredo tunneling
                 output += "\nTeredo tunneling IPv6 address detected\n";
-                var server_ipv4  = (ipv6[2] << 16) + ipv6[3],
-                    udp_port     = (~ipv6[5]) & 0xffff,
-                    client_ipv4  = ~((ipv6[6] << 16) + ipv6[7]),
-                    flag_cone    = (ipv6[4] >>> 15) & 1,
-                    flag_r       = (ipv6[4] >>> 14) & 1,
-                    flag_random1 = (ipv6[4] >>> 10) & 15,
-                    flag_ug      = (ipv6[4] >>> 8) & 3,
-                    flag_random2 = ipv6[4] & 255;
+                var serverIpv4  = (ipv6[2] << 16) + ipv6[3],
+                    udpPort     = (~ipv6[5]) & 0xffff,
+                    clientIpv4  = ~((ipv6[6] << 16) + ipv6[7]),
+                    flagCone    = (ipv6[4] >>> 15) & 1,
+                    flagR       = (ipv6[4] >>> 14) & 1,
+                    flagRandom1 = (ipv6[4] >>> 10) & 15,
+                    flagUg      = (ipv6[4] >>> 8) & 3,
+                    flagRandom2 = ipv6[4] & 255;
                 
-                output += "\nServer IPv4 address: " + IP._ipv4_to_str(server_ipv4) +
-                    "\nClient IPv4 address: " + IP._ipv4_to_str(client_ipv4) +
-                    "\nClient UDP port:     " + udp_port +
+                output += "\nServer IPv4 address: " + IP._ipv4ToStr(serverIpv4) +
+                    "\nClient IPv4 address: " + IP._ipv4ToStr(clientIpv4) +
+                    "\nClient UDP port:     " + udpPort +
                     "\nFlags:" +
-                    "\n\tCone:    " + flag_cone;
+                    "\n\tCone:    " + flagCone;
                     
-                if (flag_cone) {
+                if (flagCone) {
                     output += " (Client is behind a cone NAT)";
                 } else {
                     output += " (Client is not behind a cone NAT)";
                 }
                 
-                output += "\n\tR:       " + flag_r;
+                output += "\n\tR:       " + flagR;
                 
-                if (flag_r) {
+                if (flagR) {
                     output += " Error: This flag should be set to 0. See RFC 5991 and RFC 4380.";
                 }
                     
-                output += "\n\tRandom1: " + Utils.bin(flag_random1, 4) +
-                    "\n\tUG:      " + Utils.bin(flag_ug, 2);
+                output += "\n\tRandom1: " + Utils.bin(flagRandom1, 4) +
+                    "\n\tUG:      " + Utils.bin(flagUg, 2);
                         
-                if (flag_ug) {
+                if (flagUg) {
                     output += " Error: This flag should be set to 00. See RFC 4380.";
                 }
                     
-                output += "\n\tRandom2: " + Utils.bin(flag_random2, 8);
+                output += "\n\tRandom2: " + Utils.bin(flagRandom2, 8);
                 
-                if (!flag_r && !flag_ug && flag_random1 && flag_random2) {
+                if (!flagR && !flagUg && flagRandom1 && flagRandom2) {
                     output += "\n\nThis is a valid Teredo address which complies with RFC 4380 and RFC 5991.";
-                } else if (!flag_r && !flag_ug) {
+                } else if (!flagR && !flagUg) {
                     output += "\n\nThis is a valid Teredo address which complies with RFC 4380, however it does not comply with RFC 5991 (Teredo Security Updates) as there are no randomised bits in the flag field.";
                 } else {
                     output += "\n\nThis is an invalid Teredo address.";
@@ -187,15 +187,15 @@ var IP = {
                 output += "\n6to4 transition IPv6 address detected. See RFC 3056 for more details." +
                     "\n6to4 prefix range: 2002::/16";
                 
-                var v4_addr = IP._ipv4_to_str((ipv6[1] << 16) + ipv6[2]),
-                    sla_id = ipv6[3],
-                    interface_id_str = ipv6[4].toString(16) + ipv6[5].toString(16) + ipv6[6].toString(16) + ipv6[7].toString(16),
-                    interface_id = new BigInteger(interface_id_str, 16);
+                var v4Addr = IP._ipv4ToStr((ipv6[1] << 16) + ipv6[2]),
+                    slaId = ipv6[3],
+                    interfaceIdStr = ipv6[4].toString(16) + ipv6[5].toString(16) + ipv6[6].toString(16) + ipv6[7].toString(16),
+                    interfaceId = new BigInteger(interfaceIdStr, 16);
                 
-                output += "\n\nEncapsulated IPv4 address: " + v4_addr +
-                    "\nSLA ID: " + sla_id +
-                    "\nInterface ID (base 16): " + interface_id_str +
-                    "\nInterface ID (base 10): " + interface_id.toString();
+                output += "\n\nEncapsulated IPv4 address: " + v4Addr +
+                    "\nSLA ID: " + slaId +
+                    "\nInterface ID (base 16): " + interfaceIdStr +
+                    "\nInterface ID (base 10): " + interfaceId.toString();
             } else if (ipv6[0] >= 0xfc00 && ipv6[0] <= 0xfdff) {
                 // Unique local address
                 output += "\nThis is a unique local address comparable to the IPv4 private addresses 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16. See RFC 4193 for more details.";
@@ -229,9 +229,9 @@ var IP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_change_ip_format: function(input, args) {
-        var in_format  = args[0],
-            out_format = args[1],
+    runChangeIpFormat: function(input, args) {
+        var inFormat = args[0],
+            outFormat = args[1],
             lines = input.split("\n"),
             output = "",
             j = 0;
@@ -239,54 +239,54 @@ var IP = {
         
         for (var i = 0; i < lines.length; i++) {
             if (lines[i] === "") continue;
-            var ba_ip = [];
+            var baIp = [];
             
-            if (in_format === out_format) {
+            if (inFormat === outFormat) {
                 output += lines[i] + "\n";
                 continue;
             }
             
             // Convert to byte array IP from input format
-            switch (in_format) {
+            switch (inFormat) {
                 case "Dotted Decimal":
                     var octets = lines[i].split(".");
                     for (j = 0; j < octets.length; j++) {
-                        ba_ip.push(parseInt(octets[j], 10));
+                        baIp.push(parseInt(octets[j], 10));
                     }
                     break;
                 case "Decimal":
                     var decimal = lines[i].toString();
-                    ba_ip.push(decimal >> 24 & 255);
-                    ba_ip.push(decimal >> 16 & 255);
-                    ba_ip.push(decimal >> 8 & 255);
-                    ba_ip.push(decimal & 255);
+                    baIp.push(decimal >> 24 & 255);
+                    baIp.push(decimal >> 16 & 255);
+                    baIp.push(decimal >> 8 & 255);
+                    baIp.push(decimal & 255);
                     break;
                 case "Hex":
-                    ba_ip = Utils.hex_to_byte_array(lines[i]);
+                    baIp = Utils.hexToByteArray(lines[i]);
                     break;
                 default:
                     throw "Unsupported input IP format";
             }
             
             // Convert byte array IP to output format
-            switch (out_format) {
+            switch (outFormat) {
                 case "Dotted Decimal":
-                    var dd_ip = "";
-                    for (j = 0; j < ba_ip.length; j++) {
-                        dd_ip += ba_ip[j] + ".";
+                    var ddIp = "";
+                    for (j = 0; j < baIp.length; j++) {
+                        ddIp += baIp[j] + ".";
                     }
-                    output += dd_ip.slice(0, dd_ip.length-1) + "\n";
+                    output += ddIp.slice(0, ddIp.length-1) + "\n";
                     break;
                 case "Decimal":
-                    var dec_ip = ((ba_ip[0] << 24) | (ba_ip[1] << 16) | (ba_ip[2] << 8) | ba_ip[3]) >>> 0;
-                    output += dec_ip.toString() + "\n";
+                    var decIp = ((baIp[0] << 24) | (baIp[1] << 16) | (baIp[2] << 8) | baIp[3]) >>> 0;
+                    output += decIp.toString() + "\n";
                     break;
                 case "Hex":
-                    var hex_ip = "";
-                    for (j = 0; j < ba_ip.length; j++) {
-                        hex_ip += Utils.hex(ba_ip[j]);
+                    var hexIp = "";
+                    for (j = 0; j < baIp.length; j++) {
+                        hexIp += Utils.hex(baIp[j]);
                     }
-                    output += hex_ip + "\n";
+                    output += hexIp + "\n";
                     break;
                 default:
                     throw "Unsupported output IP format";
@@ -320,20 +320,20 @@ var IP = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_group_ips: function(input, args) {
-        var delim = Utils.char_rep[args[0]],
+    runGroupIps: function(input, args) {
+        var delim = Utils.charRep[args[0]],
             cidr = args[1],
-            only_subnets = args[2],
-            ipv4_mask = cidr < 32 ? ~(0xFFFFFFFF >>> cidr) : 0xFFFFFFFF,
-            ipv6_mask = IP._gen_ipv6_mask(cidr),
+            onlySubnets = args[2],
+            ipv4Mask = cidr < 32 ? ~(0xFFFFFFFF >>> cidr) : 0xFFFFFFFF,
+            ipv6Mask = IP._genIpv6Mask(cidr),
             ips = input.split(delim),
-            ipv4_networks = {},
-            ipv6_networks = {},
+            ipv4Networks = {},
+            ipv6Networks = {},
             match = null,
             output = "",
             ip = null,
             network = null,
-            network_str = "";
+            networkStr = "";
             
         if (cidr < 0 || cidr > 127) {
             return "CIDR must be less than 32 for IPv4 or 128 for IPv6";
@@ -341,57 +341,57 @@ var IP = {
             
         // Parse all IPs and add to network dictionary
         for (var i = 0; i < ips.length; i++) {
-            if ((match = IP.IPv4_REGEX.exec(ips[i]))) {
-                ip = IP._str_to_ipv4(match[1]) >>> 0;
-                network = ip & ipv4_mask;
+            if ((match = IP.IPV4_REGEX.exec(ips[i]))) {
+                ip = IP._strToIpv4(match[1]) >>> 0;
+                network = ip & ipv4Mask;
                 
-                if (ipv4_networks.hasOwnProperty(network)) {
-                    ipv4_networks[network].push(ip);
+                if (ipv4Networks.hasOwnProperty(network)) {
+                    ipv4Networks[network].push(ip);
                 } else {
-                    ipv4_networks[network] = [ip];
+                    ipv4Networks[network] = [ip];
                 }
-            } else if ((match = IP.IPv6_REGEX.exec(ips[i]))) {
-                ip = IP._str_to_ipv6(match[1]);
+            } else if ((match = IP.IPV6_REGEX.exec(ips[i]))) {
+                ip = IP._strToIpv6(match[1]);
                 network = [];
-                network_str = "";
+                networkStr = "";
                 
                 for (var j = 0; j < 8; j++) {
-                    network.push(ip[j] & ipv6_mask[j]);
+                    network.push(ip[j] & ipv6Mask[j]);
                 }
                 
-                network_str = IP._ipv6_to_str(network, true);
+                networkStr = IP._ipv6ToStr(network, true);
                 
-                if (ipv6_networks.hasOwnProperty(network_str)) {
-                    ipv6_networks[network_str].push(ip);
+                if (ipv6Networks.hasOwnProperty(networkStr)) {
+                    ipv6Networks[networkStr].push(ip);
                 } else {
-                    ipv6_networks[network_str] = [ip];
+                    ipv6Networks[networkStr] = [ip];
                 }
             }
         }
         
         // Sort IPv4 network dictionaries and print
-        for (network in ipv4_networks) {
-            ipv4_networks[network] = ipv4_networks[network].sort();
+        for (network in ipv4Networks) {
+            ipv4Networks[network] = ipv4Networks[network].sort();
             
-            output += IP._ipv4_to_str(network) + "/" + cidr + "\n";
+            output += IP._ipv4ToStr(network) + "/" + cidr + "\n";
             
-            if (!only_subnets) {
-                for (i = 0; i < ipv4_networks[network].length; i++) {
-                    output += "  " + IP._ipv4_to_str(ipv4_networks[network][i]) + "\n";
+            if (!onlySubnets) {
+                for (i = 0; i < ipv4Networks[network].length; i++) {
+                    output += "  " + IP._ipv4ToStr(ipv4Networks[network][i]) + "\n";
                 }
                 output += "\n";
             }
         }
         
         // Sort IPv6 network dictionaries and print
-        for (network_str in ipv6_networks) {
-            //ipv6_networks[network_str] = ipv6_networks[network_str].sort();  TODO
+        for (networkStr in ipv6Networks) {
+            //ipv6Networks[networkStr] = ipv6Networks[networkStr].sort();  TODO
             
-            output += network_str + "/" + cidr + "\n";
+            output += networkStr + "/" + cidr + "\n";
             
-            if (!only_subnets) {
-                for (i = 0; i < ipv6_networks[network_str].length; i++) {
-                    output += "  " + IP._ipv6_to_str(ipv6_networks[network_str][i], true) + "\n";
+            if (!onlySubnets) {
+                for (i = 0; i < ipv6Networks[networkStr].length; i++) {
+                    output += "  " + IP._ipv6ToStr(ipv6Networks[networkStr][i], true) + "\n";
                 }
                 output += "\n";
             }
@@ -413,35 +413,35 @@ var IP = {
      *
      * @private
      * @param {RegExp} cidr
-     * @param {boolean} include_network_info
-     * @param {boolean} enumerate_addresses
-     * @param {boolean} allow_large_list
+     * @param {boolean} includeNetworkInfo
+     * @param {boolean} enumerateAddresses
+     * @param {boolean} allowLargeList
      * @returns {string}
      */
-    _ipv4_cidr_range: function(cidr, include_network_info, enumerate_addresses, allow_large_list) {
+    _ipv4CidrRange: function(cidr, includeNetworkInfo, enumerateAddresses, allowLargeList) {
         var output = "",
-            network = IP._str_to_ipv4(cidr[1]),
-            cidr_range = parseInt(cidr[2], 10);
+            network = IP._strToIpv4(cidr[1]),
+            cidrRange = parseInt(cidr[2], 10);
             
-        if (cidr_range < 0 || cidr_range > 31) {
+        if (cidrRange < 0 || cidrRange > 31) {
             return "IPv4 CIDR must be less than 32";
         }
         
-        var mask = ~(0xFFFFFFFF >>> cidr_range),
+        var mask = ~(0xFFFFFFFF >>> cidrRange),
             ip1 = network & mask,
             ip2 = ip1 | ~mask;
         
-        if (include_network_info) {
-            output += "Network: " + IP._ipv4_to_str(network) + "\n";
-            output += "CIDR: " + cidr_range + "\n";
-            output += "Mask: " + IP._ipv4_to_str(mask) + "\n";
-            output += "Range: " + IP._ipv4_to_str(ip1) + " - " + IP._ipv4_to_str(ip2) + "\n";
+        if (includeNetworkInfo) {
+            output += "Network: " + IP._ipv4ToStr(network) + "\n";
+            output += "CIDR: " + cidrRange + "\n";
+            output += "Mask: " + IP._ipv4ToStr(mask) + "\n";
+            output += "Range: " + IP._ipv4ToStr(ip1) + " - " + IP._ipv4ToStr(ip2) + "\n";
             output += "Total addresses in range: " + (((ip2 - ip1) >>> 0) + 1) + "\n\n";
         }
         
-        if (enumerate_addresses) {
-            if (cidr_range >= 16 || allow_large_list) {
-                output += IP._generate_ipv4_range(ip1, ip2).join("\n");
+        if (enumerateAddresses) {
+            if (cidrRange >= 16 || allowLargeList) {
+                output += IP._generateIpv4Range(ip1, ip2).join("\n");
             } else {
                 output += IP._LARGE_RANGE_ERROR;
             }
@@ -455,42 +455,42 @@ var IP = {
      *
      * @private
      * @param {RegExp} cidr
-     * @param {boolean} include_network_info
+     * @param {boolean} includeNetworkInfo
      * @returns {string}
      */
-    _ipv6_cidr_range: function(cidr, include_network_info) {
+    _ipv6CidrRange: function(cidr, includeNetworkInfo) {
         var output = "",
-            network = IP._str_to_ipv6(cidr[1]),
-            cidr_range = parseInt(cidr[cidr.length-1], 10);
+            network = IP._strToIpv6(cidr[1]),
+            cidrRange = parseInt(cidr[cidr.length-1], 10);
             
-        if (cidr_range < 0 || cidr_range > 127) {
+        if (cidrRange < 0 || cidrRange > 127) {
             return "IPv6 CIDR must be less than 128";
         }
         
-        var mask = IP._gen_ipv6_mask(cidr_range),
+        var mask = IP._genIpv6Mask(cidrRange),
             ip1 = new Array(8),
             ip2 = new Array(8),
-            total_diff = "",
+            totalDiff = "",
             total = new Array(128);
             
         for (var i = 0; i < 8; i++) {
             ip1[i] = network[i] & mask[i];
             ip2[i] = ip1[i] | (~mask[i] & 0x0000FFFF);
-            total_diff = (ip2[i] - ip1[i]).toString(2);
+            totalDiff = (ip2[i] - ip1[i]).toString(2);
             
-            if (total_diff !== "0") {
-                for (var n = 0; n < total_diff.length; n++) {
-                    total[i*16 + 16-(total_diff.length-n)] = total_diff[n];
+            if (totalDiff !== "0") {
+                for (var n = 0; n < totalDiff.length; n++) {
+                    total[i*16 + 16-(totalDiff.length-n)] = totalDiff[n];
                 }
             }
         }
 
-        if (include_network_info) {
-            output += "Network: " + IP._ipv6_to_str(network) + "\n";
-            output += "Shorthand: " + IP._ipv6_to_str(network, true) + "\n";
-            output += "CIDR: " + cidr_range + "\n";
-            output += "Mask: " + IP._ipv6_to_str(mask) + "\n";
-            output += "Range: " + IP._ipv6_to_str(ip1) + " - " + IP._ipv6_to_str(ip2) + "\n";
+        if (includeNetworkInfo) {
+            output += "Network: " + IP._ipv6ToStr(network) + "\n";
+            output += "Shorthand: " + IP._ipv6ToStr(network, true) + "\n";
+            output += "CIDR: " + cidrRange + "\n";
+            output += "Mask: " + IP._ipv6ToStr(mask) + "\n";
+            output += "Range: " + IP._ipv6ToStr(ip1) + " - " + IP._ipv6ToStr(ip2) + "\n";
             output += "Total addresses in range: " + (parseInt(total.join(""), 2) + 1) + "\n\n";
         }
         
@@ -505,7 +505,7 @@ var IP = {
      * @param {number} cidr
      * @returns {number[]}
      */
-    _gen_ipv6_mask: function(cidr) {
+    _genIpv6Mask: function(cidr) {
         var mask = new Array(8),
             shift;
             
@@ -529,15 +529,15 @@ var IP = {
      *
      * @private
      * @param {RegExp} range
-     * @param {boolean} include_network_info
-     * @param {boolean} enumerate_addresses
-     * @param {boolean} allow_large_list
+     * @param {boolean} includeNetworkInfo
+     * @param {boolean} enumerateAddresses
+     * @param {boolean} allowLargeList
      * @returns {string}
      */
-    _ipv4_hyphenated_range: function(range, include_network_info, enumerate_addresses, allow_large_list) {
+    _ipv4HyphenatedRange: function(range, includeNetworkInfo, enumerateAddresses, allowLargeList) {
         var output = "",
-            ip1 = IP._str_to_ipv4(range[1]),
-            ip2 = IP._str_to_ipv4(range[2]);
+            ip1 = IP._strToIpv4(range[1]),
+            ip2 = IP._strToIpv4(range[2]);
         
         // Calculate mask
         var diff = ip1 ^ ip2,
@@ -552,23 +552,23 @@ var IP = {
         
         mask = ~mask >>> 0;
         var network = ip1 & mask,
-            sub_ip1 = network & mask,
-            sub_ip2 = sub_ip1 | ~mask;
+            subIp1 = network & mask,
+            subIp2 = subIp1 | ~mask;
         
-        if (include_network_info) {
+        if (includeNetworkInfo) {
             output += "Minimum subnet required to hold this range:\n";
-            output += "\tNetwork: " + IP._ipv4_to_str(network) + "\n";
+            output += "\tNetwork: " + IP._ipv4ToStr(network) + "\n";
             output += "\tCIDR: " + cidr + "\n";
-            output += "\tMask: " + IP._ipv4_to_str(mask) + "\n";
-            output += "\tSubnet range: " + IP._ipv4_to_str(sub_ip1) + " - " + IP._ipv4_to_str(sub_ip2) + "\n";
-            output += "\tTotal addresses in subnet: " + (((sub_ip2 - sub_ip1) >>> 0) + 1) + "\n\n";
-            output += "Range: " + IP._ipv4_to_str(ip1) + " - " + IP._ipv4_to_str(ip2) + "\n";
+            output += "\tMask: " + IP._ipv4ToStr(mask) + "\n";
+            output += "\tSubnet range: " + IP._ipv4ToStr(subIp1) + " - " + IP._ipv4ToStr(subIp2) + "\n";
+            output += "\tTotal addresses in subnet: " + (((subIp2 - subIp1) >>> 0) + 1) + "\n\n";
+            output += "Range: " + IP._ipv4ToStr(ip1) + " - " + IP._ipv4ToStr(ip2) + "\n";
             output += "Total addresses in range: " + (((ip2 - ip1) >>> 0) + 1) + "\n\n";
         }
         
-        if (enumerate_addresses) {
-            if (((ip2 - ip1) >>> 0) <= 65536 || allow_large_list) {
-                output += IP._generate_ipv4_range(ip1, ip2).join("\n");
+        if (enumerateAddresses) {
+            if (((ip2 - ip1) >>> 0) <= 65536 || allowLargeList) {
+                output += IP._generateIpv4Range(ip1, ip2).join("\n");
             } else {
                 output += IP._LARGE_RANGE_ERROR;
             }
@@ -582,13 +582,13 @@ var IP = {
      *
      * @private
      * @param {RegExp} range
-     * @param {boolean} include_network_info
+     * @param {boolean} includeNetworkInfo
      * @returns {string}
      */
-    _ipv6_hyphenated_range: function(range, include_network_info) {
+    _ipv6HyphenatedRange: function(range, includeNetworkInfo) {
         var output = "",
-            ip1 = IP._str_to_ipv6(range[1]),
-            ip2 = IP._str_to_ipv6(range[14]);
+            ip1 = IP._strToIpv6(range[1]),
+            ip2 = IP._strToIpv6(range[14]);
         
         var t = "",
             total = new Array(128);
@@ -606,9 +606,9 @@ var IP = {
             }
         }
         
-        if (include_network_info) {
-            output += "Range: " + IP._ipv6_to_str(ip1) + " - " + IP._ipv6_to_str(ip2) + "\n";
-            output += "Shorthand range: " + IP._ipv6_to_str(ip1, true) + " - " + IP._ipv6_to_str(ip2, true) + "\n";
+        if (includeNetworkInfo) {
+            output += "Range: " + IP._ipv6ToStr(ip1) + " - " + IP._ipv6ToStr(ip2) + "\n";
+            output += "Shorthand range: " + IP._ipv6ToStr(ip1, true) + " - " + IP._ipv6ToStr(ip2, true) + "\n";
             output += "Total addresses in range: " + (parseInt(total.join(""), 2) + 1) + "\n\n";
         }
         
@@ -620,36 +620,36 @@ var IP = {
      * Converts an IPv4 address from string format to numerical format.
      *
      * @private
-     * @param {string} ip_str
+     * @param {string} ipStr
      * @returns {number}
      *
      * @example
      * // returns 168427520
-     * IP._str_to_ipv4("10.10.0.0");
+     * IP._strToIpv4("10.10.0.0");
      */
-    _str_to_ipv4: function (ip_str) {
-        var blocks = ip_str.split("."),
-            num_blocks = parse_blocks(blocks),
+    _strToIpv4: function (ipStr) {
+        var blocks = ipStr.split("."),
+            numBlocks = parseBlocks(blocks),
             result = 0;
             
-        result += num_blocks[0] << 24;
-        result += num_blocks[1] << 16;
-        result += num_blocks[2] << 8;
-        result += num_blocks[3];
+        result += numBlocks[0] << 24;
+        result += numBlocks[1] << 16;
+        result += numBlocks[2] << 8;
+        result += numBlocks[3];
         
         return result;
         
-        function parse_blocks(blocks) {
+        function parseBlocks(blocks) {
             if (blocks.length !== 4)
                 throw "More than 4 blocks.";
                 
-            var num_blocks = [];
+            var numBlocks = [];
             for (var i = 0; i < 4; i++) {
-                num_blocks[i] = parseInt(blocks[i], 10);
-                if (num_blocks[i] < 0 || num_blocks[i] > 255)
+                numBlocks[i] = parseInt(blocks[i], 10);
+                if (numBlocks[i] < 0 || numBlocks[i] > 255)
                     throw "Block out of range.";
             }
-            return num_blocks;
+            return numBlocks;
         }
     },
     
@@ -658,18 +658,18 @@ var IP = {
      * Converts an IPv4 address from numerical format to string format.
      *
      * @private
-     * @param {number} ip_int
+     * @param {number} ipInt
      * @returns {string}
      *
      * @example
      * // returns "10.10.0.0"
-     * IP._ipv4_to_str(168427520);
+     * IP._ipv4ToStr(168427520);
      */
-    _ipv4_to_str: function(ip_int) {
-        var blockA = (ip_int >> 24) & 255,
-            blockB = (ip_int >> 16) & 255,
-            blockC = (ip_int >> 8) & 255,
-            blockD = ip_int & 255;
+    _ipv4ToStr: function(ipInt) {
+        var blockA = (ipInt >> 24) & 255,
+            blockB = (ipInt >> 16) & 255,
+            blockC = (ipInt >> 8) & 255,
+            blockD = ipInt & 255;
         
         return blockA + "." + blockB + "." + blockC + "." + blockD;
     },
@@ -679,40 +679,40 @@ var IP = {
      * Converts an IPv6 address from string format to numerical array format.
      *
      * @private
-     * @param {string} ip_str
+     * @param {string} ipStr
      * @returns {number[]}
      *
      * @example
      * // returns [65280, 0, 0, 0, 0, 0, 4369, 8738]
-     * IP._str_to_ipv6("ff00::1111:2222");
+     * IP._strToIpv6("ff00::1111:2222");
      */
-    _str_to_ipv6: function(ip_str) {
-        var blocks = ip_str.split(":"),
-            num_blocks = parse_blocks(blocks),
+    _strToIpv6: function(ipStr) {
+        var blocks = ipStr.split(":"),
+            numBlocks = parseBlocks(blocks),
             j = 0,
             ipv6 = new Array(8);
         
         for (var i = 0; i < 8; i++) {
-            if (isNaN(num_blocks[j])) {
+            if (isNaN(numBlocks[j])) {
                 ipv6[i] = 0;
-                if (i === (8-num_blocks.slice(j).length)) j++;
+                if (i === (8-numBlocks.slice(j).length)) j++;
             } else {
-                ipv6[i] = num_blocks[j];
+                ipv6[i] = numBlocks[j];
                 j++;
             }
         }
         return ipv6;
         
-        function parse_blocks(blocks) {
+        function parseBlocks(blocks) {
             if (blocks.length < 3 || blocks.length > 8)
                 throw "Badly formatted IPv6 address.";
-            var num_blocks = [];
+            var numBlocks = [];
             for (var i = 0; i < blocks.length; i++) {
-                num_blocks[i] = parseInt(blocks[i], 16);
-                if (num_blocks[i] < 0 || num_blocks[i] > 65535)
+                numBlocks[i] = parseInt(blocks[i], 16);
+                if (numBlocks[i] < 0 || numBlocks[i] > 65535)
                     throw "Block out of range.";
             }
-            return num_blocks;
+            return numBlocks;
         }
     },
     
@@ -727,12 +727,12 @@ var IP = {
      *
      * @example
      * // returns "ff00::1111:2222"
-     * IP._ipv6_to_str([65280, 0, 0, 0, 0, 0, 4369, 8738], true);
+     * IP._ipv6ToStr([65280, 0, 0, 0, 0, 0, 4369, 8738], true);
      *
      * // returns "ff00:0000:0000:0000:0000:0000:1111:2222"
-     * IP._ipv6_to_str([65280, 0, 0, 0, 0, 0, 4369, 8738], false);
+     * IP._ipv6ToStr([65280, 0, 0, 0, 0, 0, 4369, 8738], false);
      */
-    _ipv6_to_str: function(ipv6, compact) {
+    _ipv6ToStr: function(ipv6, compact) {
         var output = "",
             i = 0;
             
@@ -779,18 +779,18 @@ var IP = {
      *
      * @private
      * @param {number} ip
-     * @param {number} end_ip
+     * @param {number} endIp
      * @returns {string[]}
      *
      * @example
      * // returns ["0.0.0.1", "0.0.0.2", "0.0.0.3"]
-     * IP._generate_ipv4_range(1, 3);
+     * IP._generateIpv4Range(1, 3);
      */
-    _generate_ipv4_range: function(ip, end_ip) {
+    _generateIpv4Range: function(ip, endIp) {
         var range = [];
-        if (end_ip >= ip) {
-            for (; ip <= end_ip; ip++) {
-                range.push(IP._ipv4_to_str(ip));
+        if (endIp >= ip) {
+            for (; ip <= endIp; ip++) {
+                range.push(IP._ipv4ToStr(ip));
             }
         } else {
             range[0] = "Second IP address smaller than first.";

src/js/operations/JS.js

@@ -44,19 +44,19 @@ var JS = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse: function (input, args) {
-        var parse_loc = args[0],
-            parse_range = args[1],
-            parse_tokens = args[2],
-            parse_comment = args[3],
-            parse_tolerant = args[4],
+    runParse: function (input, args) {
+        var parseLoc = args[0],
+            parseRange = args[1],
+            parseTokens = args[2],
+            parseComment = args[3],
+            parseTolerant = args[4],
             result = {},
             options = {
-                loc:      parse_loc,
-                range:    parse_range,
-                tokens:   parse_tokens,
-                comment:  parse_comment,
-                tolerant: parse_tolerant
+                loc:      parseLoc,
+                range:    parseRange,
+                tokens:   parseTokens,
+                comment:  parseComment,
+                tolerant: parseTolerant
             };
             
         result = esprima.parse(input, options);
@@ -92,11 +92,11 @@ var JS = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_beautify: function(input, args) {
-        var beautify_indent = args[0] || JS.BEAUTIFY_INDENT,
+    runBeautify: function(input, args) {
+        var beautifyIndent = args[0] || JS.BEAUTIFY_INDENT,
             quotes = args[1].toLowerCase(),
-            beautify_semicolons = args[2],
-            beautify_comment = args[3],
+            beautifySemicolons = args[2],
+            beautifyComment = args[3],
             result = "",
             AST;
             
@@ -110,12 +110,12 @@ var JS = {
             var options = {
                 format: {
                     indent: {
-                        style: beautify_indent
+                        style: beautifyIndent
                     },
                     quotes: quotes,
-                    semicolons: beautify_semicolons,
+                    semicolons: beautifySemicolons,
                 },
-                comment: beautify_comment
+                comment: beautifyComment
             };
             
             if (options.comment)
@@ -137,13 +137,13 @@ var JS = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_minify: function(input, args) {
+    runMinify: function(input, args) {
         var result = "",
             AST = esprima.parse(input),
-            optimised_AST = esmangle.optimize(AST, null),
-            mangled_AST = esmangle.mangle(optimised_AST);
+            optimisedAST = esmangle.optimize(AST, null),
+            mangledAST = esmangle.mangle(optimisedAST);
             
-        result = escodegen.generate(mangled_AST, {
+        result = escodegen.generate(mangledAST, {
             format: {
                 renumber:    true,
                 hexadecimal: true,

src/js/operations/MAC.js

@@ -42,15 +42,15 @@ var MAC = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_format: function(input, args) {
+    runFormat: function(input, args) {
         if (!input) return "";
     
-        var output_case = args[0],
-            no_delim = args[1],
-            dash_delim = args[2],
-            colon_delim = args[3],
-            cisco_style = args[4],
-            output_list = [],
+        var outputCase = args[0],
+            noDelim = args[1],
+            dashDelim = args[2],
+            colonDelim = args[3],
+            ciscoStyle = args[4],
+            outputList = [],
             macs = input.toLowerCase().split(/[,\s\r\n]+/);
 
         macs.forEach(function(mac) {
@@ -59,30 +59,30 @@ var MAC = {
                 macColon = cleanMac.replace(/(.{2}(?=.))/g, "$1:"),
                 macCisco = cleanMac.replace(/(.{4}(?=.))/g, "$1.");
                 
-            if (output_case === "Lower only") {
-                if (no_delim) output_list.push(cleanMac);
-                if (dash_delim) output_list.push(macHyphen);
-                if (colon_delim) output_list.push(macColon);
-                if (cisco_style) output_list.push(macCisco);
-            } else if (output_case === "Upper only") {
-                if (no_delim) output_list.push(cleanMac.toUpperCase());
-                if (dash_delim) output_list.push(macHyphen.toUpperCase());
-                if (colon_delim) output_list.push(macColon.toUpperCase());
-                if (cisco_style) output_list.push(macCisco.toUpperCase());
+            if (outputCase === "Lower only") {
+                if (noDelim) outputList.push(cleanMac);
+                if (dashDelim) outputList.push(macHyphen);
+                if (colonDelim) outputList.push(macColon);
+                if (ciscoStyle) outputList.push(macCisco);
+            } else if (outputCase === "Upper only") {
+                if (noDelim) outputList.push(cleanMac.toUpperCase());
+                if (dashDelim) outputList.push(macHyphen.toUpperCase());
+                if (colonDelim) outputList.push(macColon.toUpperCase());
+                if (ciscoStyle) outputList.push(macCisco.toUpperCase());
             } else {
-                if (no_delim) output_list.push(cleanMac, cleanMac.toUpperCase());
-                if (dash_delim) output_list.push(macHyphen, macHyphen.toUpperCase());
-                if (colon_delim) output_list.push(macColon, macColon.toUpperCase());
-                if (cisco_style) output_list.push(macCisco, macCisco.toUpperCase());
+                if (noDelim) outputList.push(cleanMac, cleanMac.toUpperCase());
+                if (dashDelim) outputList.push(macHyphen, macHyphen.toUpperCase());
+                if (colonDelim) outputList.push(macColon, macColon.toUpperCase());
+                if (ciscoStyle) outputList.push(macCisco, macCisco.toUpperCase());
             }
             
-            output_list.push(
+            outputList.push(
                 "" // Empty line to delimit groups
             );
         });
 
         // Return the data as a string
-        return output_list.join("\n");
+        return outputList.join("\n");
     },
 
 };

src/js/operations/OS.js

@@ -16,7 +16,7 @@ var OS = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_unix_perms: function(input, args) {
+    runParseUnixPerms: function(input, args) {
         var perms = {
                 d : false,  // directory
                 sl : false, // symbolic link
@@ -158,12 +158,12 @@ var OS = {
             return "Invalid input format.\nPlease enter the permissions in either octal (e.g. 755) or textual (e.g. drwxr-xr-x) format.";
         }
 
-        output += "Textual representation: " + OS._perms_to_str(perms);
-        output += "\nOctal representation:   " + OS._perms_to_octal(perms);
+        output += "Textual representation: " + OS._permsToStr(perms);
+        output += "\nOctal representation:   " + OS._permsToOctal(perms);
 
         // File type
         if (textual) {
-            output += "\nFile type: " + OS._ft_from_perms(perms);
+            output += "\nFile type: " + OS._ftFromPerms(perms);
         }
 
         // setuid, setgid
@@ -201,7 +201,7 @@ var OS = {
      * @param {Object} perms
      * @returns {string}
      */
-    _perms_to_str: function(perms) {
+    _permsToStr: function(perms) {
         var str = "",
             type = "-";
 
@@ -262,7 +262,7 @@ var OS = {
      * @param {Object} perms
      * @returns {string}
      */
-    _perms_to_octal: function(perms) {
+    _permsToOctal: function(perms) {
         var d = 0,
             u = 0,
             g = 0,
@@ -295,7 +295,7 @@ var OS = {
      * @param {Object} perms
      * @returns {string}
      */
-    _ft_from_perms: function(perms) {
+    _ftFromPerms: function(perms) {
         if (perms.d) return "Directory";
         if (perms.sl) return "Symbolic link";
         if (perms.np) return "Named pipe";

src/js/operations/PublicKey.js

@@ -24,15 +24,15 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_x509: function (input, args) {
+    runParseX509: function (input, args) {
         var cert = new X509(),
-            input_format = args[0];
+            inputFormat = args[0];
             
         if (!input.length) {
             return "No input";
         }
         
-        switch (input_format) {
+        switch (inputFormat) {
             case "DER Hex":
                 input = input.replace(/\s/g, "");
                 cert.hex = input;
@@ -43,11 +43,11 @@ var PublicKey = {
                 cert.pem = input;
                 break;
             case "Base64":
-                cert.hex = Utils.to_hex(Utils.from_base64(input, null, "byte_array"), "");
+                cert.hex = Utils.toHex(Utils.fromBase64(input, null, "byteArray"), "");
                 cert.pem = KJUR.asn1.ASN1Util.getPEMStringFromHex(cert.hex, "CERTIFICATE");
                 break;
             case "Raw":
-                cert.hex = Utils.to_hex(Utils.str_to_byte_array(input), "");
+                cert.hex = Utils.toHex(Utils.strToByteArray(input), "");
                 cert.pem = KJUR.asn1.ASN1Util.getPEMStringFromHex(cert.hex, "CERTIFICATE");
                 break;
             default:
@@ -58,108 +58,108 @@ var PublicKey = {
             sn = cert.getSerialNumberHex(),
             algorithm = KJUR.asn1.x509.OID.oid2name(KJUR.asn1.ASN1Util.oidHexToInt(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [0, 2, 0]))),
             issuer = cert.getIssuerString(),
-            not_before = cert.getNotBefore(),
-            not_after = cert.getNotAfter(),
+            notBefore = cert.getNotBefore(),
+            notAfter = cert.getNotAfter(),
             subject = cert.getSubjectString(),
-            pk_algorithm = KJUR.asn1.x509.OID.oid2name(KJUR.asn1.ASN1Util.oidHexToInt(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [0, 6, 0, 0]))),
+            pkAlgorithm = KJUR.asn1.x509.OID.oid2name(KJUR.asn1.ASN1Util.oidHexToInt(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [0, 6, 0, 0]))),
             pk = X509.getPublicKeyFromCertPEM(cert.pem),
-            pk_fields = [],
-            pk_str = "",
-            cert_sig_alg = KJUR.asn1.x509.OID.oid2name(KJUR.asn1.ASN1Util.oidHexToInt(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [1, 0]))),
-            cert_sig = ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [2]).substr(2),
-            sig_str = "",
+            pkFields = [],
+            pkStr = "",
+            certSigAlg = KJUR.asn1.x509.OID.oid2name(KJUR.asn1.ASN1Util.oidHexToInt(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [1, 0]))),
+            certSig = ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [2]).substr(2),
+            sigStr = "",
             extensions = ASN1HEX.dump(ASN1HEX.getDecendantHexVByNthList(cert.hex, 0, [0, 7]));
         
         // Public Key fields
         if (pk.type === "EC") { // ECDSA
-            pk_fields.push({
+            pkFields.push({
                 key: "Curve Name",
                 value: pk.curveName
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "Length",
                 value: (((new BigInteger(pk.pubKeyHex, 16)).bitLength()-3) /2) + " bits"
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "pub",
-                value: PublicKey._format_byte_str(pk.pubKeyHex, 16, 18)
+                value: PublicKey._formatByteStr(pk.pubKeyHex, 16, 18)
             });
         } else if (pk.type === "DSA") { // DSA
-            pk_fields.push({
+            pkFields.push({
                 key: "pub",
-                value: PublicKey._format_byte_str(pk.y.toString(16), 16, 18)
+                value: PublicKey._formatByteStr(pk.y.toString(16), 16, 18)
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "P",
-                value: PublicKey._format_byte_str(pk.p.toString(16), 16, 18)
+                value: PublicKey._formatByteStr(pk.p.toString(16), 16, 18)
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "Q",
-                value: PublicKey._format_byte_str(pk.q.toString(16), 16, 18)
+                value: PublicKey._formatByteStr(pk.q.toString(16), 16, 18)
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "G",
-                value: PublicKey._format_byte_str(pk.g.toString(16), 16, 18)
+                value: PublicKey._formatByteStr(pk.g.toString(16), 16, 18)
             });
         } else if (pk.e) { // RSA
-            pk_fields.push({
+            pkFields.push({
                 key: "Length",
                 value: pk.n.bitLength() + " bits"
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "Modulus",
-                value: PublicKey._format_byte_str(pk.n.toString(16), 16, 18)
+                value: PublicKey._formatByteStr(pk.n.toString(16), 16, 18)
             });
-            pk_fields.push({
+            pkFields.push({
                 key: "Exponent",
                 value: pk.e + " (0x" + pk.e.toString(16) + ")"
             });
         } else {
-            pk_fields.push({
+            pkFields.push({
                 key: "Error",
                 value: "Unknown Public Key type"
             });
         }
         
         // Signature fields
-        if (ASN1HEX.dump(cert_sig).indexOf("SEQUENCE") === 0) { // DSA or ECDSA
-            sig_str = "  r:              " + PublicKey._format_byte_str(ASN1HEX.getDecendantHexVByNthList(cert_sig, 0, [0]), 16, 18) + "\n" +
-                "  s:              " + PublicKey._format_byte_str(ASN1HEX.getDecendantHexVByNthList(cert_sig, 0, [1]), 16, 18) + "\n";
+        if (ASN1HEX.dump(certSig).indexOf("SEQUENCE") === 0) { // DSA or ECDSA
+            sigStr = "  r:              " + PublicKey._formatByteStr(ASN1HEX.getDecendantHexVByNthList(certSig, 0, [0]), 16, 18) + "\n" +
+                "  s:              " + PublicKey._formatByteStr(ASN1HEX.getDecendantHexVByNthList(certSig, 0, [1]), 16, 18) + "\n";
         } else { // RSA
-            sig_str = "  Signature:      " + PublicKey._format_byte_str(cert_sig, 16, 18) + "\n";
+            sigStr = "  Signature:      " + PublicKey._formatByteStr(certSig, 16, 18) + "\n";
         }
         
         // Format Public Key fields
-        for (var i = 0; i < pk_fields.length; i++) {
-            pk_str += "  " + pk_fields[i].key + ":" +
-                Utils.pad_left(
-                    pk_fields[i].value + "\n",
-                    18 - (pk_fields[i].key.length + 3) + pk_fields[i].value.length + 1,
+        for (var i = 0; i < pkFields.length; i++) {
+            pkStr += "  " + pkFields[i].key + ":" +
+                Utils.padLeft(
+                    pkFields[i].value + "\n",
+                    18 - (pkFields[i].key.length + 3) + pkFields[i].value.length + 1,
                     " "
                 );
         }
         
-        var issuer_str = PublicKey._format_dn_str(issuer, 2),
-            nb_date = PublicKey._format_date(not_before),
-            na_date = PublicKey._format_date(not_after),
-            subject_str = PublicKey._format_dn_str(subject, 2);
+        var issuerStr = PublicKey._formatDnStr(issuer, 2),
+            nbDate = PublicKey._formatDate(notBefore),
+            naDate = PublicKey._formatDate(notAfter),
+            subjectStr = PublicKey._formatDnStr(subject, 2);
         
         var output = "Version:          " + (parseInt(version, 16) + 1) + " (0x" + version + ")\n" +
             "Serial number:    " + new BigInteger(sn, 16).toString() + " (0x" + sn + ")\n" +
             "Algorithm ID:     " + algorithm + "\n" +
             "Validity\n" +
-            "  Not Before:     " + nb_date + " (dd-mm-yy hh:mm:ss) (" + not_before + ")\n" +
-            "  Not After:      " + na_date + " (dd-mm-yy hh:mm:ss) (" + not_after + ")\n" +
+            "  Not Before:     " + nbDate + " (dd-mm-yy hh:mm:ss) (" + notBefore + ")\n" +
+            "  Not After:      " + naDate + " (dd-mm-yy hh:mm:ss) (" + notAfter + ")\n" +
             "Issuer\n" +
-            issuer_str +
+            issuerStr +
             "Subject\n" +
-            subject_str +
+            subjectStr +
             "Public Key\n" +
-            "  Algorithm:      " + pk_algorithm + "\n" +
-            pk_str +
+            "  Algorithm:      " + pkAlgorithm + "\n" +
+            pkStr +
             "Certificate Signature\n" +
-            "  Algorithm:      " + cert_sig_alg + "\n" +
-            sig_str +
+            "  Algorithm:      " + certSigAlg + "\n" +
+            sigStr +
             "\nExtensions (parsed ASN.1)\n" +
             extensions;
         
@@ -174,7 +174,7 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_pem_to_hex: function(input, args) {
+    runPemToHex: function(input, args) {
         if (input.indexOf("-----BEGIN") < 0) {
             // Add header so that the KEYUTIL function works
             input = "-----BEGIN CERTIFICATE-----" + input;
@@ -200,7 +200,7 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_hex_to_pem: function(input, args) {
+    runHexToPem: function(input, args) {
         return KJUR.asn1.ASN1Util.getPEMStringFromHex(input.replace(/\s/g, ""), args[0]);
     },
     
@@ -212,7 +212,7 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_hex_to_object_identifier: function(input, args) {
+    runHexToObjectIdentifier: function(input, args) {
         return KJUR.asn1.ASN1Util.oidHexToInt(input.replace(/\s/g, ""));
     },
     
@@ -224,7 +224,7 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_object_identifier_to_hex: function(input, args) {
+    runObjectIdentifierToHex: function(input, args) {
         return KJUR.asn1.ASN1Util.oidIntToHex(input);
     },
     
@@ -242,11 +242,11 @@ var PublicKey = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_asn1_hex_string: function(input, args) {
-        var truncate_len = args[1],
+    runParseAsn1HexString: function(input, args) {
+        var truncateLen = args[1],
             index = args[0];
         return ASN1HEX.dump(input.replace(/\s/g, ""), {
-            "ommit_long_octet": truncate_len
+            "ommitLongOctet": truncateLen
         }, index);
     },
     
@@ -255,14 +255,14 @@ var PublicKey = {
      * Formats Distinguished Name (DN) strings.
      *
      * @private
-     * @param {string} dn_str
+     * @param {string} dnStr
      * @param {number} indent
      * @returns {string}
      */
-    _format_dn_str: function(dn_str, indent) {
+    _formatDnStr: function(dnStr, indent) {
         var output = "",
-            fields = dn_str.split(",/|"),
-            max_key_len = 0,
+            fields = dnStr.split(",/|"),
+            maxKeyLen = 0,
             key,
             value,
             str;
@@ -272,7 +272,7 @@ var PublicKey = {
             
             key = fields[i].split("=")[0];
                 
-            max_key_len = key.length > max_key_len ? key.length : max_key_len;
+            maxKeyLen = key.length > maxKeyLen ? key.length : maxKeyLen;
         }
         
         for (i = 0; i < fields.length; i++) {
@@ -280,9 +280,9 @@ var PublicKey = {
             
             key = fields[i].split("=")[0];
             value = fields[i].split("=")[1];
-            str = Utils.pad_right(key, max_key_len) + " = " + value + "\n";
+            str = Utils.padRight(key, maxKeyLen) + " = " + value + "\n";
             
-            output += Utils.pad_left(str, indent + str.length, " ");
+            output += Utils.padLeft(str, indent + str.length, " ");
         }
         
         return output;
@@ -293,22 +293,22 @@ var PublicKey = {
      * Formats byte strings by adding line breaks and delimiters.
      *
      * @private
-     * @param {string} byte_str
+     * @param {string} byteStr
      * @param {number} length - Line width
      * @param {number} indent
      * @returns {string}
      */
-    _format_byte_str: function(byte_str, length, indent) {
-        byte_str = Utils.to_hex(Utils.from_hex(byte_str), ":");
+    _formatByteStr: function(byteStr, length, indent) {
+        byteStr = Utils.toHex(Utils.fromHex(byteStr), ":");
         length = length * 3;
         var output = "";
         
-        for (var i = 0; i < byte_str.length; i += length) {
-            var str = byte_str.slice(i, i + length) + "\n";
+        for (var i = 0; i < byteStr.length; i += length) {
+            var str = byteStr.slice(i, i + length) + "\n";
             if (i === 0) {
                 output += str;
             } else {
-                output += Utils.pad_left(str, indent + str.length, " ");
+                output += Utils.padLeft(str, indent + str.length, " ");
             }
         }
         
@@ -320,16 +320,16 @@ var PublicKey = {
      * Formats dates.
      *
      * @private
-     * @param {string} date_str
+     * @param {string} dateStr
      * @returns {string}
      */
-    _format_date: function(date_str) {
-        return date_str[4] + date_str[5] + "/" +
-            date_str[2] + date_str[3] + "/" +
-            date_str[0] + date_str[1] + " " +
-            date_str[6] + date_str[7] + ":" +
-            date_str[8] + date_str[9] + ":" +
-            date_str[10] + date_str[11];
+    _formatDate: function(dateStr) {
+        return dateStr[4] + dateStr[5] + "/" +
+            dateStr[2] + dateStr[3] + "/" +
+            dateStr[0] + dateStr[1] + " " +
+            dateStr[6] + dateStr[7] + ":" +
+            dateStr[8] + dateStr[9] + ":" +
+            dateStr[10] + dateStr[11];
     },
     
 };
@@ -388,9 +388,9 @@ X509.DN_ATTRHEX = {
     // "06032a864886f70d010104" : "md5withRSAEncryption",
     // "06032a864886f70d010105" : "SHA-1WithRSAEncryption",
     // "06032a8648ce380403" : "id-dsa-with-sha-1",
-    // "06032b06010505070302" : "id_kp_clientAuth",
-    // "06032b06010505070304" : "id_kp_securityemail",
-    "06032b06010505070201" : "id_certificatePolicies",
+    // "06032b06010505070302" : "idKpClientAuth",
+    // "06032b06010505070304" : "idKpSecurityemail",
+    "06032b06010505070201" : "idCertificatePolicies",
     "06036086480186f8420101" : "netscape-cert-type",
     "06036086480186f8420102" : "netscape-base-url",
     "06036086480186f8420103" : "netscape-revocation-url",
@@ -867,25 +867,25 @@ X509.DN_ATTRHEX = {
     "06036086480186f8450107010101" : "Unknown Verisign policy qualifier",
     "06036086480186f8450107010102" : "Unknown Verisign policy qualifier",
     "0603678105" : "TCPA",
-    "060367810501" : "tcpa_specVersion",
-    "060367810502" : "tcpa_attribute",
-    "06036781050201" : "tcpa_at_tpmManufacturer",
-    "0603678105020a" : "tcpa_at_securityQualities",
-    "0603678105020b" : "tcpa_at_tpmProtectionProfile",
-    "0603678105020c" : "tcpa_at_tpmSecurityTarget",
-    "0603678105020d" : "tcpa_at_foundationProtectionProfile",
-    "0603678105020e" : "tcpa_at_foundationSecurityTarget",
-    "0603678105020f" : "tcpa_at_tpmIdLabel",
-    "06036781050202" : "tcpa_at_tpmModel",
-    "06036781050203" : "tcpa_at_tpmVersion",
-    "06036781050204" : "tcpa_at_platformManufacturer",
-    "06036781050205" : "tcpa_at_platformModel",
-    "06036781050206" : "tcpa_at_platformVersion",
-    "06036781050207" : "tcpa_at_componentManufacturer",
-    "06036781050208" : "tcpa_at_componentModel",
-    "06036781050209" : "tcpa_at_componentVersion",
-    "060367810503" : "tcpa_protocol",
-    "06036781050301" : "tcpa_prtt_tpmIdProtocol",
+    "060367810501" : "tcpaSpecVersion",
+    "060367810502" : "tcpaAttribute",
+    "06036781050201" : "tcpaAtTpmManufacturer",
+    "0603678105020a" : "tcpaAtSecurityQualities",
+    "0603678105020b" : "tcpaAtTpmProtectionProfile",
+    "0603678105020c" : "tcpaAtTpmSecurityTarget",
+    "0603678105020d" : "tcpaAtFoundationProtectionProfile",
+    "0603678105020e" : "tcpaAtFoundationSecurityTarget",
+    "0603678105020f" : "tcpaAtTpmIdLabel",
+    "06036781050202" : "tcpaAtTpmModel",
+    "06036781050203" : "tcpaAtTpmVersion",
+    "06036781050204" : "tcpaAtPlatformManufacturer",
+    "06036781050205" : "tcpaAtPlatformModel",
+    "06036781050206" : "tcpaAtPlatformVersion",
+    "06036781050207" : "tcpaAtComponentManufacturer",
+    "06036781050208" : "tcpaAtComponentModel",
+    "06036781050209" : "tcpaAtComponentVersion",
+    "060367810503" : "tcpaProtocol",
+    "06036781050301" : "tcpaPrttTpmIdProtocol",
     "0603672a00" : "contentType",
     "0603672a0000" : "PANData",
     "0603672a0001" : "PANToken",

src/js/operations/Punycode.js

@@ -24,7 +24,7 @@ var Punycode = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_ascii: function(input, args) {
+    runToAscii: function(input, args) {
         var idn = args[0];
         
         if (idn) {
@@ -42,7 +42,7 @@ var Punycode = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to_unicode: function(input, args) {
+    runToUnicode: function(input, args) {
         var idn = args[0];
         
         if (idn) {

src/js/operations/QuotedPrintable.js

@@ -35,11 +35,11 @@ var QuotedPrintable = {
     /**
      * To Quoted Printable operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to: function (input, args) {
+    runTo: function (input, args) {
         var mimeEncodedStr = QuotedPrintable.mimeEncode(input);
         
         // fix line breaks
@@ -58,9 +58,9 @@ var QuotedPrintable = {
      *
      * @param {string} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_from: function (input, args) {
+    runFrom: function (input, args) {
         var str = input.replace(/\=(?:\r?\n|$)/g, "");
         return QuotedPrintable.mimeDecode(str);
     },
@@ -70,7 +70,7 @@ var QuotedPrintable = {
      * Decodes mime-encoded data.
      *
      * @param {string} str
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
     mimeDecode: function(str) {
         var encodedBytesCount = (str.match(/\=[\da-fA-F]{2}/g) || []).length,
@@ -96,7 +96,7 @@ var QuotedPrintable = {
     /**
      * Encodes mime data.
      *
-     * @param {byte_array} buffer
+     * @param {byteArray} buffer
      * @returns {string}
      */
     mimeEncode: function(buffer) {
@@ -130,7 +130,7 @@ var QuotedPrintable = {
      *
      * @private
      * @param {number} nr
-     * @param {byte_array[]} ranges
+     * @param {byteArray[]} ranges
      * @returns {bolean}
      */
     _checkRanges: function(nr, ranges) {

src/js/operations/Rotate.js

@@ -26,10 +26,10 @@ var Rotate = {
      * Runs rotation operations across the input data.
      *
      * @private
-     * @param {byte_array} data
+     * @param {byteArray} data
      * @param {number} amount
      * @param {function} algo - The rotation operation to carry out
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
     _rot: function(data, amount, algo) {
         var result = [];
@@ -47,13 +47,13 @@ var Rotate = {
     /**
      * Rotate right operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_rotr: function(input, args) {
+    runRotr: function(input, args) {
         if (args[1]) {
-            return Rotate._rotr_whole(input, args[0]);
+            return Rotate._rotrWhole(input, args[0]);
         } else {
             return Rotate._rot(input, args[0], Rotate._rotr);
         }
@@ -63,13 +63,13 @@ var Rotate = {
     /**
      * Rotate left operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_rotl: function(input, args) {
+    runRotl: function(input, args) {
         if (args[1]) {
-            return Rotate._rotl_whole(input, args[0]);
+            return Rotate._rotlWhole(input, args[0]);
         } else {
             return Rotate._rot(input, args[0], Rotate._rotl);
         }
@@ -95,16 +95,16 @@ var Rotate = {
     /**
      * ROT13 operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_rot13: function(input, args) {
+    runRot13: function(input, args) {
         var amount = args[2],
             output = input,
             chr,
-            rot13_lowercase = args[0],
-            rot13_upperacse = args[1];
+            rot13Lowercase = args[0],
+            rot13Upperacse = args[1];
             
         if (amount) {
             if (amount < 0) {
@@ -113,10 +113,10 @@ var Rotate = {
             
             for (var i = 0; i < input.length; i++) {
                 chr = input[i];
-                if (rot13_upperacse && chr >= 65 && chr <= 90) { // Upper case
+                if (rot13Upperacse && chr >= 65 && chr <= 90) { // Upper case
                     chr = (chr - 65 + amount) % 26;
                     output[i] = chr + 65;
-                } else if (rot13_lowercase && chr >= 97 && chr <= 122) { // Lower case
+                } else if (rot13Lowercase && chr >= 97 && chr <= 122) { // Lower case
                     chr = (chr - 97 + amount) % 26;
                     output[i] = chr + 97;
                 }
@@ -136,11 +136,11 @@ var Rotate = {
      * ROT47 operation.
      *
      * @author Matt C [matt@artemisbot.pw]
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_rot47: function(input, args) {
+    runRot47: function(input, args) {
         var amount = args[0],
             output = input,
             chr;
@@ -193,23 +193,23 @@ var Rotate = {
      * from the end of the array to the beginning.
      *
      * @private
-     * @param {byte_array} data
+     * @param {byteArray} data
      * @param {number} amount
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    _rotr_whole: function(data, amount) {
-        var carry_bits = 0,
-            new_byte,
+    _rotrWhole: function(data, amount) {
+        var carryBits = 0,
+            newByte,
             result = [];
         
         amount = amount % 8;
         for (var i = 0; i < data.length; i++) {
-            var old_byte = data[i] >>> 0;
-            new_byte = (old_byte >> amount) | carry_bits;
-            carry_bits = (old_byte & (Math.pow(2, amount)-1)) << (8-amount);
-            result.push(new_byte);
+            var oldByte = data[i] >>> 0;
+            newByte = (oldByte >> amount) | carryBits;
+            carryBits = (oldByte & (Math.pow(2, amount)-1)) << (8-amount);
+            result.push(newByte);
         }
-        result[0] |= carry_bits;
+        result[0] |= carryBits;
         return result;
     },
     
@@ -219,23 +219,23 @@ var Rotate = {
      * from the beginning of the array to the end.
      *
      * @private
-     * @param {byte_array} data
+     * @param {byteArray} data
      * @param {number} amount
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    _rotl_whole: function(data, amount) {
-        var carry_bits = 0,
-            new_byte,
+    _rotlWhole: function(data, amount) {
+        var carryBits = 0,
+            newByte,
             result = [];
             
         amount = amount % 8;
         for (var i = data.length-1; i >= 0; i--) {
-            var old_byte = data[i];
-            new_byte = ((old_byte << amount) | carry_bits) & 0xFF;
-            carry_bits = (old_byte >> (8-amount)) & (Math.pow(2, amount)-1);
-            result[i] = (new_byte);
+            var oldByte = data[i];
+            newByte = ((oldByte << amount) | carryBits) & 0xFF;
+            carryBits = (oldByte >> (8-amount)) & (Math.pow(2, amount)-1);
+            result[i] = (newByte);
         }
-        result[data.length-1] = result[data.length-1] | carry_bits;
+        result[data.length-1] = result[data.length-1] | carryBits;
         return result;
     },
 

src/js/operations/SeqUtils.js

@@ -32,21 +32,21 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_sort: function (input, args) {
-        var delim = Utils.char_rep[args[0]],
-            sort_reverse = args[1],
+    runSort: function (input, args) {
+        var delim = Utils.charRep[args[0]],
+            sortReverse = args[1],
             order = args[2],
             sorted = input.split(delim);
             
         if (order === "Alphabetical (case sensitive)") {
             sorted = sorted.sort();
         } else if (order === "Alphabetical (case insensitive)") {
-            sorted = sorted.sort(SeqUtils._case_insensitive_sort);
+            sorted = sorted.sort(SeqUtils._caseInsensitiveSort);
         } else if (order === "IP address") {
-            sorted = sorted.sort(SeqUtils._ip_sort);
+            sorted = sorted.sort(SeqUtils._ipSort);
         }
             
-        if (sort_reverse) sorted.reverse();
+        if (sortReverse) sorted.reverse();
         return sorted.join(delim);
     },
     
@@ -58,8 +58,8 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_unique: function (input, args) {
-        var delim = Utils.char_rep[args[0]];
+    runUnique: function (input, args) {
+        var delim = Utils.charRep[args[0]];
         return input.split(delim).unique().join(delim);
     },
     
@@ -77,7 +77,7 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {number}
      */
-    run_count: function(input, args) {
+    runCount: function(input, args) {
         var search = args[0].string,
             type = args[0].option;
             
@@ -91,7 +91,7 @@ var SeqUtils = {
             }
         } else if (search) {
             if (type.indexOf("Extended") === 0) {
-                search = Utils.parse_escaped_chars(search);
+                search = Utils.parseEscapedChars(search);
             }
             return input.count(search);
         } else {
@@ -109,11 +109,11 @@ var SeqUtils = {
     /**
      * Reverse operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_reverse: function (input, args) {
+    runReverse: function (input, args) {
         if (args[0] === "Line") {
             var lines = [],
                 line = [],
@@ -146,7 +146,7 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_add_line_numbers: function(input, args) {
+    runAddLineNumbers: function(input, args) {
         var lines = input.split("\n"),
             output = "",
             width = lines.length.toString().length;
@@ -165,7 +165,7 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_remove_line_numbers: function(input, args) {
+    runRemoveLineNumbers: function(input, args) {
         return input.replace(/^[ \t]{0,5}\d+[\s:|\-,.)\]]/gm, "");
     },
     
@@ -177,8 +177,8 @@ var SeqUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_expand_alph_range: function(input, args) {
-        return Utils.expand_alph_range(input).join(args[0]);
+    runExpandAlphRange: function(input, args) {
+        return Utils.expandAlphRange(input).join(args[0]);
     },
     
     
@@ -190,7 +190,7 @@ var SeqUtils = {
      * @param {string} b
      * @returns {number}
      */
-    _case_insensitive_sort: function(a, b) {
+    _caseInsensitiveSort: function(a, b) {
         return a.toLowerCase().localeCompare(b.toLowerCase());
     },
     
@@ -203,7 +203,7 @@ var SeqUtils = {
      * @param {string} b
      * @returns {number}
      */
-    _ip_sort: function(a, b) {
+    _ipSort: function(a, b) {
         var a_ = a.split("."),
             b_ = b.split(".");
         

src/js/operations/StrUtils.js

@@ -97,30 +97,30 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_regex: function(input, args) {
-        var user_regex = args[1],
+    runRegex: function(input, args) {
+        var userRegex = args[1],
             i = args[2],
             m = args[3],
-            display_total = args[4],
-            output_format = args[5],
+            displayTotal = args[4],
+            outputFormat = args[5],
             modifiers = "g";
         
         if (i) modifiers += "i";
         if (m) modifiers += "m";
         
-        if (user_regex && user_regex !== "^" && user_regex !== "$") {
+        if (userRegex && userRegex !== "^" && userRegex !== "$") {
             try {
-                var regex = new RegExp(user_regex, modifiers);
+                var regex = new RegExp(userRegex, modifiers);
                 
-                switch (output_format) {
+                switch (outputFormat) {
                     case "Highlight matches":
-                        return StrUtils._regex_highlight(input, regex, display_total);
+                        return StrUtils._regexHighlight(input, regex, displayTotal);
                     case "List matches":
-                        return Utils.escape_html(StrUtils._regex_list(input, regex, display_total, true, false));
+                        return Utils.escapeHtml(StrUtils._regexList(input, regex, displayTotal, true, false));
                     case "List capture groups":
-                        return Utils.escape_html(StrUtils._regex_list(input, regex, display_total, false, true));
+                        return Utils.escapeHtml(StrUtils._regexList(input, regex, displayTotal, false, true));
                     case "List matches with capture groups":
-                        return Utils.escape_html(StrUtils._regex_list(input, regex, display_total, true, true));
+                        return Utils.escapeHtml(StrUtils._regexList(input, regex, displayTotal, true, true));
                     default:
                         return "Error: Invalid output format";
                 }
@@ -128,7 +128,7 @@ var StrUtils = {
                 return "Invalid regex. Details: " + err.message;
             }
         } else {
-            return Utils.escape_html(input);
+            return Utils.escapeHtml(input);
         }
     },
 
@@ -146,7 +146,7 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_upper: function (input, args) {
+    runUpper: function (input, args) {
         var scope = args[0];
         
         switch (scope) {
@@ -177,7 +177,7 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_lower: function (input, args) {
+    runLower: function (input, args) {
         return input.toLowerCase();
     },
     
@@ -210,7 +210,7 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_find_replace: function(input, args) {
+    runFindReplace: function(input, args) {
         var find = args[0].string,
             type = args[0].option,
             replace = args[1],
@@ -226,7 +226,7 @@ var StrUtils = {
         if (type === "Regex") {
             find = new RegExp(find, modifiers);
         } else if (type.indexOf("Extended") === 0) {
-            find = Utils.parse_escaped_chars(find);
+            find = Utils.parseEscapedChars(find);
         }
         
         return input.replace(find, replace, modifiers);
@@ -254,12 +254,12 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_split: function(input, args) {
-        var split_delim = args[0] || StrUtils.SPLIT_DELIM,
-            join_delim = Utils.char_rep[args[1]],
-            sections = input.split(split_delim);
+    runSplit: function(input, args) {
+        var splitDelim = args[0] || StrUtils.SPLIT_DELIM,
+            joinDelim = Utils.charRep[args[1]],
+            sections = input.split(splitDelim);
             
-        return sections.join(join_delim);
+        return sections.join(joinDelim);
     },
 
 
@@ -271,8 +271,8 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_filter: function(input, args) {
-        var delim = Utils.char_rep[args[0]],
+    runFilter: function(input, args) {
+        var delim = Utils.charRep[args[0]],
             reverse = args[2];
 
         try {
@@ -281,11 +281,11 @@ var StrUtils = {
             return "Invalid regex. Details: " + err.message;
         }
 
-        var regex_filter = function(value) {
+        var regexFilter = function(value) {
             return reverse ^ regex.test(value);
         };
 
-        return input.split(delim).filter(regex_filter).join(delim);
+        return input.split(delim).filter(regexFilter).join(delim);
     },
     
     
@@ -307,13 +307,13 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_diff: function(input, args) {
-        var sample_delim = args[0],
-            diff_by = args[1],
-            show_added = args[2],
-            show_removed = args[3],
-            ignore_whitespace = args[4],
-            samples = input.split(sample_delim),
+    runDiff: function(input, args) {
+        var sampleDelim = args[0],
+            diffBy = args[1],
+            showAdded = args[2],
+            showRemoved = args[3],
+            ignoreWhitespace = args[4],
+            samples = input.split(sampleDelim),
             output = "",
             diff;
             
@@ -321,19 +321,19 @@ var StrUtils = {
             return "Incorrect number of samples, perhaps you need to modify the sample delimiter or add more samples?";
         }
         
-        switch (diff_by) {
+        switch (diffBy) {
             case "Character":
                 diff = JsDiff.diffChars(samples[0], samples[1]);
                 break;
             case "Word":
-                if (ignore_whitespace) {
+                if (ignoreWhitespace) {
                     diff = JsDiff.diffWords(samples[0], samples[1]);
                 } else {
                     diff = JsDiff.diffWordsWithSpace(samples[0], samples[1]);
                 }
                 break;
             case "Line":
-                if (ignore_whitespace) {
+                if (ignoreWhitespace) {
                     diff = JsDiff.diffTrimmedLines(samples[0], samples[1]);
                 } else {
                     diff = JsDiff.diffLines(samples[0], samples[1]);
@@ -354,11 +354,11 @@ var StrUtils = {
         
         for (var i = 0; i < diff.length; i++) {
             if (diff[i].added) {
-                if (show_added) output += "<span class='hlgreen'>" + Utils.escape_html(diff[i].value) + "</span>";
+                if (showAdded) output += "<span class='hlgreen'>" + Utils.escapeHtml(diff[i].value) + "</span>";
             } else if (diff[i].removed) {
-                if (show_removed) output += "<span class='hlred'>" + Utils.escape_html(diff[i].value) + "</span>";
+                if (showRemoved) output += "<span class='hlred'>" + Utils.escapeHtml(diff[i].value) + "</span>";
             } else {
-                output += Utils.escape_html(diff[i].value);
+                output += Utils.escapeHtml(diff[i].value);
             }
         }
         
@@ -379,14 +379,14 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {html}
      */
-    run_offset_checker: function(input, args) {
-        var sample_delim = args[0],
-            samples = input.split(sample_delim),
+    runOffsetChecker: function(input, args) {
+        var sampleDelim = args[0],
+            samples = input.split(sampleDelim),
             outputs = [],
             i = 0,
             s = 0,
             match = false,
-            in_match = false,
+            inMatch = false,
             chr;
             
         if (!samples || samples.length < 2) {
@@ -415,34 +415,34 @@ var StrUtils = {
             // Write output for each sample
             for (s = 0; s < samples.length; s++) {
                 if (samples[s].length <= i) {
-                    if (in_match) outputs[s] += "</span>";
-                    if (s === samples.length - 1) in_match = false;
+                    if (inMatch) outputs[s] += "</span>";
+                    if (s === samples.length - 1) inMatch = false;
                     continue;
                 }
                 
-                if (match && !in_match) {
-                    outputs[s] += "<span class='hlgreen'>" + Utils.escape_html(samples[s][i]);
+                if (match && !inMatch) {
+                    outputs[s] += "<span class='hlgreen'>" + Utils.escapeHtml(samples[s][i]);
                     if (samples[s].length === i + 1) outputs[s] += "</span>";
-                    if (s === samples.length - 1) in_match = true;
-                } else if (!match && in_match) {
-                    outputs[s] += "</span>" + Utils.escape_html(samples[s][i]);
-                    if (s === samples.length - 1) in_match = false;
+                    if (s === samples.length - 1) inMatch = true;
+                } else if (!match && inMatch) {
+                    outputs[s] += "</span>" + Utils.escapeHtml(samples[s][i]);
+                    if (s === samples.length - 1) inMatch = false;
                 } else {
-                    outputs[s] += Utils.escape_html(samples[s][i]);
-                    if (in_match && samples[s].length === i + 1) {
+                    outputs[s] += Utils.escapeHtml(samples[s][i]);
+                    if (inMatch && samples[s].length === i + 1) {
                         outputs[s] += "</span>";
-                        if (samples[s].length - 1 !== i) in_match = false;
+                        if (samples[s].length - 1 !== i) inMatch = false;
                     }
                 }
                 
                 if (samples[0].length - 1 === i) {
-                    if (in_match) outputs[s] += "</span>";
-                    outputs[s] += Utils.escape_html(samples[s].substring(i + 1));
+                    if (inMatch) outputs[s] += "</span>";
+                    outputs[s] += Utils.escapeHtml(samples[s].substring(i + 1));
                 }
             }
         }
         
-        return outputs.join(sample_delim);
+        return outputs.join(sampleDelim);
     },
     
     
@@ -453,8 +453,8 @@ var StrUtils = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse_escaped_string: function(input, args) {
-        return Utils.parse_escaped_chars(input);
+    runParseEscapedString: function(input, args) {
+        return Utils.parseEscapedChars(input);
     },
     
     
@@ -464,10 +464,10 @@ var StrUtils = {
      * @private
      * @param {string} input
      * @param {RegExp} regex
-     * @param {boolean} display_total
+     * @param {boolean} displayTotal
      * @returns {string}
      */
-    _regex_highlight: function(input, regex, display_total) {
+    _regexHighlight: function(input, regex, displayTotal) {
         var output = "",
             m,
             hl = 1,
@@ -476,10 +476,10 @@ var StrUtils = {
         
         while ((m = regex.exec(input))) {
             // Add up to match
-            output += Utils.escape_html(input.slice(i, m.index));
+            output += Utils.escapeHtml(input.slice(i, m.index));
             
             // Add match with highlighting
-            output += "<span class='hl"+hl+"'>" + Utils.escape_html(m[0]) + "</span>";
+            output += "<span class='hl"+hl+"'>" + Utils.escapeHtml(m[0]) + "</span>";
             
             // Switch highlight
             hl = hl === 1 ? 2 : 1;
@@ -489,9 +489,9 @@ var StrUtils = {
         }
         
         // Add all after final match
-        output += Utils.escape_html(input.slice(i, input.length));
+        output += Utils.escapeHtml(input.slice(i, input.length));
         
-        if (display_total)
+        if (displayTotal)
             output = "Total found: " + total + "\n\n" + output;
 
         return output;
@@ -504,12 +504,12 @@ var StrUtils = {
      * @private
      * @param {string} input
      * @param {RegExp} regex
-     * @param {boolean} display_total
+     * @param {boolean} displayTotal
      * @param {boolean} matches - Display full match
-     * @param {boolean} capture_groups - Display each of the capture groups separately
+     * @param {boolean} captureGroups - Display each of the capture groups separately
      * @returns {string}
      */
-    _regex_list: function(input, regex, display_total, matches, capture_groups) {
+    _regexList: function(input, regex, displayTotal, matches, captureGroups) {
         var output = "",
             total = 0,
             match;
@@ -519,7 +519,7 @@ var StrUtils = {
             if (matches) {
                 output += match[0] + "\n";
             }
-            if (capture_groups) {
+            if (captureGroups) {
                 for (var i = 1; i < match.length; i++) {
                     if (matches) {
                         output += "  Group " + i + ": ";
@@ -529,7 +529,7 @@ var StrUtils = {
             }
         }
         
-        if (display_total)
+        if (displayTotal)
             output = "Total found: " + total + "\n\n" + output;
             
         return output;

src/js/operations/Tidy.js

@@ -47,21 +47,21 @@ var Tidy = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_remove_whitespace: function (input, args) {
-        var remove_spaces = args[0],
-            remove_cariage_returns = args[1],
-            remove_line_feeds = args[2],
-            remove_tabs = args[3],
-            remove_form_feeds = args[4],
-            remove_full_stops = args[5],
+    runRemoveWhitespace: function (input, args) {
+        var removeSpaces = args[0],
+            removeCariageReturns = args[1],
+            removeLineFeeds = args[2],
+            removeTabs = args[3],
+            removeFormFeeds = args[4],
+            removeFullStops = args[5],
             data = input;
             
-        if (remove_spaces) data = data.replace(/ /g, "");
-        if (remove_cariage_returns) data = data.replace(/\r/g, "");
-        if (remove_line_feeds) data = data.replace(/\n/g, "");
-        if (remove_tabs) data = data.replace(/\t/g, "");
-        if (remove_form_feeds) data = data.replace(/\f/g, "");
-        if (remove_full_stops) data = data.replace(/\./g, "");
+        if (removeSpaces) data = data.replace(/ /g, "");
+        if (removeCariageReturns) data = data.replace(/\r/g, "");
+        if (removeLineFeeds) data = data.replace(/\n/g, "");
+        if (removeTabs) data = data.replace(/\t/g, "");
+        if (removeFormFeeds) data = data.replace(/\f/g, "");
+        if (removeFullStops) data = data.replace(/\./g, "");
         return data;
     },
     
@@ -69,11 +69,11 @@ var Tidy = {
     /**
      * Remove null bytes operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_remove_nulls: function (input, args) {
+    runRemoveNulls: function (input, args) {
         var output = [];
         for (var i = 0; i < input.length; i++) {
             if (input[i] !== 0) output.push(input[i]);
@@ -101,19 +101,19 @@ var Tidy = {
     /**
      * Drop bytes operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_drop_bytes: function(input, args) {
+    runDropBytes: function(input, args) {
         var start = args[0],
             length = args[1],
-            apply_to_each_line = args[2];
+            applyToEachLine = args[2];
             
         if (start < 0 || length < 0)
             throw "Error: Invalid value";
             
-        if (!apply_to_each_line)
+        if (!applyToEachLine)
             return input.slice(0, start).concat(input.slice(start+length, input.length));
             
         // Split input into lines
@@ -153,19 +153,19 @@ var Tidy = {
     /**
      * Take bytes operation.
      *
-     * @param {byte_array} input
+     * @param {byteArray} input
      * @param {Object[]} args
-     * @returns {byte_array}
+     * @returns {byteArray}
      */
-    run_take_bytes: function(input, args) {
+    runTakeBytes: function(input, args) {
         var start = args[0],
             length = args[1],
-            apply_to_each_line = args[2];
+            applyToEachLine = args[2];
             
         if (start < 0 || length < 0)
             throw "Error: Invalid value";
             
-        if (!apply_to_each_line)
+        if (!applyToEachLine)
             return input.slice(start, start+length);
             
         // Split input into lines
@@ -214,7 +214,7 @@ var Tidy = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_pad: function(input, args) {
+    runPad: function(input, args) {
         var position = args[0],
             len = args[1],
             chr = args[2],
@@ -224,11 +224,11 @@ var Tidy = {
             
         if (position === "Start") {
             for (i = 0; i < lines.length; i++) {
-                output += Utils.pad_left(lines[i], lines[i].length+len, chr) + "\n";
+                output += Utils.padLeft(lines[i], lines[i].length+len, chr) + "\n";
             }
         } else if (position === "End") {
             for (i = 0; i < lines.length; i++) {
-                output += Utils.pad_right(lines[i], lines[i].length+len, chr) + "\n";
+                output += Utils.padRight(lines[i], lines[i].length+len, chr) + "\n";
             }
         }
         

src/js/operations/URL.js

@@ -25,9 +25,9 @@ var URL_ = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_to: function(input, args) {
-        var encode_all = args[0];
-        return encode_all ? URL_._encode_all_chars(input) : encodeURI(input);
+    runTo: function(input, args) {
+        var encodeAll = args[0];
+        return encodeAll ? URL_._encodeAllChars(input) : encodeURI(input);
     },
     
     
@@ -38,7 +38,7 @@ var URL_ = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_from: function(input, args) {
+    runFrom: function(input, args) {
         var data = input.replace(/\+/g, "%20");
         try {
             return decodeURIComponent(data);
@@ -55,7 +55,7 @@ var URL_ = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_parse: function(input, args) {
+    runParse: function(input, args) {
         var a = document.createElement("a");
         
         // Overwrite base href which will be the current CyberChef URL to reduce confusion.
@@ -85,15 +85,15 @@ var URL_ = {
             if (a.search && a.search !== window.location.search) {
                 output += "Arguments:\n";
                 var args_ = (a.search.slice(1, a.search.length)).split("&");
-                var split_args = [], padding = 0;
+                var splitArgs = [], padding = 0;
                 for (var i = 0; i < args_.length; i++) {
-                    split_args.push(args_[i].split("="));
-                    padding = (split_args[i][0].length > padding) ? split_args[i][0].length : padding;
+                    splitArgs.push(args_[i].split("="));
+                    padding = (splitArgs[i][0].length > padding) ? splitArgs[i][0].length : padding;
                 }
-                for (i = 0; i < split_args.length; i++) {
-                    output += "\t" + Utils.pad_right(split_args[i][0], padding);
-                    if (split_args[i].length > 1 && split_args[i][1].length)
-                        output += " = " + split_args[i][1] + "\n";
+                for (i = 0; i < splitArgs.length; i++) {
+                    output += "\t" + Utils.padRight(splitArgs[i][0], padding);
+                    if (splitArgs[i].length > 1 && splitArgs[i][1].length)
+                        output += " = " + splitArgs[i][1] + "\n";
                     else output += "\n";
                 }
             }
@@ -112,7 +112,7 @@ var URL_ = {
      * @param {string} str
      * @returns {string}
      */
-    _encode_all_chars: function(str) {
+    _encodeAllChars: function(str) {
         //TODO Do this programatically
         return encodeURIComponent(str)
             .replace(/!/g, "%21")

src/js/operations/UUID.js

@@ -16,7 +16,7 @@ var UUID = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_generate_v4: function(input, args) {
+    runGenerateV4: function(input, args) {
         if (typeof(window.crypto) !== "undefined" && typeof(window.crypto.getRandomValues) !== "undefined") {
             var buf = new Uint32Array(4),
                 i = 0;

src/js/operations/Unicode.js

@@ -22,8 +22,8 @@ var Unicode = {
      * @param {Object[]} args
      * @returns {string}
      */
-    run_unescape: function(input, args) {
-        var prefix = Unicode._prefix_to_regex[args[0]],
+    runUnescape: function(input, args) {
+        var prefix = Unicode._prefixToRegex[args[0]],
             regex = new RegExp(prefix+"([a-f\\d]{4,6})", "ig"),
             output = "",
             m,
@@ -53,7 +53,7 @@ var Unicode = {
      * @private
      * @constant
      */
-    _prefix_to_regex: {
+    _prefixToRegex: {
         "\\u": "\\\\u",
         "%u": "%u",
         "U+": "U\\+"

src/js/views/html/ControlsWaiter.js

@@ -19,15 +19,15 @@ var ControlsWaiter = function(app, manager) {
  * Adjusts the display properties of the control buttons so that they fit within the current width
  * without wrapping or overflowing.
  */
-ControlsWaiter.prototype.adjust_width = function() {
-    var controls       = document.getElementById("controls"),
-        step           = document.getElementById("step"),
-        clr_breaks     = document.getElementById("clr-breaks"),
-        save_img       = document.querySelector("#save img"),
-        load_img       = document.querySelector("#load img"),
-        step_img       = document.querySelector("#step img"),
-        clr_recip_img  = document.querySelector("#clr-recipe img"),
-        clr_breaks_img = document.querySelector("#clr-breaks img");
+ControlsWaiter.prototype.adjustWidth = function() {
+    var controls     = document.getElementById("controls"),
+        step         = document.getElementById("step"),
+        clrBreaks    = document.getElementById("clr-breaks"),
+        saveImg      = document.querySelector("#save img"),
+        loadImg      = document.querySelector("#load img"),
+        stepImg      = document.querySelector("#step img"),
+        clrRecipImg  = document.querySelector("#clr-recipe img"),
+        clrBreaksImg = document.querySelector("#clr-breaks img");
     
     if (controls.clientWidth < 470) {
         step.childNodes[1].nodeValue = " Step";
@@ -36,23 +36,23 @@ ControlsWaiter.prototype.adjust_width = function() {
     }
         
     if (controls.clientWidth < 400) {
-        save_img.style.display = "none";
-        load_img.style.display = "none";
-        step_img.style.display = "none";
-        clr_recip_img.style.display = "none";
-        clr_breaks_img.style.display = "none";
+        saveImg.style.display = "none";
+        loadImg.style.display = "none";
+        stepImg.style.display = "none";
+        clrRecipImg.style.display = "none";
+        clrBreaksImg.style.display = "none";
     } else {
-        save_img.style.display = "inline";
-        load_img.style.display = "inline";
-        step_img.style.display = "inline";
-        clr_recip_img.style.display = "inline";
-        clr_breaks_img.style.display = "inline";
+        saveImg.style.display = "inline";
+        loadImg.style.display = "inline";
+        stepImg.style.display = "inline";
+        clrRecipImg.style.display = "inline";
+        clrBreaksImg.style.display = "inline";
     }
     
     if (controls.clientWidth < 330) {
-        clr_breaks.childNodes[1].nodeValue = " Clear breaks";
+        clrBreaks.childNodes[1].nodeValue = " Clear breaks";
     } else {
-        clr_breaks.childNodes[1].nodeValue = " Clear breakpoints";
+        clrBreaks.childNodes[1].nodeValue = " Clear breakpoints";
     }
 };
 
@@ -62,11 +62,11 @@ ControlsWaiter.prototype.adjust_width = function() {
  *
  * @param {boolean} value - The new value for Auto Bake.
  */
-ControlsWaiter.prototype.set_auto_bake = function(value) {
-    var auto_bake_checkbox = document.getElementById("auto-bake");
+ControlsWaiter.prototype.setAutoBake = function(value) {
+    var autoBakeCheckbox = document.getElementById("auto-bake");
     
-    if (auto_bake_checkbox.checked !== value) {
-        auto_bake_checkbox.click();
+    if (autoBakeCheckbox.checked !== value) {
+        autoBakeCheckbox.click();
     }
 };
 
@@ -74,7 +74,7 @@ ControlsWaiter.prototype.set_auto_bake = function(value) {
 /**
  * Handler to trigger baking.
  */
-ControlsWaiter.prototype.bake_click = function() {
+ControlsWaiter.prototype.bakeClick = function() {
     this.app.bake();
     $("#output-text").selectRange(0);
 };
@@ -83,7 +83,7 @@ ControlsWaiter.prototype.bake_click = function() {
 /**
  * Handler for the 'Step through' command. Executes the next step of the recipe.
  */
-ControlsWaiter.prototype.step_click = function() {
+ControlsWaiter.prototype.stepClick = function() {
     this.app.bake(true);
     $("#output-text").selectRange(0);
 };
@@ -92,18 +92,18 @@ ControlsWaiter.prototype.step_click = function() {
 /**
  * Handler for changes made to the Auto Bake checkbox.
  */
-ControlsWaiter.prototype.auto_bake_change = function() {
-    var auto_bake_label    = document.getElementById("auto-bake-label"),
-        auto_bake_checkbox = document.getElementById("auto-bake");
+ControlsWaiter.prototype.autoBakeChange = function() {
+    var autoBakeLabel    = document.getElementById("auto-bake-label"),
+        autoBakeCheckbox = document.getElementById("auto-bake");
         
-    this.app.auto_bake_ = auto_bake_checkbox.checked;
+    this.app.autoBake_ = autoBakeCheckbox.checked;
     
-    if (auto_bake_checkbox.checked) {
-        auto_bake_label.classList.remove("btn-default");
-        auto_bake_label.classList.add("btn-success");
+    if (autoBakeCheckbox.checked) {
+        autoBakeLabel.classList.remove("btn-default");
+        autoBakeLabel.classList.add("btn-success");
     } else {
-        auto_bake_label.classList.remove("btn-success");
-        auto_bake_label.classList.add("btn-default");
+        autoBakeLabel.classList.remove("btn-success");
+        autoBakeLabel.classList.add("btn-default");
     }
 };
 
@@ -111,8 +111,8 @@ ControlsWaiter.prototype.auto_bake_change = function() {
 /**
  * Handler for the 'Clear recipe' command. Removes all operations from the recipe.
  */
-ControlsWaiter.prototype.clear_recipe_click = function() {
-    this.manager.recipe.clear_recipe();
+ControlsWaiter.prototype.clearRecipeClick = function() {
+    this.manager.recipe.clearRecipe();
 };
 
 
@@ -120,8 +120,8 @@ ControlsWaiter.prototype.clear_recipe_click = function() {
  * Handler for the 'Clear breakpoints' command. Removes all breakpoints from operations in the
  * recipe.
  */
-ControlsWaiter.prototype.clear_breaks_click = function() {
-    var bps = document.querySelectorAll("#rec_list li.operation .breakpoint");
+ControlsWaiter.prototype.clearBreaksClick = function() {
+    var bps = document.querySelectorAll("#rec-list li.operation .breakpoint");
     
     for (var i = 0; i < bps.length; i++) {
         bps[i].setAttribute("break", "false");
@@ -133,49 +133,49 @@ ControlsWaiter.prototype.clear_breaks_click = function() {
 /**
  * Populates the save disalog box with a URL incorporating the recipe and input.
  *
- * @param {Object[]} [recipe_config] - The recipe configuration object array.
+ * @param {Object[]} [recipeConfig] - The recipe configuration object array.
  */
-ControlsWaiter.prototype.initialise_save_link = function(recipe_config) {
-    recipe_config = recipe_config || this.app.get_recipe_config();
+ControlsWaiter.prototype.initialiseSaveLink = function(recipeConfig) {
+    recipeConfig = recipeConfig || this.app.getRecipeConfig();
     
-    var include_recipe = document.getElementById("save-link-recipe-checkbox").checked,
-        include_input = document.getElementById("save-link-input-checkbox").checked,
-        save_link_el = document.getElementById("save-link"),
-        save_link = this.generate_state_url(include_recipe, include_input, recipe_config);
+    var includeRecipe = document.getElementById("save-link-recipe-checkbox").checked,
+        includeInput = document.getElementById("save-link-input-checkbox").checked,
+        saveLinkEl = document.getElementById("save-link"),
+        saveLink = this.generateStateUrl(includeRecipe, includeInput, recipeConfig);
     
-    save_link_el.innerHTML = Utils.truncate(save_link, 120);
-    save_link_el.setAttribute("href", save_link);
+    saveLinkEl.innerHTML = Utils.truncate(saveLink, 120);
+    saveLinkEl.setAttribute("href", saveLink);
 };
 
 
 /**
  * Generates a URL containing the current recipe and input state.
  *
- * @param {boolean} include_recipe - Whether to include the recipe in the URL.
- * @param {boolean} include_input - Whether to include the input in the URL.
- * @param {Object[]} [recipe_config] - The recipe configuration object array.
+ * @param {boolean} includeRecipe - Whether to include the recipe in the URL.
+ * @param {boolean} includeInput - Whether to include the input in the URL.
+ * @param {Object[]} [recipeConfig] - The recipe configuration object array.
  * @returns {string}
  */
-ControlsWaiter.prototype.generate_state_url = function(include_recipe, include_input, recipe_config) {
-    recipe_config = recipe_config || this.app.get_recipe_config();
+ControlsWaiter.prototype.generateStateUrl = function(includeRecipe, includeInput, recipeConfig) {
+    recipeConfig = recipeConfig || this.app.getRecipeConfig();
     
     var link = window.location.protocol + "//" +
                 window.location.host +
                 window.location.pathname,
-        recipe_str = JSON.stringify(recipe_config),
-        input_str = Utils.to_base64(this.app.get_input(), "A-Za-z0-9+/"); // B64 alphabet with no padding
+        recipeStr = JSON.stringify(recipeConfig),
+        inputStr = Utils.toBase64(this.app.getInput(), "A-Za-z0-9+/"); // B64 alphabet with no padding
         
-    include_recipe = include_recipe && (recipe_config.length > 0);
-    include_input = include_input && (input_str.length > 0) && (input_str.length < 8000);
+    includeRecipe = includeRecipe && (recipeConfig.length > 0);
+    includeInput = includeInput && (inputStr.length > 0) && (inputStr.length < 8000);
 
-    if (include_recipe) {
-        link += "?recipe=" + encodeURIComponent(recipe_str);
+    if (includeRecipe) {
+        link += "?recipe=" + encodeURIComponent(recipeStr);
     }
     
-    if (include_recipe && include_input) {
-        link += "&input=" + encodeURIComponent(input_str);
-    } else if (include_input) {
-        link += "?input=" + encodeURIComponent(input_str);
+    if (includeRecipe && includeInput) {
+        link += "&input=" + encodeURIComponent(inputStr);
+    } else if (includeInput) {
+        link += "?input=" + encodeURIComponent(inputStr);
     }
     
     return link;
@@ -185,10 +185,10 @@ ControlsWaiter.prototype.generate_state_url = function(include_recipe, include_i
 /**
  * Handler for changes made to the save dialog text area. Re-initialises the save link.
  */
-ControlsWaiter.prototype.save_text_change = function() {
+ControlsWaiter.prototype.saveTextChange = function() {
     try {
-        var recipe_config = JSON.parse(document.getElementById("save-text").value);
-        this.initialise_save_link(recipe_config);
+        var recipeConfig = JSON.parse(document.getElementById("save-text").value);
+        this.initialiseSaveLink(recipeConfig);
     } catch(err) {}
 };
 
@@ -196,12 +196,13 @@ ControlsWaiter.prototype.save_text_change = function() {
 /**
  * Handler for the 'Save' command. Pops up the save dialog box.
  */
-ControlsWaiter.prototype.save_click = function() {
-    var recipe_config = this.app.get_recipe_config();
-    var recipe_str = JSON.stringify(recipe_config).replace(/},{/g, "},\n{");
-    document.getElementById("save-text").value = recipe_str;
+ControlsWaiter.prototype.saveClick = function() {
+    var recipeConfig = this.app.getRecipeConfig(),
+        recipeStr = JSON.stringify(recipeConfig).replace(/},{/g, "},\n{");
+        
+    document.getElementById("save-text").value = recipeStr;
     
-    this.initialise_save_link(recipe_config);
+    this.initialiseSaveLink(recipeConfig);
     $("#save-modal").modal();
 };
 
@@ -209,24 +210,24 @@ ControlsWaiter.prototype.save_click = function() {
 /**
  * Handler for the save link recipe checkbox change event.
  */
-ControlsWaiter.prototype.slr_check_change = function() {
-    this.initialise_save_link();
+ControlsWaiter.prototype.slrCheckChange = function() {
+    this.initialiseSaveLink();
 };
 
 
 /**
  * Handler for the save link input checkbox change event.
  */
-ControlsWaiter.prototype.sli_check_change = function() {
-    this.initialise_save_link();
+ControlsWaiter.prototype.sliCheckChange = function() {
+    this.initialiseSaveLink();
 };
 
 
 /**
  * Handler for the 'Load' command. Pops up the load dialog box.
  */
-ControlsWaiter.prototype.load_click = function() {
-    this.populate_load_recipes_list();
+ControlsWaiter.prototype.loadClick = function() {
+    this.populateLoadRecipesList();
     $("#load-modal").modal();
 };
 
@@ -234,88 +235,88 @@ ControlsWaiter.prototype.load_click = function() {
 /**
  * Saves the recipe specified in the save textarea to local storage.
  */
-ControlsWaiter.prototype.save_button_click = function() {
-    var recipe_name = document.getElementById("save-name").value,
-        recipe_str  = document.getElementById("save-text").value;
+ControlsWaiter.prototype.saveButtonClick = function() {
+    var recipeName = document.getElementById("save-name").value,
+        recipeStr  = document.getElementById("save-text").value;
     
-    if (!recipe_name) {
+    if (!recipeName) {
         this.app.alert("Please enter a recipe name", "danger", 2000);
         return;
     }
     
-    var saved_recipes = localStorage.saved_recipes ?
-            JSON.parse(localStorage.saved_recipes) : [],
-        recipe_id = localStorage.recipe_id || 0;
+    var savedRecipes = localStorage.savedRecipes ?
+            JSON.parse(localStorage.savedRecipes) : [],
+        recipeId = localStorage.recipeId || 0;
     
-    saved_recipes.push({
-        id: ++recipe_id,
-        name: recipe_name,
-        recipe: recipe_str
+    savedRecipes.push({
+        id: ++recipeId,
+        name: recipeName,
+        recipe: recipeStr
     });
     
-    localStorage.saved_recipes = JSON.stringify(saved_recipes);
-    localStorage.recipe_id = recipe_id;
+    localStorage.savedRecipes = JSON.stringify(savedRecipes);
+    localStorage.recipeId = recipeId;
     
-    this.app.alert("Recipe saved as \"" + recipe_name + "\".", "success", 2000);
+    this.app.alert("Recipe saved as \"" + recipeName + "\".", "success", 2000);
 };
 
 
 /**
  * Populates the list of saved recipes in the load dialog box from local storage.
  */
-ControlsWaiter.prototype.populate_load_recipes_list = function() {
-    var load_name_el = document.getElementById("load-name");
+ControlsWaiter.prototype.populateLoadRecipesList = function() {
+    var loadNameEl = document.getElementById("load-name");
         
     // Remove current recipes from select
-    var i = load_name_el.options.length;
+    var i = loadNameEl.options.length;
     while (i--) {
-        load_name_el.remove(i);
+        loadNameEl.remove(i);
     }
 
     // Add recipes to select
-    var saved_recipes = localStorage.saved_recipes ?
-            JSON.parse(localStorage.saved_recipes) : [];
+    var savedRecipes = localStorage.savedRecipes ?
+            JSON.parse(localStorage.savedRecipes) : [];
     
-    for (i = 0; i < saved_recipes.length; i++) {
+    for (i = 0; i < savedRecipes.length; i++) {
         var opt = document.createElement("option");
-        opt.value = saved_recipes[i].id;
-        opt.innerHTML = saved_recipes[i].name;
+        opt.value = savedRecipes[i].id;
+        opt.innerHTML = savedRecipes[i].name;
         
-        load_name_el.appendChild(opt);
+        loadNameEl.appendChild(opt);
     }
     
     // Populate textarea with first recipe
-    document.getElementById("load-text").value = saved_recipes.length ? saved_recipes[0].recipe : "";
+    document.getElementById("load-text").value = savedRecipes.length ? savedRecipes[0].recipe : "";
 };
 
 
 /**
  * Removes the currently selected recipe from local storage.
  */
-ControlsWaiter.prototype.load_delete_click = function() {
+ControlsWaiter.prototype.loadDeleteClick = function() {
     var id = parseInt(document.getElementById("load-name").value, 10),
-        saved_recipes = localStorage.saved_recipes ?
-            JSON.parse(localStorage.saved_recipes) : [];
+        savedRecipes = localStorage.savedRecipes ?
+            JSON.parse(localStorage.savedRecipes) : [];
         
-    saved_recipes = saved_recipes.filter(function(r) {
+    savedRecipes = savedRecipes.filter(function(r) {
         return r.id !== id;
     });
     
-    localStorage.saved_recipes = JSON.stringify(saved_recipes);
-    this.populate_load_recipes_list();
+    localStorage.savedRecipes = JSON.stringify(savedRecipes);
+    this.populateLoadRecipesList();
 };
 
 
 /**
  * Displays the selected recipe in the load text box.
  */
-ControlsWaiter.prototype.load_name_change = function(e) {
+ControlsWaiter.prototype.loadNameChange = function(e) {
     var el = e.target,
-        saved_recipes = localStorage.saved_recipes ?
-            JSON.parse(localStorage.saved_recipes) : [],
+        savedRecipes = localStorage.savedRecipes ?
+            JSON.parse(localStorage.savedRecipes) : [],
         id = parseInt(el.value, 10);
         
-    var recipe = saved_recipes.filter(function(r) {
+    var recipe = savedRecipes.filter(function(r) {
         return r.id === id;
     })[0];
     
@@ -326,12 +327,12 @@ ControlsWaiter.prototype.load_name_change = function(e) {
 /**
  * Loads the selected recipe and populates the Recipe with its operations.
  */
-ControlsWaiter.prototype.load_button_click = function() {
+ControlsWaiter.prototype.loadButtonClick = function() {
     try {
-        var recipe_config = JSON.parse(document.getElementById("load-text").value);
-        this.app.set_recipe_config(recipe_config);
+        var recipeConfig = JSON.parse(document.getElementById("load-text").value);
+        this.app.setRecipeConfig(recipeConfig);
 
-        $("#rec_list [data-toggle=popover]").popover();
+        $("#rec-list [data-toggle=popover]").popover();
     } catch(e) {
         this.app.alert("Invalid recipe", "danger", 2000);
     }

src/js/views/html/HTMLApp.js

@@ -11,22 +11,22 @@
  * @constructor
  * @param {CatConf[]} categories - The list of categories and operations to be populated.
  * @param {Object.<string, OpConf>} operations - The list of operation configuration objects.
- * @param {String[]} default_favourites - A list of default favourite operations.
+ * @param {String[]} defaultFavourites - A list of default favourite operations.
  * @param {Object} options - Default setting for app options.
  */
-var HTMLApp = function(categories, operations, default_favourites, default_options) {
+var HTMLApp = function(categories, operations, defaultFavourites, defaultOptions) {
     this.categories  = categories;
     this.operations  = operations;
-    this.dfavourites = default_favourites;
-    this.doptions    = default_options;
-    this.options     = Utils.extend({}, default_options);
+    this.dfavourites = defaultFavourites;
+    this.doptions    = defaultOptions;
+    this.options     = Utils.extend({}, defaultOptions);
 
     this.chef        = new Chef();
     this.manager     = new Manager(this);
 
-    this.auto_bake_  = false;
+    this.autoBake_   = false;
     this.progress    = 0;
-    this.ing_id      = 0;
+    this.ingId       = 0;
 
     window.chef      = this.chef;
 };
@@ -39,13 +39,13 @@ var HTMLApp = function(categories, operations, default_favourites, default_optio
  */
 HTMLApp.prototype.setup = function() {
     document.dispatchEvent(this.manager.appstart);
-    this.initialise_splitter();
-    this.load_local_storage();
-    this.populate_operations_list();
+    this.initialiseSplitter();
+    this.loadLocalStorage();
+    this.populateOperationsList();
     this.manager.setup();
-    this.reset_layout();
-    this.set_compile_message();
-    this.load_URI_params();
+    this.resetLayout();
+    this.setCompileMessage();
+    this.loadURIParams();
 };
 
 
@@ -54,10 +54,10 @@ HTMLApp.prototype.setup = function() {
  *
  * @param {Error} err
  */
-HTMLApp.prototype.handle_error = function(err) {
+HTMLApp.prototype.handleError = function(err) {
     console.error(err);
-    var msg = err.display_str || err.toString();
-    this.alert(msg, "danger", this.options.error_timeout, !this.options.show_errors);
+    var msg = err.displayStr || err.toString();
+    this.alert(msg, "danger", this.options.errorTimeout, !this.options.showErrors);
 };
 
 
@@ -72,32 +72,32 @@ HTMLApp.prototype.bake = function(step) {
 
     try {
         response = this.chef.bake(
-            this.get_input(),         // The user's input
-            this.get_recipe_config(), // The configuration of the recipe
+            this.getInput(),         // The user's input
+            this.getRecipeConfig(), // The configuration of the recipe
             this.options,             // Options set by the user
             this.progress,            // The current position in the recipe
             step                      // Whether or not to take one step or execute the whole recipe
         );
     } catch (err) {
-        this.handle_error(err);
+        this.handleError(err);
     }
 
     if (!response) return;
 
     if (response.error) {
-        this.handle_error(response.error);
+        this.handleError(response.error);
     }
 
     this.options  = response.options;
-    this.dish_str = response.type === "html" ? Utils.strip_html_tags(response.result, true) : response.result;
+    this.dishStr  = response.type === "html" ? Utils.stripHtmlTags(response.result, true) : response.result;
     this.progress = response.progress;
-    this.manager.recipe.update_breakpoint_indicator(response.progress);
+    this.manager.recipe.updateBreakpointIndicator(response.progress);
     this.manager.output.set(response.result, response.type, response.duration);
 
     // If baking took too long, disable auto-bake
-    if (response.duration > this.options.auto_bake_threshold && this.auto_bake_) {
-        this.manager.controls.set_auto_bake(false);
-        this.alert("Baking took longer than " + this.options.auto_bake_threshold +
+    if (response.duration > this.options.autoBakeThreshold && this.autoBake_) {
+        this.manager.controls.setAutoBake(false);
+        this.alert("Baking took longer than " + this.options.autoBakeThreshold +
             "ms, Auto Bake has been disabled.", "warning", 5000);
     }
 };
@@ -106,8 +106,8 @@ HTMLApp.prototype.bake = function(step) {
 /**
  * Runs Auto Bake if it is set.
  */
-HTMLApp.prototype.auto_bake = function() {
-    if (this.auto_bake_) {
+HTMLApp.prototype.autoBake = function() {
+    if (this.autoBake_) {
         this.bake();
     }
 };
@@ -122,15 +122,15 @@ HTMLApp.prototype.auto_bake = function() {
  *
  * @returns {number} - The number of miliseconds it took to run the silent bake.
  */
-HTMLApp.prototype.silent_bake = function() {
-    var start_time = new Date().getTime(),
-        recipe_config = this.get_recipe_config();
+HTMLApp.prototype.silentBake = function() {
+    var startTime = new Date().getTime(),
+        recipeConfig = this.getRecipeConfig();
 
-    if (this.auto_bake_) {
-        this.chef.silent_bake(recipe_config);
+    if (this.autoBake_) {
+        this.chef.silentBake(recipeConfig);
     }
 
-    return new Date().getTime() - start_time;
+    return new Date().getTime() - startTime;
 };
 
 
@@ -139,11 +139,11 @@ HTMLApp.prototype.silent_bake = function() {
  *
  * @returns {string}
  */
-HTMLApp.prototype.get_input = function() {
+HTMLApp.prototype.getInput = function() {
     var input = this.manager.input.get();
 
     // Save to session storage in case we need to restore it later
-    sessionStorage.setItem("input_length", input.length);
+    sessionStorage.setItem("inputLength", input.length);
     sessionStorage.setItem("input", input);
 
     return input;
@@ -155,8 +155,8 @@ HTMLApp.prototype.get_input = function() {
  *
  * @param {string} input - The string to set the input to
  */
-HTMLApp.prototype.set_input = function(input) {
-    sessionStorage.setItem("input_length", input.length);
+HTMLApp.prototype.setInput = function(input) {
+    sessionStorage.setItem("inputLength", input.length);
     sessionStorage.setItem("input", input);
     this.manager.input.set(input);
 };
@@ -168,32 +168,32 @@ HTMLApp.prototype.set_input = function(input) {
  *
  * @fires Manager#oplistcreate
  */
-HTMLApp.prototype.populate_operations_list = function() {
+HTMLApp.prototype.populateOperationsList = function() {
     // Move edit button away before we overwrite it
     document.body.appendChild(document.getElementById("edit-favourites"));
 
     var html = "";
 
     for (var i = 0; i < this.categories.length; i++) {
-        var cat_conf = this.categories[i],
+        var catConf = this.categories[i],
             selected = i === 0,
-            cat = new HTMLCategory(cat_conf.name, selected);
+            cat = new HTMLCategory(catConf.name, selected);
 
-        for (var j = 0; j < cat_conf.ops.length; j++) {
-            var op_name = cat_conf.ops[j],
-                op = new HTMLOperation(op_name, this.operations[op_name], this, this.manager);
-            cat.add_operation(op);
+        for (var j = 0; j < catConf.ops.length; j++) {
+            var opName = catConf.ops[j],
+                op = new HTMLOperation(opName, this.operations[opName], this, this.manager);
+            cat.addOperation(op);
         }
 
-        html += cat.to_html();
+        html += cat.toHtml();
     }
 
     document.getElementById("categories").innerHTML = html;
 
-    var op_lists = document.querySelectorAll("#categories .op_list");
+    var opLists = document.querySelectorAll("#categories .op-list");
 
-    for (i = 0; i < op_lists.length; i++) {
-        op_lists[i].dispatchEvent(this.manager.oplistcreate);
+    for (i = 0; i < opLists.length; i++) {
+        opLists[i].dispatchEvent(this.manager.oplistcreate);
     }
 
     // Add edit button to first category (Favourites)
@@ -204,23 +204,23 @@ HTMLApp.prototype.populate_operations_list = function() {
 /**
  * Sets up the adjustable splitter to allow the user to resize areas of the page.
  */
-HTMLApp.prototype.initialise_splitter = function() {
-    this.column_splitter = Split(["#operations", "#recipe", "#IO"], {
+HTMLApp.prototype.initialiseSplitter = function() {
+    this.columnSplitter = Split(["#operations", "#recipe", "#IO"], {
         sizes: [20, 30, 50],
         minSize: [240, 325, 440],
         gutterSize: 4,
         onDrag: function() {
-            this.manager.controls.adjust_width();
-            this.manager.output.adjust_width();
+            this.manager.controls.adjustWidth();
+            this.manager.output.adjustWidth();
         }.bind(this)
     });
 
-    this.io_splitter = Split(["#input", "#output"], {
+    this.ioSplitter = Split(["#input", "#output"], {
         direction: "vertical",
         gutterSize: 4,
     });
 
-    this.reset_layout();
+    this.resetLayout();
 };
 
 
@@ -228,16 +228,16 @@ HTMLApp.prototype.initialise_splitter = function() {
  * Loads the information previously saved to the HTML5 local storage object so that user options
  * and favourites can be restored.
  */
-HTMLApp.prototype.load_local_storage = function() {
+HTMLApp.prototype.loadLocalStorage = function() {
     // Load options
-    var l_options;
+    var lOptions;
     if (localStorage.options !== undefined) {
-        l_options = JSON.parse(localStorage.options);
+        lOptions = JSON.parse(localStorage.options);
     }
-    this.manager.options.load(l_options);
+    this.manager.options.load(lOptions);
 
     // Load favourites
-    this.load_favourites();
+    this.loadFavourites();
 };
 
 
@@ -246,21 +246,21 @@ HTMLApp.prototype.load_local_storage = function() {
  * Favourites category with them.
  * If the user currently has no saved favourites, the defaults from the view constructor are used.
  */
-HTMLApp.prototype.load_favourites = function() {
+HTMLApp.prototype.loadFavourites = function() {
     var favourites = localStorage.favourites &&
         localStorage.favourites.length > 2 ?
         JSON.parse(localStorage.favourites) :
         this.dfavourites;
 
-    favourites = this.valid_favourites(favourites);
-    this.save_favourites(favourites);
+    favourites = this.validFavourites(favourites);
+    this.saveFavourites(favourites);
 
-    var fav_cat = this.categories.filter(function(c) {
+    var favCat = this.categories.filter(function(c) {
         return c.name === "Favourites";
     })[0];
 
-    if (fav_cat) {
-        fav_cat.ops = favourites;
+    if (favCat) {
+        favCat.ops = favourites;
     } else {
         this.categories.unshift({
             name: "Favourites",
@@ -277,17 +277,17 @@ HTMLApp.prototype.load_favourites = function() {
  * @param {string[]} favourites - A list of the user's favourite operations
  * @returns {string[]} A list of the valid favourites
  */
-HTMLApp.prototype.valid_favourites = function(favourites) {
-    var valid_favs = [];
+HTMLApp.prototype.validFavourites = function(favourites) {
+    var validFavs = [];
     for (var i = 0; i < favourites.length; i++) {
         if (this.operations.hasOwnProperty(favourites[i])) {
-            valid_favs.push(favourites[i]);
+            validFavs.push(favourites[i]);
         } else {
-            this.alert("The operation \"" + Utils.escape_html(favourites[i]) +
+            this.alert("The operation \"" + Utils.escapeHtml(favourites[i]) +
                 "\" is no longer available. It has been removed from your favourites.", "info");
         }
     }
-    return valid_favs;
+    return validFavs;
 };
 
 
@@ -296,8 +296,8 @@ HTMLApp.prototype.valid_favourites = function(favourites) {
  *
  * @param {string[]} favourites - A list of the user's favourite operations
  */
-HTMLApp.prototype.save_favourites = function(favourites) {
-    localStorage.setItem("favourites", JSON.stringify(this.valid_favourites(favourites)));
+HTMLApp.prototype.saveFavourites = function(favourites) {
+    localStorage.setItem("favourites", JSON.stringify(this.validFavourites(favourites)));
 };
 
 
@@ -305,11 +305,11 @@ HTMLApp.prototype.save_favourites = function(favourites) {
  * Resets favourite operations back to the default as specified in the view constructor and
  * refreshes the operation list.
  */
-HTMLApp.prototype.reset_favourites = function() {
-    this.save_favourites(this.dfavourites);
-    this.load_favourites();
-    this.populate_operations_list();
-    this.manager.recipe.initialise_operation_drag_n_drop();
+HTMLApp.prototype.resetFavourites = function() {
+    this.saveFavourites(this.dfavourites);
+    this.loadFavourites();
+    this.populateOperationsList();
+    this.manager.recipe.initialiseOperationDragNDrop();
 };
 
 
@@ -318,7 +318,7 @@ HTMLApp.prototype.reset_favourites = function() {
  *
  * @param {string} name - The name of the operation
  */
-HTMLApp.prototype.add_favourite = function(name) {
+HTMLApp.prototype.addFavourite = function(name) {
     var favourites = JSON.parse(localStorage.favourites);
 
     if (favourites.indexOf(name) >= 0) {
@@ -327,19 +327,19 @@ HTMLApp.prototype.add_favourite = function(name) {
     }
 
     favourites.push(name);
-    this.save_favourites(favourites);
-    this.load_favourites();
-    this.populate_operations_list();
-    this.manager.recipe.initialise_operation_drag_n_drop();
+    this.saveFavourites(favourites);
+    this.loadFavourites();
+    this.populateOperationsList();
+    this.manager.recipe.initialiseOperationDragNDrop();
 };
 
 
 /**
  * Checks for input and recipe in the URI parameters and loads them if present.
  */
-HTMLApp.prototype.load_URI_params = function() {
+HTMLApp.prototype.loadURIParams = function() {
     // Load query string from URI
-    this.query_string = (function(a) {
+    this.queryString = (function(a) {
         if (a === "") return {};
         var b = {};
         for (var i = 0; i < a.length; i++) {
@@ -354,46 +354,46 @@ HTMLApp.prototype.load_URI_params = function() {
     })(window.location.search.substr(1).split("&"));
 
     // Turn off auto-bake while loading
-    var auto_bake_val = this.auto_bake_;
-    this.auto_bake_ = false;
+    var autoBakeVal = this.autoBake_;
+    this.autoBake_ = false;
 
     // Read in recipe from query string
-    if (this.query_string.recipe) {
+    if (this.queryString.recipe) {
         try {
-            var recipe_config = JSON.parse(this.query_string.recipe);
-            this.set_recipe_config(recipe_config);
+            var recipeConfig = JSON.parse(this.queryString.recipe);
+            this.setRecipeConfig(recipeConfig);
         } catch(err) {}
-    } else if (this.query_string.op) {
+    } else if (this.queryString.op) {
         // If there's no recipe, look for single operations
-        this.manager.recipe.clear_recipe();
+        this.manager.recipe.clearRecipe();
         try {
-            this.manager.recipe.add_operation(this.query_string.op);
+            this.manager.recipe.addOperation(this.queryString.op);
         } catch(err) {
             // If no exact match, search for nearest match and add that
-            var matched_ops = this.manager.ops.filter_operations(this.query_string.op, false);
-            if (matched_ops.length) {
-                this.manager.recipe.add_operation(matched_ops[0].name);
+            var matchedOps = this.manager.ops.filterOperations(this.queryString.op, false);
+            if (matchedOps.length) {
+                this.manager.recipe.addOperation(matchedOps[0].name);
             }
 
             // Populate search with the string
             var search = document.getElementById("search");
 
-            search.value = this.query_string.op;
+            search.value = this.queryString.op;
             search.dispatchEvent(new Event("search"));
         }
     }
 
     // Read in input data from query string
-    if (this.query_string.input) {
+    if (this.queryString.input) {
         try {
-            var input_data = Utils.from_base64(this.query_string.input);
-            this.set_input(input_data);
+            var inputData = Utils.fromBase64(this.queryString.input);
+            this.setInput(inputData);
         } catch(err) {}
     }
 
     // Restore auto-bake state
-    this.auto_bake_ = auto_bake_val;
-    this.auto_bake();
+    this.autoBake_ = autoBakeVal;
+    this.autoBake();
 };
 
 
@@ -402,8 +402,8 @@ HTMLApp.prototype.load_URI_params = function() {
  *
  * @returns {number}
  */
-HTMLApp.prototype.next_ing_id = function() {
-    return this.ing_id++;
+HTMLApp.prototype.nextIngId = function() {
+    return this.ingId++;
 };
 
 
@@ -412,48 +412,48 @@ HTMLApp.prototype.next_ing_id = function() {
  *
  * @returns {Object[]}
  */
-HTMLApp.prototype.get_recipe_config = function() {
-    var recipe_config = this.manager.recipe.get_config();
-    sessionStorage.setItem("recipe_config", JSON.stringify(recipe_config));
-    return recipe_config;
+HTMLApp.prototype.getRecipeConfig = function() {
+    var recipeConfig = this.manager.recipe.getConfig();
+    sessionStorage.setItem("recipeConfig", JSON.stringify(recipeConfig));
+    return recipeConfig;
 };
 
 
 /**
  * Given a recipe configuration, sets the recipe to that configuration.
  *
- * @param {Object[]} recipe_config - The recipe configuration
+ * @param {Object[]} recipeConfig - The recipe configuration
  */
-HTMLApp.prototype.set_recipe_config = function(recipe_config) {
-    sessionStorage.setItem("recipe_config", JSON.stringify(recipe_config));
-    document.getElementById("rec_list").innerHTML = null;
+HTMLApp.prototype.setRecipeConfig = function(recipeConfig) {
+    sessionStorage.setItem("recipeConfig", JSON.stringify(recipeConfig));
+    document.getElementById("rec-list").innerHTML = null;
 
-    for (var i = 0; i < recipe_config.length; i++) {
-        var item = this.manager.recipe.add_operation(recipe_config[i].op);
+    for (var i = 0; i < recipeConfig.length; i++) {
+        var item = this.manager.recipe.addOperation(recipeConfig[i].op);
 
         // Populate arguments
         var args = item.querySelectorAll(".arg");
         for (var j = 0; j < args.length; j++) {
             if (args[j].getAttribute("type") === "checkbox") {
                 // checkbox
-                args[j].checked = recipe_config[i].args[j];
+                args[j].checked = recipeConfig[i].args[j];
             } else if (args[j].classList.contains("toggle-string")) {
-                // toggle_string
-                args[j].value = recipe_config[i].args[j].string;
+                // toggleString
+                args[j].value = recipeConfig[i].args[j].string;
                 args[j].previousSibling.children[0].innerHTML =
-                    Utils.escape_html(recipe_config[i].args[j].option) +
+                    Utils.escapeHtml(recipeConfig[i].args[j].option) +
                     " <span class='caret'></span>";
             } else {
                 // all others
-                args[j].value = recipe_config[i].args[j];
+                args[j].value = recipeConfig[i].args[j];
             }
         }
 
         // Set disabled and breakpoint
-        if (recipe_config[i].disabled) {
+        if (recipeConfig[i].disabled) {
             item.querySelector(".disable-icon").click();
         }
-        if (recipe_config[i].breakpoint) {
+        if (recipeConfig[i].breakpoint) {
             item.querySelector(".breakpoint").click();
         }
 
@@ -465,31 +465,31 @@ HTMLApp.prototype.set_recipe_config = function(recipe_config) {
 /**
  * Resets the splitter positions to default.
  */
-HTMLApp.prototype.reset_layout = function() {
-    this.column_splitter.setSizes([20, 30, 50]);
-    this.io_splitter.setSizes([50, 50]);
+HTMLApp.prototype.resetLayout = function() {
+    this.columnSplitter.setSizes([20, 30, 50]);
+    this.ioSplitter.setSizes([50, 50]);
 
-    this.manager.controls.adjust_width();
-    this.manager.output.adjust_width();
+    this.manager.controls.adjustWidth();
+    this.manager.output.adjustWidth();
 };
 
 
 /**
  * Sets the compile message.
  */
-HTMLApp.prototype.set_compile_message = function() {
+HTMLApp.prototype.setCompileMessage = function() {
     // Display time since last build and compile message
     var now = new Date(),
-        time_since_compile = Utils.fuzzy_time(now.getTime() - window.compile_time),
-        compile_info = "<span style=\"font-weight: normal\">Last build: " +
-            time_since_compile.substr(0, 1).toUpperCase() + time_since_compile.substr(1) + " ago";
+        timeSinceCompile = Utils.fuzzyTime(now.getTime() - window.compileTime),
+        compileInfo = "<span style=\"font-weight: normal\">Last build: " +
+            timeSinceCompile.substr(0, 1).toUpperCase() + timeSinceCompile.substr(1) + " ago";
 
-    if (window.compile_message !== "") {
-        compile_info += " - " + window.compile_message;
+    if (window.compileMessage !== "") {
+        compileInfo += " - " + window.compileMessage;
     }
 
-    compile_info += "</span>";
-    document.getElementById("notice").innerHTML = compile_info;
+    compileInfo += "</span>";
+    document.getElementById("notice").innerHTML = compileInfo;
 };
 
 
@@ -525,32 +525,32 @@ HTMLApp.prototype.alert = function(str, style, timeout, silent) {
     style = style || "danger";
     timeout = timeout || 0;
 
-    var alert_el = document.getElementById("alert"),
-        alert_content = document.getElementById("alert-content");
+    var alertEl = document.getElementById("alert"),
+        alertContent = document.getElementById("alert-content");
 
-    alert_el.classList.remove("alert-danger");
-    alert_el.classList.remove("alert-warning");
-    alert_el.classList.remove("alert-info");
-    alert_el.classList.remove("alert-success");
-    alert_el.classList.add("alert-" + style);
+    alertEl.classList.remove("alert-danger");
+    alertEl.classList.remove("alert-warning");
+    alertEl.classList.remove("alert-info");
+    alertEl.classList.remove("alert-success");
+    alertEl.classList.add("alert-" + style);
 
     // If the box hasn't been closed, append to it rather than replacing
-    if (alert_el.style.display === "block") {
-        alert_content.innerHTML +=
+    if (alertEl.style.display === "block") {
+        alertContent.innerHTML +=
             "<br><br>[" + time.toLocaleTimeString() + "] " + str;
     } else {
-        alert_content.innerHTML =
+        alertContent.innerHTML =
             "[" + time.toLocaleTimeString() + "] " + str;
     }
 
     // Stop the animation if it is in progress
     $("#alert").stop();
-    alert_el.style.display = "block";
-    alert_el.style.opacity = 1;
+    alertEl.style.display = "block";
+    alertEl.style.opacity = 1;
 
     if (timeout > 0) {
-        clearTimeout(this.alert_timeout);
-        this.alert_timeout = setTimeout(function(){
+        clearTimeout(this.alertTimeout);
+        this.alertTimeout = setTimeout(function(){
             $("#alert").slideUp(100);
         }, timeout);
     }
@@ -576,20 +576,20 @@ HTMLApp.prototype.confirm = function(title, body, callback, scope) {
     document.getElementById("confirm-body").innerHTML = body;
     document.getElementById("confirm-modal").style.display = "block";
 
-    this.confirm_closed = false;
+    this.confirmClosed = false;
     $("#confirm-modal").modal()
         .one("show.bs.modal", function(e) {
-            this.confirm_closed = false;
+            this.confirmClosed = false;
         }.bind(this))
         .one("click", "#confirm-yes", function() {
-            this.confirm_closed = true;
+            this.confirmClosed = true;
             callback.bind(scope)(true);
             $("#confirm-modal").modal("hide");
         }.bind(this))
         .one("hide.bs.modal", function(e) {
-            if (!this.confirm_closed)
+            if (!this.confirmClosed)
                 callback.bind(scope)(false);
-            this.confirm_closed = true;
+            this.confirmClosed = true;
         }.bind(this));
 };
 
@@ -598,7 +598,7 @@ HTMLApp.prototype.confirm = function(title, body, callback, scope) {
  * Handler for the alert close button click event.
  * Closes the alert box.
  */
-HTMLApp.prototype.alert_close_click = function() {
+HTMLApp.prototype.alertCloseClick = function() {
     document.getElementById("alert").style.display = "none";
 };
 
@@ -610,13 +610,13 @@ HTMLApp.prototype.alert_close_click = function() {
  * @listens Manager#statechange
  * @param {event} e
  */
-HTMLApp.prototype.state_change = function(e) {
-    this.auto_bake();
+HTMLApp.prototype.stateChange = function(e) {
+    this.autoBake();
 
     // Update the current history state (not creating a new one)
-    if (this.options.update_url) {
-        this.last_state_url = this.manager.controls.generate_state_url(true, true);
-        window.history.replaceState({}, "CyberChef", this.last_state_url);
+    if (this.options.updateUrl) {
+        this.lastStateUrl = this.manager.controls.generateStateUrl(true, true);
+        window.history.replaceState({}, "CyberChef", this.lastStateUrl);
     }
 };
 
@@ -627,9 +627,9 @@ HTMLApp.prototype.state_change = function(e) {
  *
  * @param {event} e
  */
-HTMLApp.prototype.pop_state = function(e) {
-    if (window.location.href.split("#")[0] !== this.last_state_url) {
-        this.load_URI_params();
+HTMLApp.prototype.popState = function(e) {
+    if (window.location.href.split("#")[0] !== this.lastStateUrl) {
+        this.loadURIParams();
     }
 };
 
@@ -637,11 +637,11 @@ HTMLApp.prototype.pop_state = function(e) {
 /**
  * Function to call an external API from this view.
  */
-HTMLApp.prototype.call_api = function(url, type, data, data_type, content_type) {
+HTMLApp.prototype.callApi = function(url, type, data, dataType, contentType) {
     type = type || "POST";
     data = data || {};
-    data_type = data_type || undefined;
-    content_type = content_type || "application/json";
+    dataType = dataType || undefined;
+    contentType = contentType || "application/json";
 
     var response = null,
         success = false;
@@ -651,8 +651,8 @@ HTMLApp.prototype.call_api = function(url, type, data, data_type, content_type)
         async: false,
         type: type,
         data: data,
-        dataType: data_type,
-        contentType: content_type,
+        dataType: dataType,
+        contentType: contentType,
         success: function(data) {
             success = true;
             response = data;

src/js/views/html/HTMLCategory.js

@@ -12,7 +12,7 @@
 var HTMLCategory = function(name, selected) {
     this.name = name;
     this.selected = selected;
-    this.op_list = [];
+    this.opList = [];
 };
 
 
@@ -21,8 +21,8 @@ var HTMLCategory = function(name, selected) {
  *
  * @param {HTMLOperation} operation - The operation to add.
  */
-HTMLCategory.prototype.add_operation = function(operation) {
-    this.op_list.push(operation);
+HTMLCategory.prototype.addOperation = function(operation) {
+    this.opList.push(operation);
 };
 
 
@@ -31,18 +31,18 @@ HTMLCategory.prototype.add_operation = function(operation) {
  *
  * @returns {string}
  */
-HTMLCategory.prototype.to_html = function() {
-    var cat_name = "cat" + this.name.replace(/[\s/-:_]/g, "");
+HTMLCategory.prototype.toHtml = function() {
+    var catName = "cat" + this.name.replace(/[\s/-:_]/g, "");
     var html = "<div class='panel category'>\
         <a class='category-title' data-toggle='collapse'\
-            data-parent='#categories' href='#" + cat_name + "'>\
+            data-parent='#categories' href='#" + catName + "'>\
             " + this.name + "\
         </a>\
-        <div id='" + cat_name + "' class='panel-collapse collapse\
-        " + (this.selected ? " in" : "") + "'><ul class='op_list'>";
+        <div id='" + catName + "' class='panel-collapse collapse\
+        " + (this.selected ? " in" : "") + "'><ul class='op-list'>";
     
-    for (var i = 0; i < this.op_list.length; i++) {
-        html += this.op_list[i].to_stub_html();
+    for (var i = 0; i < this.opList.length; i++) {
+        html += this.opList[i].toStubHtml();
     }
     
     html += "</ul></div></div>";

src/js/views/html/HTMLIngredient.js

@@ -18,11 +18,11 @@ var HTMLIngredient = function(config, app, manager) {
     this.type = config.type;
     this.value = config.value;
     this.disabled = config.disabled || false;
-    this.disable_args = config.disable_args || false;
+    this.disableArgs = config.disableArgs || false;
     this.placeholder = config.placeholder || false;
     this.target = config.target;
-    this.toggle_values = config.toggle_values;
-    this.id = "ing-" + this.app.next_ing_id();
+    this.toggleValues = config.toggleValues;
+    this.id = "ing-" + this.app.nextIngId();
 };
 
 
@@ -31,12 +31,12 @@ var HTMLIngredient = function(config, app, manager) {
  *
  * @returns {string}
  */
-HTMLIngredient.prototype.to_html = function() {
+HTMLIngredient.prototype.toHtml = function() {
     var inline = (this.type === "boolean" ||
                   this.type === "number" ||
                   this.type === "option" ||
-                  this.type === "short_string" ||
-                  this.type === "binary_short_string"),
+                  this.type === "shortString" ||
+                  this.type === "binaryShortString"),
         html = inline ? "" : "<div class='clearfix'>&nbsp;</div>",
         i, m;
     
@@ -46,50 +46,50 @@ HTMLIngredient.prototype.to_html = function() {
     
     switch (this.type) {
         case "string":
-        case "binary_string":
-        case "byte_array":
-            html += "<input type='text' id='" + this.id + "' class='arg arg-input' arg_name='" +
+        case "binaryString":
+        case "byteArray":
+            html += "<input type='text' id='" + this.id + "' class='arg arg-input' arg-name='" +
                 this.name + "' value='" + this.value + "'" +
                 (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + ">";
             break;
-        case "short_string":
-        case "binary_short_string":
+        case "shortString":
+        case "binaryShortString":
             html += "<input type='text' id='" + this.id +
-                "'class='arg arg-input short-string' arg_name='" + this.name + "'value='" +
+                "'class='arg arg-input short-string' arg-name='" + this.name + "'value='" +
                 this.value + "'" + (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + ">";
             break;
-        case "toggle_string":
+        case "toggleString":
             html += "<div class='input-group'><div class='input-group-btn'>\
                 <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'\
                 aria-haspopup='true' aria-expanded='false'" +
-                (this.disabled ? " disabled='disabled'" : "") + ">" + this.toggle_values[0] +
+                (this.disabled ? " disabled='disabled'" : "") + ">" + this.toggleValues[0] +
                 " <span class='caret'></span></button><ul class='dropdown-menu'>";
-            for (i = 0; i < this.toggle_values.length; i++) {
-                html += "<li><a href='#'>" + this.toggle_values[i] + "</a></li>";
+            for (i = 0; i < this.toggleValues.length; i++) {
+                html += "<li><a href='#'>" + this.toggleValues[i] + "</a></li>";
             }
             html += "</ul></div><input type='text' class='arg arg-input toggle-string'" +
                 (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + "></div>";
             break;
         case "number":
-            html += "<input type='number' id='" + this.id + "'class='arg arg-input' arg_name='" +
+            html += "<input type='number' id='" + this.id + "'class='arg arg-input' arg-name='" +
                 this.name + "'value='" + this.value + "'" +
                 (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + ">";
             break;
         case "boolean":
-            html += "<input type='checkbox' id='" + this.id + "'class='arg' arg_name='" +
+            html += "<input type='checkbox' id='" + this.id + "'class='arg' arg-name='" +
                 this.name + "'" + (this.value ? " checked='checked' " : "") +
                 (this.disabled ? " disabled='disabled'" : "") + ">";
             
-            if (this.disable_args) {
-                this.manager.add_dynamic_listener("#" + this.id, "click", this.toggle_disable_args, this);
+            if (this.disableArgs) {
+                this.manager.addDynamicListener("#" + this.id, "click", this.toggleDisableArgs, this);
             }
             break;
         case "option":
-            html += "<select class='arg' id='" + this.id + "'arg_name='" + this.name + "'" +
+            html += "<select class='arg' id='" + this.id + "'arg-name='" + this.name + "'" +
                 (this.disabled ? " disabled='disabled'" : "") + ">";
             for (i = 0; i < this.value.length; i++) {
                 if ((m = this.value[i].match(/\[([a-z0-9 -()^]+)\]/i))) {
@@ -102,8 +102,8 @@ HTMLIngredient.prototype.to_html = function() {
             }
             html += "</select>";
             break;
-        case "populate_option":
-            html += "<select class='arg' id='" + this.id + "'arg_name='" + this.name + "'" +
+        case "populateOption":
+            html += "<select class='arg' id='" + this.id + "'arg-name='" + this.name + "'" +
                 (this.disabled ? " disabled='disabled'" : "") + ">";
             for (i = 0; i < this.value.length; i++) {
                 if ((m = this.value[i].name.match(/\[([a-z0-9 -()^]+)\]/i))) {
@@ -117,9 +117,9 @@ HTMLIngredient.prototype.to_html = function() {
             }
             html += "</select>";
             
-            this.manager.add_dynamic_listener("#" + this.id, "change", this.populate_option_change, this);
+            this.manager.addDynamicListener("#" + this.id, "change", this.populateOptionChange, this);
             break;
-        case "editable_option":
+        case "editableOption":
             html += "<div class='editable-option'>";
             html += "<select class='editable-option-select' id='sel-" + this.id + "'" +
                 (this.disabled ? " disabled='disabled'" : "") + ">";
@@ -128,16 +128,16 @@ HTMLIngredient.prototype.to_html = function() {
             }
             html += "</select>";
             html += "<input class='arg arg-input editable-option-input' id='" + this.id +
-                "'arg_name='" + this.name + "'" + " value='" + this.value[0].value + "'" +
+                "'arg-name='" + this.name + "'" + " value='" + this.value[0].value + "'" +
                 (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + ">";
             html += "</div>";
             
             
-            this.manager.add_dynamic_listener("#sel-" + this.id, "change", this.editable_option_change, this);
+            this.manager.addDynamicListener("#sel-" + this.id, "change", this.editableOptionChange, this);
             break;
         case "text":
-            html += "<textarea id='" + this.id + "' class='arg' arg_name='" +
+            html += "<textarea id='" + this.id + "' class='arg' arg-name='" +
                 this.name + "'" + (this.disabled ? " disabled='disabled'" : "") +
                 (this.placeholder ? " placeholder='" + this.placeholder + "'" : "") + ">" +
                 this.value + "</textarea>";
@@ -153,18 +153,18 @@ HTMLIngredient.prototype.to_html = function() {
 
 /**
  * Handler for argument disable toggle.
- * Toggles disabled state for all arguments in the disable_args list for this ingredient.
+ * Toggles disabled state for all arguments in the disableArgs list for this ingredient.
  *
  * @param {event} e
  */
-HTMLIngredient.prototype.toggle_disable_args = function(e) {
+HTMLIngredient.prototype.toggleDisableArgs = function(e) {
     var el = e.target,
         op = el.parentNode.parentNode,
         args = op.querySelectorAll(".arg-group"),
         els;
         
-    for (var i = 0; i < this.disable_args.length; i++) {
-        els = args[this.disable_args[i]].querySelectorAll("input, select, button");
+    for (var i = 0; i < this.disableArgs.length; i++) {
+        els = args[this.disableArgs[i]].querySelectorAll("input, select, button");
         
         for (var j = 0; j < els.length; j++) {
             if (els[j].getAttribute("disabled")) {
@@ -175,7 +175,7 @@ HTMLIngredient.prototype.toggle_disable_args = function(e) {
         }
     }
     
-    this.manager.recipe.ing_change();
+    this.manager.recipe.ingChange();
 };
 
 
@@ -185,14 +185,14 @@ HTMLIngredient.prototype.toggle_disable_args = function(e) {
  *
  * @param {event} e
  */
-HTMLIngredient.prototype.populate_option_change = function(e) {
+HTMLIngredient.prototype.populateOptionChange = function(e) {
     var el = e.target,
         op = el.parentNode.parentNode,
         target = op.querySelectorAll(".arg-group")[this.target].querySelector("input, select, textarea");
 
     target.value = el.childNodes[el.selectedIndex].getAttribute("populate-value");
     
-    this.manager.recipe.ing_change();
+    this.manager.recipe.ingChange();
 };
 
 
@@ -202,11 +202,11 @@ HTMLIngredient.prototype.populate_option_change = function(e) {
  *
  * @param {event} e
  */
-HTMLIngredient.prototype.editable_option_change = function(e) {
+HTMLIngredient.prototype.editableOptionChange = function(e) {
     var select = e.target,
         input = select.nextSibling;
 
     input.value = select.childNodes[select.selectedIndex].value;
     
-    this.manager.recipe.ing_change();
+    this.manager.recipe.ingChange();
 };

src/js/views/html/HTMLOperation.js

@@ -17,13 +17,13 @@ var HTMLOperation = function(name, config, app, manager) {
     
     this.name        = name;
     this.description = config.description;
-    this.manual_bake = config.manual_bake || false;
+    this.manualBake  = config.manualBake || false;
     this.config      = config;
-    this.ing_list    = [];
+    this.ingList     = [];
     
     for (var i = 0; i < config.args.length; i++) {
         var ing = new HTMLIngredient(config.args[i], this.app, this.manager);
-        this.ing_list.push(ing);
+        this.ingList.push(ing);
     }
 };
 
@@ -43,7 +43,7 @@ HTMLOperation.REMOVE_ICON = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABwkl
  *
  * @returns {string}
  */
-HTMLOperation.prototype.to_stub_html = function(remove_icon) {
+HTMLOperation.prototype.toStubHtml = function(removeIcon) {
     var html = "<li class='operation'";
     
     if (this.description) {
@@ -53,7 +53,7 @@ HTMLOperation.prototype.to_stub_html = function(remove_icon) {
     
     html += ">" + this.name;
     
-    if (remove_icon) {
+    if (removeIcon) {
         html += "<img src='data:image/png;base64," + HTMLOperation.REMOVE_ICON +
             "' class='op-icon remove-icon'>";
     }
@@ -73,11 +73,11 @@ HTMLOperation.prototype.to_stub_html = function(remove_icon) {
  *
  * @returns {string}
  */
-HTMLOperation.prototype.to_full_html = function() {
+HTMLOperation.prototype.toFullHtml = function() {
     var html = "<div class='arg-title'>" + this.name + "</div>";
 
-    for (var i = 0; i < this.ing_list.length; i++) {
-        html += this.ing_list[i].to_html();
+    for (var i = 0; i < this.ingList.length; i++) {
+        html += this.ingList[i].toHtml();
     }
     
     html += "<div class='recip-icons'>\
@@ -95,20 +95,20 @@ HTMLOperation.prototype.to_full_html = function() {
 /**
  * Highlights the searched string in the name and description of the operation.
  *
- * @param {string} search_str
- * @param {number} name_pos - The position of the search string in the operation name
- * @param {number} desc_pos - The position of the search string in the operation description
+ * @param {string} searchStr
+ * @param {number} namePos - The position of the search string in the operation name
+ * @param {number} descPos - The position of the search string in the operation description
  */
-HTMLOperation.prototype.highlight_search_string = function(search_str, name_pos, desc_pos) {
-    if (name_pos >= 0) {
-        this.name = this.name.slice(0, name_pos) + "<b><u>" +
-            this.name.slice(name_pos, name_pos + search_str.length) + "</u></b>" +
-            this.name.slice(name_pos + search_str.length);
+HTMLOperation.prototype.highlightSearchString = function(searchStr, namePos, descPos) {
+    if (namePos >= 0) {
+        this.name = this.name.slice(0, namePos) + "<b><u>" +
+            this.name.slice(namePos, namePos + searchStr.length) + "</u></b>" +
+            this.name.slice(namePos + searchStr.length);
     }
     
-    if (this.description && desc_pos >= 0) {
-        this.description = this.description.slice(0, desc_pos) + "<b><u>" +
-            this.description.slice(desc_pos, desc_pos + search_str.length) + "</u></b>" +
-            this.description.slice(desc_pos + search_str.length);
+    if (this.description && descPos >= 0) {
+        this.description = this.description.slice(0, descPos) + "<b><u>" +
+            this.description.slice(descPos, descPos + searchStr.length) + "</u></b>" +
+            this.description.slice(descPos + searchStr.length);
     }
 };

src/js/views/html/HighlighterWaiter.js

@@ -11,8 +11,8 @@
 var HighlighterWaiter = function(app) {
     this.app = app;
 
-    this.mouse_button_down = false;
-    this.mouse_target = null;
+    this.mouseButtonDown = false;
+    this.mouseTarget = null;
 };
 
 
@@ -37,7 +37,7 @@ HighlighterWaiter.OUTPUT = 1;
  * @private
  * @returns {boolean}
  */
-HighlighterWaiter.prototype._is_selection_backwards = function() {
+HighlighterWaiter.prototype._isSelectionBackwards = function() {
     var backwards = false,
         sel = window.getSelection();
 
@@ -60,7 +60,7 @@ HighlighterWaiter.prototype._is_selection_backwards = function() {
  * @param {number} offset - The offset since the last HTML element.
  * @returns {number}
  */
-HighlighterWaiter.prototype._get_output_html_offset = function(node, offset) {
+HighlighterWaiter.prototype._getOutputHtmlOffset = function(node, offset) {
     var sel = window.getSelection(),
         range = document.createRange();
 
@@ -81,7 +81,7 @@ HighlighterWaiter.prototype._get_output_html_offset = function(node, offset) {
  * @returns {number} pos.start
  * @returns {number} pos.end
  */
-HighlighterWaiter.prototype._get_output_html_selection_offsets = function() {
+HighlighterWaiter.prototype._getOutputHtmlSelectionOffsets = function() {
     var sel = window.getSelection(),
         range,
         start = 0,
@@ -90,9 +90,9 @@ HighlighterWaiter.prototype._get_output_html_selection_offsets = function() {
 
     if (sel.rangeCount) {
         range = sel.getRangeAt(sel.rangeCount - 1);
-        backwards = this._is_selection_backwards();
-        start = this._get_output_html_offset(range.startContainer, range.startOffset);
-        end = this._get_output_html_offset(range.endContainer, range.endOffset);
+        backwards = this._isSelectionBackwards();
+        start = this._getOutputHtmlOffset(range.startContainer, range.startOffset);
+        end = this._getOutputHtmlOffset(range.endContainer, range.endOffset);
         sel.removeAllRanges();
         sel.addRange(range);
 
@@ -117,7 +117,7 @@ HighlighterWaiter.prototype._get_output_html_selection_offsets = function() {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.input_scroll = function(e) {
+HighlighterWaiter.prototype.inputScroll = function(e) {
     var el = e.target;
     document.getElementById("input-highlighter").scrollTop = el.scrollTop;
     document.getElementById("input-highlighter").scrollLeft = el.scrollLeft;
@@ -130,7 +130,7 @@ HighlighterWaiter.prototype.input_scroll = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_scroll = function(e) {
+HighlighterWaiter.prototype.outputScroll = function(e) {
     var el = e.target;
     document.getElementById("output-highlighter").scrollTop = el.scrollTop;
     document.getElementById("output-highlighter").scrollLeft = el.scrollLeft;
@@ -143,18 +143,18 @@ HighlighterWaiter.prototype.output_scroll = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.input_mousedown = function(e) {
-    this.mouse_button_down = true;
-    this.mouse_target = HighlighterWaiter.INPUT;
-    this.remove_highlights();
+HighlighterWaiter.prototype.inputMousedown = function(e) {
+    this.mouseButtonDown = true;
+    this.mouseTarget = HighlighterWaiter.INPUT;
+    this.removeHighlights();
 
     var el = e.target,
         start = el.selectionStart,
         end = el.selectionEnd;
 
     if (start !== 0 || end !== 0) {
-        document.getElementById("input-selection-info").innerHTML = this.selection_info(start, end);
-        this.highlight_output([{start: start, end: end}]);
+        document.getElementById("input-selection-info").innerHTML = this.selectionInfo(start, end);
+        this.highlightOutput([{start: start, end: end}]);
     }
 };
 
@@ -165,18 +165,18 @@ HighlighterWaiter.prototype.input_mousedown = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_mousedown = function(e) {
-    this.mouse_button_down = true;
-    this.mouse_target = HighlighterWaiter.OUTPUT;
-    this.remove_highlights();
+HighlighterWaiter.prototype.outputMousedown = function(e) {
+    this.mouseButtonDown = true;
+    this.mouseTarget = HighlighterWaiter.OUTPUT;
+    this.removeHighlights();
 
     var el = e.target,
         start = el.selectionStart,
         end = el.selectionEnd;
 
     if (start !== 0 || end !== 0) {
-        document.getElementById("output-selection-info").innerHTML = this.selection_info(start, end);
-        this.highlight_input([{start: start, end: end}]);
+        document.getElementById("output-selection-info").innerHTML = this.selectionInfo(start, end);
+        this.highlightInput([{start: start, end: end}]);
     }
 };
 
@@ -187,13 +187,13 @@ HighlighterWaiter.prototype.output_mousedown = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_html_mousedown = function(e) {
-    this.mouse_button_down = true;
-    this.mouse_target = HighlighterWaiter.OUTPUT;
+HighlighterWaiter.prototype.outputHtmlMousedown = function(e) {
+    this.mouseButtonDown = true;
+    this.mouseTarget = HighlighterWaiter.OUTPUT;
 
-    var sel = this._get_output_html_selection_offsets();
+    var sel = this._getOutputHtmlSelectionOffsets();
     if (sel.start !== 0 || sel.end !== 0) {
-        document.getElementById("output-selection-info").innerHTML = this.selection_info(sel.start, sel.end);
+        document.getElementById("output-selection-info").innerHTML = this.selectionInfo(sel.start, sel.end);
     }
 };
 
@@ -203,8 +203,8 @@ HighlighterWaiter.prototype.output_html_mousedown = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.input_mouseup = function(e) {
-    this.mouse_button_down = false;
+HighlighterWaiter.prototype.inputMouseup = function(e) {
+    this.mouseButtonDown = false;
 };
 
 
@@ -213,8 +213,8 @@ HighlighterWaiter.prototype.input_mouseup = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_mouseup = function(e) {
-    this.mouse_button_down = false;
+HighlighterWaiter.prototype.outputMouseup = function(e) {
+    this.mouseButtonDown = false;
 };
 
 
@@ -223,8 +223,8 @@ HighlighterWaiter.prototype.output_mouseup = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_html_mouseup = function(e) {
-    this.mouse_button_down = false;
+HighlighterWaiter.prototype.outputHtmlMouseup = function(e) {
+    this.mouseButtonDown = false;
 };
 
 
@@ -234,11 +234,11 @@ HighlighterWaiter.prototype.output_html_mouseup = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.input_mousemove = function(e) {
+HighlighterWaiter.prototype.inputMousemove = function(e) {
     // Check that the left mouse button is pressed
-    if (!this.mouse_button_down ||
+    if (!this.mouseButtonDown ||
         e.which !== 1 ||
-        this.mouse_target !== HighlighterWaiter.INPUT)
+        this.mouseTarget !== HighlighterWaiter.INPUT)
         return;
 
     var el = e.target,
@@ -246,8 +246,8 @@ HighlighterWaiter.prototype.input_mousemove = function(e) {
         end = el.selectionEnd;
 
     if (start !== 0 || end !== 0) {
-        document.getElementById("input-selection-info").innerHTML = this.selection_info(start, end);
-        this.highlight_output([{start: start, end: end}]);
+        document.getElementById("input-selection-info").innerHTML = this.selectionInfo(start, end);
+        this.highlightOutput([{start: start, end: end}]);
     }
 };
 
@@ -258,11 +258,11 @@ HighlighterWaiter.prototype.input_mousemove = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_mousemove = function(e) {
+HighlighterWaiter.prototype.outputMousemove = function(e) {
     // Check that the left mouse button is pressed
-    if (!this.mouse_button_down ||
+    if (!this.mouseButtonDown ||
         e.which !== 1 ||
-        this.mouse_target !== HighlighterWaiter.OUTPUT)
+        this.mouseTarget !== HighlighterWaiter.OUTPUT)
         return;
 
     var el = e.target,
@@ -270,8 +270,8 @@ HighlighterWaiter.prototype.output_mousemove = function(e) {
         end = el.selectionEnd;
 
     if (start !== 0 || end !== 0) {
-        document.getElementById("output-selection-info").innerHTML = this.selection_info(start, end);
-        this.highlight_input([{start: start, end: end}]);
+        document.getElementById("output-selection-info").innerHTML = this.selectionInfo(start, end);
+        this.highlightInput([{start: start, end: end}]);
     }
 };
 
@@ -282,16 +282,16 @@ HighlighterWaiter.prototype.output_mousemove = function(e) {
  *
  * @param {event} e
  */
-HighlighterWaiter.prototype.output_html_mousemove = function(e) {
+HighlighterWaiter.prototype.outputHtmlMousemove = function(e) {
     // Check that the left mouse button is pressed
-    if (!this.mouse_button_down ||
+    if (!this.mouseButtonDown ||
         e.which !== 1 ||
-        this.mouse_target !== HighlighterWaiter.OUTPUT)
+        this.mouseTarget !== HighlighterWaiter.OUTPUT)
         return;
 
-    var sel = this._get_output_html_selection_offsets();
+    var sel = this._getOutputHtmlSelectionOffsets();
     if (sel.start !== 0 || sel.end !== 0) {
-        document.getElementById("output-selection-info").innerHTML = this.selection_info(sel.start, sel.end);
+        document.getElementById("output-selection-info").innerHTML = this.selectionInfo(sel.start, sel.end);
     }
 };
 
@@ -304,21 +304,21 @@ HighlighterWaiter.prototype.output_html_mousemove = function(e) {
  * @param {number} end - The end offset.
  * @returns {string}
  */
-HighlighterWaiter.prototype.selection_info = function(start, end) {
+HighlighterWaiter.prototype.selectionInfo = function(start, end) {
     var width = end.toString().length;
     width = width < 2 ? 2 : width;
-    var start_str = Utils.pad(start.toString(), width, " ").replace(/ /g, "&nbsp;"),
-        end_str   = Utils.pad(end.toString(), width, " ").replace(/ /g, "&nbsp;"),
-        len_str   = Utils.pad((end-start).toString(), width, " ").replace(/ /g, "&nbsp;");
+    var startStr = Utils.pad(start.toString(), width, " ").replace(/ /g, "&nbsp;"),
+        endStr   = Utils.pad(end.toString(), width, " ").replace(/ /g, "&nbsp;"),
+        lenStr   = Utils.pad((end-start).toString(), width, " ").replace(/ /g, "&nbsp;");
 
-    return "start: " + start_str + "<br>end: " + end_str + "<br>length: " + len_str;
+    return "start: " + startStr + "<br>end: " + endStr + "<br>length: " + lenStr;
 };
 
 
 /**
  * Removes highlighting and selection information.
  */
-HighlighterWaiter.prototype.remove_highlights = function() {
+HighlighterWaiter.prototype.removeHighlights = function() {
     document.getElementById("input-highlighter").innerHTML = "";
     document.getElementById("output-highlighter").innerHTML = "";
     document.getElementById("input-selection-info").innerHTML = "";
@@ -335,25 +335,25 @@ HighlighterWaiter.prototype.remove_highlights = function() {
  * @returns {function} highlights[].b
  * @returns {Object[]} highlights[].args
  */
-HighlighterWaiter.prototype.generate_highlight_list = function() {
-    var recipe_config = this.app.get_recipe_config(),
+HighlighterWaiter.prototype.generateHighlightList = function() {
+    var recipeConfig = this.app.getRecipeConfig(),
         highlights = [];
 
-    for (var i = 0; i < recipe_config.length; i++) {
-        if (recipe_config[i].disabled) continue;
+    for (var i = 0; i < recipeConfig.length; i++) {
+        if (recipeConfig[i].disabled) continue;
 
         // If any breakpoints are set, do not attempt to highlight
-        if (recipe_config[i].breakpoint) return false;
+        if (recipeConfig[i].breakpoint) return false;
 
-        var op = this.app.operations[recipe_config[i].op];
+        var op = this.app.operations[recipeConfig[i].op];
 
         // If any of the operations do not support highlighting, fail immediately.
         if (op.highlight === false || op.highlight === undefined) return false;
 
         highlights.push({
             f: op.highlight,
-            b: op.highlight_reverse,
-            args: recipe_config[i].args
+            b: op.highlightReverse,
+            args: recipeConfig[i].args
         });
     }
 
@@ -372,10 +372,10 @@ HighlighterWaiter.prototype.generate_highlight_list = function() {
  * @param {number} pos.start - The start offset.
  * @param {number} pos.end - The end offset.
  */
-HighlighterWaiter.prototype.highlight_output = function(pos) {
-    var highlights = this.generate_highlight_list();
+HighlighterWaiter.prototype.highlightOutput = function(pos) {
+    var highlights = this.generateHighlightList();
 
-    if (!highlights || !this.app.auto_bake_) {
+    if (!highlights || !this.app.autoBake_) {
         return false;
     }
 
@@ -388,7 +388,7 @@ HighlighterWaiter.prototype.highlight_output = function(pos) {
         }
     }
 
-    document.getElementById("output-selection-info").innerHTML = this.selection_info(pos[0].start, pos[0].end);
+    document.getElementById("output-selection-info").innerHTML = this.selectionInfo(pos[0].start, pos[0].end);
     this.highlight(
         document.getElementById("output-text"),
         document.getElementById("output-highlighter"),
@@ -407,10 +407,10 @@ HighlighterWaiter.prototype.highlight_output = function(pos) {
  * @param {number} pos.start - The start offset.
  * @param {number} pos.end - The end offset.
  */
-HighlighterWaiter.prototype.highlight_input = function(pos) {
-    var highlights = this.generate_highlight_list();
+HighlighterWaiter.prototype.highlightInput = function(pos) {
+    var highlights = this.generateHighlightList();
 
-    if (!highlights || !this.app.auto_bake_) {
+    if (!highlights || !this.app.autoBake_) {
         return false;
     }
 
@@ -423,7 +423,7 @@ HighlighterWaiter.prototype.highlight_input = function(pos) {
         }
     }
 
-    document.getElementById("input-selection-info").innerHTML = this.selection_info(pos[0].start, pos[0].end);
+    document.getElementById("input-selection-info").innerHTML = this.selectionInfo(pos[0].start, pos[0].end);
     this.highlight(
         document.getElementById("input-text"),
         document.getElementById("input-highlighter"),
@@ -442,17 +442,17 @@ HighlighterWaiter.prototype.highlight_input = function(pos) {
  * @param {number} pos.end - The end offset.
  */
 HighlighterWaiter.prototype.highlight = function(textarea, highlighter, pos) {
-    if (!this.app.options.show_highlighter) return false;
-    if (!this.app.options.attempt_highlight) return false;
+    if (!this.app.options.showHighlighter) return false;
+    if (!this.app.options.attemptHighlight) return false;
 
     // Check if there is a carriage return in the output dish as this will not
     // be displayed by the HTML textarea and will mess up highlighting offsets.
-    if (!this.app.dish_str || this.app.dish_str.indexOf("\r") >= 0) return false;
+    if (!this.app.dishStr || this.app.dishStr.indexOf("\r") >= 0) return false;
 
-    var start_placeholder = "[start_highlight]",
-        start_placeholder_regex = /\[start_highlight\]/g,
-        end_placeholder = "[end_highlight]",
-        end_placeholder_regex = /\[end_highlight\]/g,
+    var startPlaceholder = "[startHighlight]",
+        startPlaceholderRegex = /\[startHighlight\]/g,
+        endPlaceholder = "[endHighlight]",
+        endPlaceholderRegex = /\[endHighlight\]/g,
         text = textarea.value;
 
     // Put placeholders in position
@@ -461,33 +461,33 @@ HighlighterWaiter.prototype.highlight = function(textarea, highlighter, pos) {
     if (pos.length === 1) {
         if (pos[0].end < pos[0].start) return;
         text = text.slice(0, pos[0].start) +
-            start_placeholder + text.slice(pos[0].start, pos[0].end) + end_placeholder +
+            startPlaceholder + text.slice(pos[0].start, pos[0].end) + endPlaceholder +
             text.slice(pos[0].end, text.length);
     } else {
         // O(n^2) - Can anyone improve this without overwriting placeholders?
         var result = "",
-            end_placed = true;
+            endPlaced = true;
 
         for (var i = 0; i < text.length; i++) {
             for (var j = 1; j < pos.length; j++) {
                 if (pos[j].end < pos[j].start) continue;
                 if (pos[j].start === i) {
-                    result += start_placeholder;
-                    end_placed = false;
+                    result += startPlaceholder;
+                    endPlaced = false;
                 }
                 if (pos[j].end === i) {
-                    result += end_placeholder;
-                    end_placed = true;
+                    result += endPlaceholder;
+                    endPlaced = true;
                 }
             }
             result += text[i];
         }
-        if (!end_placed) result += end_placeholder;
+        if (!endPlaced) result += endPlaceholder;
         text = result;
     }
 
-    var css_class = "hl1";
-    //if (colour) css_class += "-"+colour;
+    var cssClass = "hl1";
+    //if (colour) cssClass += "-"+colour;
 
     // Remove HTML tags
     text = text.replace(/&/g, "&amp;")
@@ -495,8 +495,8 @@ HighlighterWaiter.prototype.highlight = function(textarea, highlighter, pos) {
                 .replace(/>/g, "&gt;")
                 .replace(/\n/g, "&#10;")
                 // Convert placeholders to tags
-                .replace(start_placeholder_regex, "<span class=\""+css_class+"\">")
-                .replace(end_placeholder_regex, "</span>") + "&nbsp;";
+                .replace(startPlaceholderRegex, "<span class=\""+cssClass+"\">")
+                .replace(endPlaceholderRegex, "</span>") + "&nbsp;";
 
     // Adjust width to allow for scrollbars
     highlighter.style.width = textarea.clientWidth + "px";

src/js/views/html/InputWaiter.js

@@ -14,7 +14,7 @@ var InputWaiter = function(app, manager) {
     this.manager = manager;
     
     // Define keys that don't change the input so we don't have to autobake when they are pressed
-    this.bad_keys = [
+    this.badKeys = [
         16, //Shift
         17, //Ctrl
         18, //Alt
@@ -62,14 +62,14 @@ InputWaiter.prototype.set = function(input) {
  * @param {number} length - The length of the current input string
  * @param {number} lines - The number of the lines in the current input string
  */
-InputWaiter.prototype.set_input_info = function(length, lines) {
+InputWaiter.prototype.setInputInfo = function(length, lines) {
     var width = length.toString().length;
     width = width < 2 ? 2 : width;
     
-    var length_str = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
-    var lines_str  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
+    var lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
+    var linesStr  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
         
-    document.getElementById("input-info").innerHTML = "length: " + length_str + "<br>lines: " + lines_str;
+    document.getElementById("input-info").innerHTML = "length: " + lengthStr + "<br>lines: " + linesStr;
 };
 
 
@@ -81,21 +81,21 @@ InputWaiter.prototype.set_input_info = function(length, lines) {
  *
  * @fires Manager#statechange
  */
-InputWaiter.prototype.input_change = function(e) {
+InputWaiter.prototype.inputChange = function(e) {
     // Remove highlighting from input and output panes as the offsets might be different now
-    this.manager.highlighter.remove_highlights();
+    this.manager.highlighter.removeHighlights();
     
     // Reset recipe progress as any previous processing will be redundant now
     this.app.progress = 0;
     
     // Update the input metadata info
-    var input_text = this.get(),
-        lines = input_text.count("\n") + 1;
+    var inputText = this.get(),
+        lines = inputText.count("\n") + 1;
         
-    this.set_input_info(input_text.length, lines);
+    this.setInputInfo(inputText.length, lines);
     
     
-    if (this.bad_keys.indexOf(e.keyCode) < 0) {
+    if (this.badKeys.indexOf(e.keyCode) < 0) {
         // Fire the statechange event as the input has been modified
         window.dispatchEvent(this.manager.statechange);
     }
@@ -108,7 +108,7 @@ InputWaiter.prototype.input_change = function(e) {
  *
  * @param {event} e
  */
-InputWaiter.prototype.input_dragover = function(e) {
+InputWaiter.prototype.inputDragover = function(e) {
     // This will be set if we're dragging an operation
     if (e.dataTransfer.effectAllowed === "move")
         return false;
@@ -125,7 +125,7 @@ InputWaiter.prototype.input_dragover = function(e) {
  *
  * @param {event} e
  */
-InputWaiter.prototype.input_dragleave = function(e) {
+InputWaiter.prototype.inputDragleave = function(e) {
     e.stopPropagation();
     e.preventDefault();
     e.target.classList.remove("dropping-file");
@@ -138,7 +138,7 @@ InputWaiter.prototype.input_dragleave = function(e) {
  *
  * @param {event} e
  */
-InputWaiter.prototype.input_drop = function(e) {
+InputWaiter.prototype.inputDrop = function(e) {
     // This will be set if we're dragging an operation
     if (e.dataTransfer.effectAllowed === "move")
         return false;
@@ -150,29 +150,29 @@ InputWaiter.prototype.input_drop = function(e) {
         file = e.dataTransfer.files[0],
         text = e.dataTransfer.getData("Text"),
         reader = new FileReader(),
-        input_charcode = "",
+        inputCharcode = "",
         offset = 0,
         CHUNK_SIZE = 20480; // 20KB
     
-    var set_input = function() {
-        if (input_charcode.length > 100000 && this.app.auto_bake_) {
-            this.manager.controls.set_auto_bake(false);
+    var setInput = function() {
+        if (inputCharcode.length > 100000 && this.app.autoBake_) {
+            this.manager.controls.setAutoBake(false);
             this.app.alert("Turned off Auto Bake as the input is large", "warning", 5000);
         }
         
-        this.set(input_charcode);
-        var recipe_config = this.app.get_recipe_config();
-        if (!recipe_config[0] || recipe_config[0].op !== "From Hex") {
-            recipe_config.unshift({op:"From Hex", args:["Space"]});
-            this.app.set_recipe_config(recipe_config);
+        this.set(inputCharcode);
+        var recipeConfig = this.app.getRecipeConfig();
+        if (!recipeConfig[0] || recipeConfig[0].op !== "From Hex") {
+            recipeConfig.unshift({op:"From Hex", args:["Space"]});
+            this.app.setRecipeConfig(recipeConfig);
         }
         
-        el.classList.remove("loading_file");
+        el.classList.remove("loadingFile");
     }.bind(this);
     
     var seek = function() {
         if (offset >= file.size) {
-            set_input();
+            setInput();
             return;
         }
         el.value = "Processing... " + Math.round(offset / file.size * 100) + "%";
@@ -182,7 +182,7 @@ InputWaiter.prototype.input_drop = function(e) {
     
     reader.onload = function(e) {
         var data = new Uint8Array(reader.result);
-        input_charcode += Utils.to_hex_fast(data);
+        inputCharcode += Utils.toHexFast(data);
         offset += CHUNK_SIZE;
         seek();
     };
@@ -191,7 +191,7 @@ InputWaiter.prototype.input_drop = function(e) {
     el.classList.remove("dropping-file");
     
     if (file) {
-        el.classList.add("loading_file");
+        el.classList.add("loadingFile");
         seek();
     } else if (text) {
         this.set(text);
@@ -205,8 +205,8 @@ InputWaiter.prototype.input_drop = function(e) {
  *
  * @fires Manager#statechange
  */
-InputWaiter.prototype.clear_io_click = function() {
-    this.manager.highlighter.remove_highlights();
+InputWaiter.prototype.clearIoClick = function() {
+    this.manager.highlighter.removeHighlights();
     document.getElementById("input-text").value = "";
     document.getElementById("output-text").value = "";
     document.getElementById("input-info").innerHTML = "";

src/js/views/html/Manager.js

@@ -45,9 +45,9 @@ var Manager = function(app) {
     this.seasonal    = new SeasonalWaiter(this.app, this);
     
     // Object to store dynamic handlers to fire on elements that may not exist yet
-    this.dynamic_handlers = {};
+    this.dynamicHandlers = {};
     
-    this.initialise_event_listeners();
+    this.initialiseEventListeners();
 };
 
 
@@ -55,8 +55,8 @@ var Manager = function(app) {
  * Sets up the various components and listeners.
  */
 Manager.prototype.setup = function() {
-    this.recipe.initialise_operation_drag_n_drop();
-    this.controls.auto_bake_change();
+    this.recipe.initialiseOperationDragNDrop();
+    this.controls.autoBakeChange();
     this.seasonal.load();
 };
 
@@ -64,87 +64,87 @@ Manager.prototype.setup = function() {
 /**
  * Main function to handle the creation of the event listeners.
  */
-Manager.prototype.initialise_event_listeners = function() {
+Manager.prototype.initialiseEventListeners = function() {
     // Global
-    window.addEventListener("resize", this.window.window_resize.bind(this.window));
-    window.addEventListener("blur", this.window.window_blur.bind(this.window));
-    window.addEventListener("focus", this.window.window_focus.bind(this.window));
-    window.addEventListener("statechange", this.app.state_change.bind(this.app));
-    window.addEventListener("popstate", this.app.pop_state.bind(this.app));
+    window.addEventListener("resize", this.window.windowResize.bind(this.window));
+    window.addEventListener("blur", this.window.windowBlur.bind(this.window));
+    window.addEventListener("focus", this.window.windowFocus.bind(this.window));
+    window.addEventListener("statechange", this.app.stateChange.bind(this.app));
+    window.addEventListener("popstate", this.app.popState.bind(this.app));
     
     // Controls
-    document.getElementById("bake").addEventListener("click", this.controls.bake_click.bind(this.controls));
-    document.getElementById("auto-bake").addEventListener("change", this.controls.auto_bake_change.bind(this.controls));
-    document.getElementById("step").addEventListener("click", this.controls.step_click.bind(this.controls));
-    document.getElementById("clr-recipe").addEventListener("click", this.controls.clear_recipe_click.bind(this.controls));
-    document.getElementById("clr-breaks").addEventListener("click", this.controls.clear_breaks_click.bind(this.controls));
-    document.getElementById("save").addEventListener("click", this.controls.save_click.bind(this.controls));
-    document.getElementById("save-button").addEventListener("click", this.controls.save_button_click.bind(this.controls));
-    document.getElementById("save-link-recipe-checkbox").addEventListener("change", this.controls.slr_check_change.bind(this.controls));
-    document.getElementById("save-link-input-checkbox").addEventListener("change", this.controls.sli_check_change.bind(this.controls));
-    document.getElementById("load").addEventListener("click", this.controls.load_click.bind(this.controls));
-    document.getElementById("load-delete-button").addEventListener("click", this.controls.load_delete_click.bind(this.controls));
-    document.getElementById("load-name").addEventListener("change", this.controls.load_name_change.bind(this.controls));
-    document.getElementById("load-button").addEventListener("click", this.controls.load_button_click.bind(this.controls));
-    this.add_multi_event_listener("#save-text", "keyup paste", this.controls.save_text_change, this.controls);
+    document.getElementById("bake").addEventListener("click", this.controls.bakeClick.bind(this.controls));
+    document.getElementById("auto-bake").addEventListener("change", this.controls.autoBakeChange.bind(this.controls));
+    document.getElementById("step").addEventListener("click", this.controls.stepClick.bind(this.controls));
+    document.getElementById("clr-recipe").addEventListener("click", this.controls.clearRecipeClick.bind(this.controls));
+    document.getElementById("clr-breaks").addEventListener("click", this.controls.clearBreaksClick.bind(this.controls));
+    document.getElementById("save").addEventListener("click", this.controls.saveClick.bind(this.controls));
+    document.getElementById("save-button").addEventListener("click", this.controls.saveButtonClick.bind(this.controls));
+    document.getElementById("save-link-recipe-checkbox").addEventListener("change", this.controls.slrCheckChange.bind(this.controls));
+    document.getElementById("save-link-input-checkbox").addEventListener("change", this.controls.sliCheckChange.bind(this.controls));
+    document.getElementById("load").addEventListener("click", this.controls.loadClick.bind(this.controls));
+    document.getElementById("load-delete-button").addEventListener("click", this.controls.loadDeleteClick.bind(this.controls));
+    document.getElementById("load-name").addEventListener("change", this.controls.loadNameChange.bind(this.controls));
+    document.getElementById("load-button").addEventListener("click", this.controls.loadButtonClick.bind(this.controls));
+    this.addMultiEventListener("#save-text", "keyup paste", this.controls.saveTextChange, this.controls);
     
     // Operations
-    this.add_multi_event_listener("#search", "keyup paste search", this.ops.search_operations, this.ops);
-    this.add_dynamic_listener(".op_list li.operation", "dblclick", this.ops.operation_dblclick, this.ops);
-    document.getElementById("edit-favourites").addEventListener("click", this.ops.edit_favourites_click.bind(this.ops));
-    document.getElementById("save-favourites").addEventListener("click", this.ops.save_favourites_click.bind(this.ops));
-    document.getElementById("reset-favourites").addEventListener("click", this.ops.reset_favourites_click.bind(this.ops));
-    this.add_dynamic_listener(".op_list .op-icon", "mouseover", this.ops.op_icon_mouseover, this.ops);
-    this.add_dynamic_listener(".op_list .op-icon", "mouseleave", this.ops.op_icon_mouseleave, this.ops);
-    this.add_dynamic_listener(".op_list", "oplistcreate", this.ops.op_list_create, this.ops);
-    this.add_dynamic_listener("li.operation", "operationadd", this.recipe.op_add.bind(this.recipe));
+    this.addMultiEventListener("#search", "keyup paste search", this.ops.searchOperations, this.ops);
+    this.addDynamicListener(".op-list li.operation", "dblclick", this.ops.operationDblclick, this.ops);
+    document.getElementById("edit-favourites").addEventListener("click", this.ops.editFavouritesClick.bind(this.ops));
+    document.getElementById("save-favourites").addEventListener("click", this.ops.saveFavouritesClick.bind(this.ops));
+    document.getElementById("reset-favourites").addEventListener("click", this.ops.resetFavouritesClick.bind(this.ops));
+    this.addDynamicListener(".op-list .op-icon", "mouseover", this.ops.opIconMouseover, this.ops);
+    this.addDynamicListener(".op-list .op-icon", "mouseleave", this.ops.opIconMouseleave, this.ops);
+    this.addDynamicListener(".op-list", "oplistcreate", this.ops.opListCreate, this.ops);
+    this.addDynamicListener("li.operation", "operationadd", this.recipe.opAdd.bind(this.recipe));
     
     // Recipe
-    this.add_dynamic_listener(".arg", "keyup", this.recipe.ing_change, this.recipe);
-    this.add_dynamic_listener(".arg", "change", this.recipe.ing_change, this.recipe);
-    this.add_dynamic_listener(".disable-icon", "click", this.recipe.disable_click, this.recipe);
-    this.add_dynamic_listener(".breakpoint", "click", this.recipe.breakpoint_click, this.recipe);
-    this.add_dynamic_listener("#rec_list li.operation", "dblclick", this.recipe.operation_dblclick, this.recipe);
-    this.add_dynamic_listener("#rec_list li.operation > div", "dblclick", this.recipe.operation_child_dblclick, this.recipe);
-    this.add_dynamic_listener("#rec_list .input-group .dropdown-menu a", "click", this.recipe.dropdown_toggle_click, this.recipe);
-    this.add_dynamic_listener("#rec_list", "operationremove", this.recipe.op_remove.bind(this.recipe));
+    this.addDynamicListener(".arg", "keyup", this.recipe.ingChange, this.recipe);
+    this.addDynamicListener(".arg", "change", this.recipe.ingChange, this.recipe);
+    this.addDynamicListener(".disable-icon", "click", this.recipe.disableClick, this.recipe);
+    this.addDynamicListener(".breakpoint", "click", this.recipe.breakpointClick, this.recipe);
+    this.addDynamicListener("#rec-list li.operation", "dblclick", this.recipe.operationDblclick, this.recipe);
+    this.addDynamicListener("#rec-list li.operation > div", "dblclick", this.recipe.operationChildDblclick, this.recipe);
+    this.addDynamicListener("#rec-list .input-group .dropdown-menu a", "click", this.recipe.dropdownToggleClick, this.recipe);
+    this.addDynamicListener("#rec-list", "operationremove", this.recipe.opRemove.bind(this.recipe));
     
     // Input
-    this.add_multi_event_listener("#input-text", "keyup paste", this.input.input_change, this.input);
-    document.getElementById("reset-layout").addEventListener("click", this.app.reset_layout.bind(this.app));
-    document.getElementById("clr-io").addEventListener("click", this.input.clear_io_click.bind(this.input));
-    document.getElementById("input-text").addEventListener("dragover", this.input.input_dragover.bind(this.input));
-    document.getElementById("input-text").addEventListener("dragleave", this.input.input_dragleave.bind(this.input));
-    document.getElementById("input-text").addEventListener("drop", this.input.input_drop.bind(this.input));
-    document.getElementById("input-text").addEventListener("scroll", this.highlighter.input_scroll.bind(this.highlighter));
-    document.getElementById("input-text").addEventListener("mouseup", this.highlighter.input_mouseup.bind(this.highlighter));
-    document.getElementById("input-text").addEventListener("mousemove", this.highlighter.input_mousemove.bind(this.highlighter));
-    this.add_multi_event_listener("#input-text", "mousedown dblclick select",  this.highlighter.input_mousedown, this.highlighter);
+    this.addMultiEventListener("#input-text", "keyup paste", this.input.inputChange, this.input);
+    document.getElementById("reset-layout").addEventListener("click", this.app.resetLayout.bind(this.app));
+    document.getElementById("clr-io").addEventListener("click", this.input.clearIoClick.bind(this.input));
+    document.getElementById("input-text").addEventListener("dragover", this.input.inputDragover.bind(this.input));
+    document.getElementById("input-text").addEventListener("dragleave", this.input.inputDragleave.bind(this.input));
+    document.getElementById("input-text").addEventListener("drop", this.input.inputDrop.bind(this.input));
+    document.getElementById("input-text").addEventListener("scroll", this.highlighter.inputScroll.bind(this.highlighter));
+    document.getElementById("input-text").addEventListener("mouseup", this.highlighter.inputMouseup.bind(this.highlighter));
+    document.getElementById("input-text").addEventListener("mousemove", this.highlighter.inputMousemove.bind(this.highlighter));
+    this.addMultiEventListener("#input-text", "mousedown dblclick select",  this.highlighter.inputMousedown, this.highlighter);
     
     // Output
-    document.getElementById("save-to-file").addEventListener("click", this.output.save_click.bind(this.output));
-    document.getElementById("switch").addEventListener("click", this.output.switch_click.bind(this.output));
-    document.getElementById("undo-switch").addEventListener("click", this.output.undo_switch_click.bind(this.output));
-    document.getElementById("maximise-output").addEventListener("click", this.output.maximise_output_click.bind(this.output));
-    document.getElementById("output-text").addEventListener("scroll", this.highlighter.output_scroll.bind(this.highlighter));
-    document.getElementById("output-text").addEventListener("mouseup", this.highlighter.output_mouseup.bind(this.highlighter));
-    document.getElementById("output-text").addEventListener("mousemove", this.highlighter.output_mousemove.bind(this.highlighter));
-    document.getElementById("output-html").addEventListener("mouseup", this.highlighter.output_html_mouseup.bind(this.highlighter));
-    document.getElementById("output-html").addEventListener("mousemove", this.highlighter.output_html_mousemove.bind(this.highlighter));
-    this.add_multi_event_listener("#output-text", "mousedown dblclick select",  this.highlighter.output_mousedown, this.highlighter);
-    this.add_multi_event_listener("#output-html", "mousedown dblclick select",  this.highlighter.output_html_mousedown, this.highlighter);
+    document.getElementById("save-to-file").addEventListener("click", this.output.saveClick.bind(this.output));
+    document.getElementById("switch").addEventListener("click", this.output.switchClick.bind(this.output));
+    document.getElementById("undo-switch").addEventListener("click", this.output.undoSwitchClick.bind(this.output));
+    document.getElementById("maximise-output").addEventListener("click", this.output.maximiseOutputClick.bind(this.output));
+    document.getElementById("output-text").addEventListener("scroll", this.highlighter.outputScroll.bind(this.highlighter));
+    document.getElementById("output-text").addEventListener("mouseup", this.highlighter.outputMouseup.bind(this.highlighter));
+    document.getElementById("output-text").addEventListener("mousemove", this.highlighter.outputMousemove.bind(this.highlighter));
+    document.getElementById("output-html").addEventListener("mouseup", this.highlighter.outputHtmlMouseup.bind(this.highlighter));
+    document.getElementById("output-html").addEventListener("mousemove", this.highlighter.outputHtmlMousemove.bind(this.highlighter));
+    this.addMultiEventListener("#output-text", "mousedown dblclick select",  this.highlighter.outputMousedown, this.highlighter);
+    this.addMultiEventListener("#output-html", "mousedown dblclick select",  this.highlighter.outputHtmlMousedown, this.highlighter);
     
     // Options
-    document.getElementById("options").addEventListener("click", this.options.options_click.bind(this.options));
-    document.getElementById("reset-options").addEventListener("click", this.options.reset_options_click.bind(this.options));
-    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.switch_change.bind(this.options));
-    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.set_word_wrap.bind(this.options));
-    this.add_dynamic_listener(".option-item input[type=number]", "keyup", this.options.number_change, this.options);
-    this.add_dynamic_listener(".option-item input[type=number]", "change", this.options.number_change, this.options);
-    this.add_dynamic_listener(".option-item select", "change", this.options.select_change, this.options);
+    document.getElementById("options").addEventListener("click", this.options.optionsClick.bind(this.options));
+    document.getElementById("reset-options").addEventListener("click", this.options.resetOptionsClick.bind(this.options));
+    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.switchChange.bind(this.options));
+    $(document).on("switchChange.bootstrapSwitch", ".option-item input:checkbox", this.options.setWordWrap.bind(this.options));
+    this.addDynamicListener(".option-item input[type=number]", "keyup", this.options.numberChange, this.options);
+    this.addDynamicListener(".option-item input[type=number]", "change", this.options.numberChange, this.options);
+    this.addDynamicListener(".option-item select", "change", this.options.selectChange, this.options);
     
     // Misc
-    document.getElementById("alert-close").addEventListener("click", this.app.alert_close_click.bind(this.app));
+    document.getElementById("alert-close").addEventListener("click", this.app.alertCloseClick.bind(this.app));
 };
 
 
@@ -152,19 +152,19 @@ Manager.prototype.initialise_event_listeners = function() {
  * Adds an event listener to each element in the specified group.
  *
  * @param {string} selector - A selector string for the element group to add the event to, see
- *   this.get_all()
- * @param {string} event_type - The event to listen for
+ *   this.getAll()
+ * @param {string} eventType - The event to listen for
  * @param {function} callback - The function to execute when the event is triggered
  * @param {Object} [scope=this] - The object to bind to the callback function
  *
  * @example
  * // Calls the clickable function whenever any element with the .clickable class is clicked
- * this.add_listeners(".clickable", "click", this.clickable, this);
+ * this.addListeners(".clickable", "click", this.clickable, this);
  */
-Manager.prototype.add_listeners = function(selector, event_type, callback, scope) {
+Manager.prototype.addListeners = function(selector, eventType, callback, scope) {
     scope = scope || this;
     [].forEach.call(document.querySelectorAll(selector), function(el) {
-        el.addEventListener(event_type, callback.bind(scope));
+        el.addEventListener(eventType, callback.bind(scope));
     });
 };
 
@@ -173,17 +173,17 @@ Manager.prototype.add_listeners = function(selector, event_type, callback, scope
  * Adds multiple event listeners to the specified element.
  *
  * @param {string} selector - A selector string for the element to add the events to
- * @param {string} event_types - A space-separated string of all the event types to listen for
+ * @param {string} eventTypes - A space-separated string of all the event types to listen for
  * @param {function} callback - The function to execute when the events are triggered
  * @param {Object} [scope=this] - The object to bind to the callback function
  *
  * @example
  * // Calls the search function whenever the the keyup, paste or search events are triggered on the
  * // search element
- * this.add_multi_event_listener("search", "keyup paste search", this.search, this);
+ * this.addMultiEventListener("search", "keyup paste search", this.search, this);
  */
-Manager.prototype.add_multi_event_listener = function(selector, event_types, callback, scope) {
-    var evs = event_types.split(" ");
+Manager.prototype.addMultiEventListener = function(selector, eventTypes, callback, scope) {
+    var evs = eventTypes.split(" ");
     for (var i = 0; i < evs.length; i++) {
         document.querySelector(selector).addEventListener(evs[i], callback.bind(scope));
     }
@@ -194,19 +194,19 @@ Manager.prototype.add_multi_event_listener = function(selector, event_types, cal
  * Adds multiple event listeners to each element in the specified group.
  *
  * @param {string} selector - A selector string for the element group to add the events to
- * @param {string} event_types - A space-separated string of all the event types to listen for
+ * @param {string} eventTypes - A space-separated string of all the event types to listen for
  * @param {function} callback - The function to execute when the events are triggered
  * @param {Object} [scope=this] - The object to bind to the callback function
  *
  * @example
  * // Calls the save function whenever the the keyup or paste events are triggered on any element
  * // with the .saveable class
- * this.add_multi_event_listener(".saveable", "keyup paste", this.save, this);
+ * this.addMultiEventListener(".saveable", "keyup paste", this.save, this);
  */
-Manager.prototype.add_multi_event_listeners = function(selector, event_types, callback, scope) {
-    var evs = event_types.split(" ");
+Manager.prototype.addMultiEventListeners = function(selector, eventTypes, callback, scope) {
+    var evs = eventTypes.split(" ");
     for (var i = 0; i < evs.length; i++) {
-        this.add_listeners(selector, evs[i], callback, scope);
+        this.addListeners(selector, evs[i], callback, scope);
     }
 };
 
@@ -216,28 +216,28 @@ Manager.prototype.add_multi_event_listeners = function(selector, event_types, ca
  * may not exist in the DOM yet.
  *
  * @param {string} selector - A selector string for the element(s) to add the event to
- * @param {string} event_type - The event(s) to listen for
+ * @param {string} eventType - The event(s) to listen for
  * @param {function} callback - The function to execute when the event(s) is/are triggered
  * @param {Object} [scope=this] - The object to bind to the callback function
  *
  * @example
  * // Pops up an alert whenever any button is clicked, even if it is added to the DOM after this
  * // listener is created
- * this.add_dynamic_listener("button", "click", alert, this);
+ * this.addDynamicListener("button", "click", alert, this);
  */
-Manager.prototype.add_dynamic_listener = function(selector, event_type, callback, scope) {
-    var event_config = {
+Manager.prototype.addDynamicListener = function(selector, eventType, callback, scope) {
+    var eventConfig = {
         selector: selector,
         callback: callback.bind(scope || this)
     };
     
-    if (this.dynamic_handlers.hasOwnProperty(event_type)) {
+    if (this.dynamicHandlers.hasOwnProperty(eventType)) {
         // Listener already exists, add new handler to the appropriate list
-        this.dynamic_handlers[event_type].push(event_config);
+        this.dynamicHandlers[eventType].push(eventConfig);
     } else {
-        this.dynamic_handlers[event_type] = [event_config];
+        this.dynamicHandlers[eventType] = [eventConfig];
         // Set up listener for this new type
-        document.addEventListener(event_type, this.dynamic_listener_handler.bind(this));
+        document.addEventListener(eventType, this.dynamicListenerHandler.bind(this));
     }
 };
 
@@ -248,8 +248,8 @@ Manager.prototype.add_dynamic_listener = function(selector, event_type, callback
  *
  * @param {Event} e - The event to be handled
  */
-Manager.prototype.dynamic_listener_handler = function(e) {
-    var handlers = this.dynamic_handlers[e.type],
+Manager.prototype.dynamicListenerHandler = function(e) {
+    var handlers = this.dynamicHandlers[e.type],
         matches = e.target.matches ||
             e.target.webkitMatchesSelector ||
             e.target.mozMatchesSelector ||

src/js/views/html/OperationsWaiter.js

@@ -16,7 +16,7 @@ var OperationsWaiter = function(app, manager) {
     this.manager = manager;
     
     this.options = {};
-    this.remove_intent = false;
+    this.removeIntent = false;
 };
 
 
@@ -26,17 +26,17 @@ var OperationsWaiter = function(app, manager) {
  *
  * @param {event} e
  */
-OperationsWaiter.prototype.search_operations = function(e) {
+OperationsWaiter.prototype.searchOperations = function(e) {
     var ops, selected;
     
     if (e.type === "search") { // Search
         e.preventDefault();
         ops = document.querySelectorAll("#search-results li");
         if (ops.length) {
-            selected = this.get_selected_op(ops);
+            selected = this.getSelectedOp(ops);
             if (selected > -1) {
-                this.manager.recipe.add_operation(ops[selected].innerHTML);
-                this.app.auto_bake();
+                this.manager.recipe.addOperation(ops[selected].innerHTML);
+                this.app.autoBake();
             }
         }
     }
@@ -47,7 +47,7 @@ OperationsWaiter.prototype.search_operations = function(e) {
         e.preventDefault();
         ops = document.querySelectorAll("#search-results li");
         if (ops.length) {
-            selected = this.get_selected_op(ops);
+            selected = this.getSelectedOp(ops);
             if (selected > -1) {
                 ops[selected].classList.remove("selected-op");
             }
@@ -58,7 +58,7 @@ OperationsWaiter.prototype.search_operations = function(e) {
         e.preventDefault();
         ops = document.querySelectorAll("#search-results li");
         if (ops.length) {
-            selected = this.get_selected_op(ops);
+            selected = this.getSelectedOp(ops);
             if (selected > -1) {
                 ops[selected].classList.remove("selected-op");
             }
@@ -66,26 +66,26 @@ OperationsWaiter.prototype.search_operations = function(e) {
             ops[selected-1].classList.add("selected-op");
         }
     } else {
-        var search_results_el = document.getElementById("search-results"),
+        var searchResultsEl = document.getElementById("search-results"),
             el = e.target,
             str = el.value;
         
-        while (search_results_el.firstChild) {
-            $(search_results_el.firstChild).popover("destroy");
-            search_results_el.removeChild(search_results_el.firstChild);
+        while (searchResultsEl.firstChild) {
+            $(searchResultsEl.firstChild).popover("destroy");
+            searchResultsEl.removeChild(searchResultsEl.firstChild);
         }
         
         $("#categories .in").collapse("hide");
         if (str) {
-            var matched_ops = this.filter_operations(str, true),
-                matched_ops_html = "";
+            var matchedOps = this.filterOperations(str, true),
+                matchedOpsHtml = "";
             
-            for (var i = 0; i < matched_ops.length; i++) {
-                matched_ops_html += matched_ops[i].to_stub_html();
+            for (var i = 0; i < matchedOps.length; i++) {
+                matchedOpsHtml += matchedOps[i].toStubHtml();
             }
             
-            search_results_el.innerHTML = matched_ops_html;
-            search_results_el.dispatchEvent(this.manager.oplistcreate);
+            searchResultsEl.innerHTML = matchedOpsHtml;
+            searchResultsEl.dispatchEvent(this.manager.oplistcreate);
         }
     }
 };
@@ -94,37 +94,37 @@ OperationsWaiter.prototype.search_operations = function(e) {
 /**
  * Filters operations based on the search string and returns the matching ones.
  *
- * @param {string} search_str
+ * @param {string} searchStr
  * @param {boolean} highlight - Whether or not to highlight the matching string in the operation
  *   name and description
  * @returns {string[]}
  */
-OperationsWaiter.prototype.filter_operations = function(search_str, highlight) {
-    var matched_ops = [],
-        matched_descs = [];
+OperationsWaiter.prototype.filterOperations = function(searchStr, highlight) {
+    var matchedOps = [],
+        matchedDescs = [];
     
-    search_str = search_str.toLowerCase();
+    searchStr = searchStr.toLowerCase();
     
-    for (var op_name in this.app.operations) {
-        var op = this.app.operations[op_name],
-            name_pos = op_name.toLowerCase().indexOf(search_str),
-            desc_pos = op.description.toLowerCase().indexOf(search_str);
+    for (var opName in this.app.operations) {
+        var op = this.app.operations[opName],
+            namePos = opName.toLowerCase().indexOf(searchStr),
+            descPos = op.description.toLowerCase().indexOf(searchStr);
         
-        if (name_pos >= 0 || desc_pos >= 0) {
-            var operation = new HTMLOperation(op_name, this.app.operations[op_name], this.app, this.manager);
+        if (namePos >= 0 || descPos >= 0) {
+            var operation = new HTMLOperation(opName, this.app.operations[opName], this.app, this.manager);
             if (highlight) {
-                operation.highlight_search_string(search_str, name_pos, desc_pos);
+                operation.highlightSearchString(searchStr, namePos, descPos);
             }
             
-            if (name_pos < 0) {
-                matched_ops.push(operation);
+            if (namePos < 0) {
+                matchedOps.push(operation);
             } else {
-                matched_descs.push(operation);
+                matchedDescs.push(operation);
             }
         }
     }
     
-    return matched_descs.concat(matched_ops);
+    return matchedDescs.concat(matchedOps);
 };
 
 
@@ -135,7 +135,7 @@ OperationsWaiter.prototype.filter_operations = function(search_str, highlight) {
  * @param {element[]} ops
  * @returns {number}
  */
-OperationsWaiter.prototype.get_selected_op = function(ops) {
+OperationsWaiter.prototype.getSelectedOp = function(ops) {
     for (var i = 0; i < ops.length; i++) {
         if (ops[i].classList.contains("selected-op")) {
             return i;
@@ -151,8 +151,8 @@ OperationsWaiter.prototype.get_selected_op = function(ops) {
  * @listens Manager#oplistcreate
  * @param {event} e
  */
-OperationsWaiter.prototype.op_list_create = function(e) {
-    this.manager.recipe.create_sortable_seed_list(e.target);
+OperationsWaiter.prototype.opListCreate = function(e) {
+    this.manager.recipe.createSortableSeedList(e.target);
     $("[data-toggle=popover]").popover();
 };
 
@@ -163,11 +163,11 @@ OperationsWaiter.prototype.op_list_create = function(e) {
  *
  * @param {event} e
  */
-OperationsWaiter.prototype.operation_dblclick = function(e) {
+OperationsWaiter.prototype.operationDblclick = function(e) {
     var li = e.target;
     
-    this.manager.recipe.add_operation(li.textContent);
-    this.app.auto_bake();
+    this.manager.recipe.addOperation(li.textContent);
+    this.app.autoBake();
 };
 
 
@@ -177,46 +177,46 @@ OperationsWaiter.prototype.operation_dblclick = function(e) {
  *
  * @param {event} e
  */
-OperationsWaiter.prototype.edit_favourites_click = function(e) {
+OperationsWaiter.prototype.editFavouritesClick = function(e) {
     e.preventDefault();
     e.stopPropagation();
     
     // Add favourites to modal
-    var fav_cat = this.app.categories.filter(function(c) {
+    var favCat = this.app.categories.filter(function(c) {
         return c.name === "Favourites";
     })[0];
     
     var html = "";
-    for (var i = 0; i < fav_cat.ops.length; i++) {
-        var op_name = fav_cat.ops[i];
-        var operation = new HTMLOperation(op_name, this.app.operations[op_name], this.app, this.manager);
-        html += operation.to_stub_html(true);
+    for (var i = 0; i < favCat.ops.length; i++) {
+        var opName = favCat.ops[i];
+        var operation = new HTMLOperation(opName, this.app.operations[opName], this.app, this.manager);
+        html += operation.toStubHtml(true);
     }
     
-    var edit_favourites_list = document.getElementById("edit-favourites-list");
-    edit_favourites_list.innerHTML = html;
-    this.remove_intent = false;
+    var editFavouritesList = document.getElementById("edit-favourites-list");
+    editFavouritesList.innerHTML = html;
+    this.removeIntent = false;
     
-    var editable_list = Sortable.create(edit_favourites_list, {
+    var editableList = Sortable.create(editFavouritesList, {
         filter: ".remove-icon",
         onFilter: function (evt) {
-            var el = editable_list.closest(evt.item);
+            var el = editableList.closest(evt.item);
             if (el) {
                 $(el).popover("destroy");
                 el.parentNode.removeChild(el);
             }
         },
         onEnd: function(evt) {
-            if (this.remove_intent) evt.item.remove();
+            if (this.removeIntent) evt.item.remove();
         }.bind(this),
     });
     
-    Sortable.utils.on(edit_favourites_list, "dragleave", function() {
-        this.remove_intent = true;
+    Sortable.utils.on(editFavouritesList, "dragleave", function() {
+        this.removeIntent = true;
     }.bind(this));
     
-    Sortable.utils.on(edit_favourites_list, "dragover", function() {
-        this.remove_intent = false;
+    Sortable.utils.on(editFavouritesList, "dragover", function() {
+        this.removeIntent = false;
     }.bind(this));
     
     $("#edit-favourites-list [data-toggle=popover]").popover();
@@ -228,18 +228,18 @@ OperationsWaiter.prototype.edit_favourites_click = function(e) {
  * Handler for save favourites click events.
  * Saves the selected favourites and reloads them.
  */
-OperationsWaiter.prototype.save_favourites_click = function() {
-    var favourites_list = [],
+OperationsWaiter.prototype.saveFavouritesClick = function() {
+    var favouritesList = [],
         favs = document.querySelectorAll("#edit-favourites-list li");
     
     for (var i = 0; i < favs.length; i++) {
-        favourites_list.push(favs[i].textContent);
+        favouritesList.push(favs[i].textContent);
     }
 
-    this.app.save_favourites(favourites_list);
-    this.app.load_favourites();
-    this.app.populate_operations_list();
-    this.manager.recipe.initialise_operation_drag_n_drop();
+    this.app.saveFavourites(favouritesList);
+    this.app.loadFavourites();
+    this.app.populateOperationsList();
+    this.manager.recipe.initialiseOperationDragNDrop();
 };
 
 
@@ -247,37 +247,37 @@ OperationsWaiter.prototype.save_favourites_click = function() {
  * Handler for reset favourites click events.
  * Resets favourites to their defaults.
  */
-OperationsWaiter.prototype.reset_favourites_click = function() {
-    this.app.reset_favourites();
+OperationsWaiter.prototype.resetFavouritesClick = function() {
+    this.app.resetFavourites();
 };
 
 
 /**
- * Handler for op_icon mouseover events.
+ * Handler for opIcon mouseover events.
  * Hides any popovers already showing on the operation so that there aren't two at once.
  *
  * @param {event} e
  */
-OperationsWaiter.prototype.op_icon_mouseover = function(e) {
-    var op_el = e.target.parentNode;
+OperationsWaiter.prototype.opIconMouseover = function(e) {
+    var opEl = e.target.parentNode;
     if (e.target.getAttribute("data-toggle") === "popover") {
-        $(op_el).popover("hide");
+        $(opEl).popover("hide");
     }
 };
 
 
 /**
- * Handler for op_icon mouseleave events.
+ * Handler for opIcon mouseleave events.
  * If this icon created a popover and we're moving back to the operation element, display the
  *   operation popover again.
  *
  * @param {event} e
  */
-OperationsWaiter.prototype.op_icon_mouseleave = function(e) {
-    var op_el = e.target.parentNode,
-        to_el = e.toElement || e.relatedElement;
+OperationsWaiter.prototype.opIconMouseleave = function(e) {
+    var opEl = e.target.parentNode,
+        toEl = e.toElement || e.relatedElement;
     
-    if (e.target.getAttribute("data-toggle") === "popover" && to_el === op_el) {
-        $(op_el).popover("show");
+    if (e.target.getAttribute("data-toggle") === "popover" && toEl === opEl) {
+        $(opEl).popover("show");
     }
 };

src/js/views/html/OptionsWaiter.js

@@ -52,7 +52,7 @@ OptionsWaiter.prototype.load = function(options) {
  * Handler for options click events.
  * Dispays the options pane.
  */
-OptionsWaiter.prototype.options_click = function() {
+OptionsWaiter.prototype.optionsClick = function() {
     $("#options-modal").modal();
 };
 
@@ -61,7 +61,7 @@ OptionsWaiter.prototype.options_click = function() {
  * Handler for reset options click events.
  * Resets options back to their default values.
  */
-OptionsWaiter.prototype.reset_options_click = function() {
+OptionsWaiter.prototype.resetOptionsClick = function() {
     this.load(this.app.doptions);
 };
 
@@ -73,7 +73,7 @@ OptionsWaiter.prototype.reset_options_click = function() {
  * @param {event} e
  * @param {boolean} state
  */
-OptionsWaiter.prototype.switch_change = function(e, state) {
+OptionsWaiter.prototype.switchChange = function(e, state) {
     var el = e.target,
         option = el.getAttribute("option");
         
@@ -88,7 +88,7 @@ OptionsWaiter.prototype.switch_change = function(e, state) {
  *
  * @param {event} e
  */
-OptionsWaiter.prototype.number_change = function(e) {
+OptionsWaiter.prototype.numberChange = function(e) {
     var el = e.target,
         option = el.getAttribute("option");
         
@@ -103,7 +103,7 @@ OptionsWaiter.prototype.number_change = function(e) {
  *
  * @param {event} e
  */
-OptionsWaiter.prototype.select_change = function(e) {
+OptionsWaiter.prototype.selectChange = function(e) {
     var el = e.target,
         option = el.getAttribute("option");
         
@@ -113,16 +113,16 @@ OptionsWaiter.prototype.select_change = function(e) {
 
 
 /**
- * Sets or unsets word wrap on the input and output depending on the word_wrap option value.
+ * Sets or unsets word wrap on the input and output depending on the wordWrap option value.
  */
-OptionsWaiter.prototype.set_word_wrap = function() {
+OptionsWaiter.prototype.setWordWrap = function() {
     document.getElementById("input-text").classList.remove("word-wrap");
     document.getElementById("output-text").classList.remove("word-wrap");
     document.getElementById("output-html").classList.remove("word-wrap");
     document.getElementById("input-highlighter").classList.remove("word-wrap");
     document.getElementById("output-highlighter").classList.remove("word-wrap");
     
-    if (!this.app.options.word_wrap) {
+    if (!this.app.options.wordWrap) {
         document.getElementById("input-text").classList.add("word-wrap");
         document.getElementById("output-text").classList.add("word-wrap");
         document.getElementById("output-html").classList.add("word-wrap");

src/js/views/html/OutputWaiter.js

@@ -28,47 +28,47 @@ OutputWaiter.prototype.get = function() {
 /**
  * Sets the output in the output textarea.
  *
- * @param {string} data_str - The output string/HTML
+ * @param {string} dataStr - The output string/HTML
  * @param {string} type - The data type of the output
  * @param {number} duration - The length of time (ms) it took to generate the output
  */
-OutputWaiter.prototype.set = function(data_str, type, duration) {
-    var output_text = document.getElementById("output-text"),
-        output_html = document.getElementById("output-html"),
-        output_highlighter = document.getElementById("output-highlighter"),
-        input_highlighter = document.getElementById("input-highlighter");
+OutputWaiter.prototype.set = function(dataStr, type, duration) {
+    var outputText = document.getElementById("output-text"),
+        outputHtml = document.getElementById("output-html"),
+        outputHighlighter = document.getElementById("output-highlighter"),
+        inputHighlighter = document.getElementById("input-highlighter");
 
     if (type === "html") {
-        output_text.style.display = "none";
-        output_html.style.display = "block";
-        output_highlighter.display = "none";
-        input_highlighter.display = "none";
+        outputText.style.display = "none";
+        outputHtml.style.display = "block";
+        outputHighlighter.display = "none";
+        inputHighlighter.display = "none";
         
-        output_text.value = "";
-        output_html.innerHTML = data_str;
+        outputText.value = "";
+        outputHtml.innerHTML = dataStr;
         
         // Execute script sections
-        var script_elements = output_html.querySelectorAll("script");
-        for (var i = 0; i < script_elements.length; i++) {
+        var scriptElements = outputHtml.querySelectorAll("script");
+        for (var i = 0; i < scriptElements.length; i++) {
             try {
-                eval(script_elements[i].innerHTML); // eslint-disable-line no-eval
+                eval(scriptElements[i].innerHTML); // eslint-disable-line no-eval
             } catch (err) {
                 console.error(err);
             }
         }
     } else {
-        output_text.style.display = "block";
-        output_html.style.display = "none";
-        output_highlighter.display = "block";
-        input_highlighter.display = "block";
+        outputText.style.display = "block";
+        outputHtml.style.display = "none";
+        outputHighlighter.display = "block";
+        inputHighlighter.display = "block";
         
-        output_text.value = Utils.printable(data_str, true);
-        output_html.innerHTML = "";
+        outputText.value = Utils.printable(dataStr, true);
+        outputHtml.innerHTML = "";
     }
     
-    this.manager.highlighter.remove_highlights();
-    var lines = data_str.count("\n") + 1;
-    this.set_output_info(data_str.length, lines, duration);
+    this.manager.highlighter.removeHighlights();
+    var lines = dataStr.count("\n") + 1;
+    this.setOutputInfo(dataStr.length, lines, duration);
 };
 
 
@@ -79,17 +79,17 @@ OutputWaiter.prototype.set = function(data_str, type, duration) {
  * @param {number} lines - The number of the lines in the current output string
  * @param {number} duration - The length of time (ms) it took to generate the output
  */
-OutputWaiter.prototype.set_output_info = function(length, lines, duration) {
+OutputWaiter.prototype.setOutputInfo = function(length, lines, duration) {
     var width = length.toString().length;
     width = width < 4 ? 4 : width;
     
-    var length_str = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
-    var lines_str  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
-    var time_str   = Utils.pad(duration.toString() + "ms", width, " ").replace(/ /g, "&nbsp;");
+    var lengthStr = Utils.pad(length.toString(), width, " ").replace(/ /g, "&nbsp;");
+    var linesStr  = Utils.pad(lines.toString(), width, " ").replace(/ /g, "&nbsp;");
+    var timeStr   = Utils.pad(duration.toString() + "ms", width, " ").replace(/ /g, "&nbsp;");
     
-    document.getElementById("output-info").innerHTML = "time: " + time_str +
-        "<br>length: " + length_str +
-        "<br>lines: " + lines_str;
+    document.getElementById("output-info").innerHTML = "time: " + timeStr +
+        "<br>length: " + lengthStr +
+        "<br>lines: " + linesStr;
     document.getElementById("input-selection-info").innerHTML = "";
     document.getElementById("output-selection-info").innerHTML = "";
 };
@@ -99,24 +99,24 @@ OutputWaiter.prototype.set_output_info = function(length, lines, duration) {
  * Adjusts the display properties of the output buttons so that they fit within the current width
  * without wrapping or overflowing.
  */
-OutputWaiter.prototype.adjust_width = function() {
-    var output          = document.getElementById("output"),
-        save_to_file    = document.getElementById("save-to-file"),
-        switch_io       = document.getElementById("switch"),
-        undo_switch     = document.getElementById("undo-switch"),
-        maximise_output = document.getElementById("maximise-output");
+OutputWaiter.prototype.adjustWidth = function() {
+    var output         = document.getElementById("output"),
+        saveToFile     = document.getElementById("save-to-file"),
+        switchIO       = document.getElementById("switch"),
+        undoSwitch     = document.getElementById("undo-switch"),
+        maximiseOutput = document.getElementById("maximise-output");
     
     if (output.clientWidth < 680) {
-        save_to_file.childNodes[1].nodeValue = "";
-        switch_io.childNodes[1].nodeValue = "";
-        undo_switch.childNodes[1].nodeValue = "";
-        maximise_output.childNodes[1].nodeValue = "";
+        saveToFile.childNodes[1].nodeValue = "";
+        switchIO.childNodes[1].nodeValue = "";
+        undoSwitch.childNodes[1].nodeValue = "";
+        maximiseOutput.childNodes[1].nodeValue = "";
     } else {
-        save_to_file.childNodes[1].nodeValue = " Save to file";
-        switch_io.childNodes[1].nodeValue = " Move output to input";
-        undo_switch.childNodes[1].nodeValue = " Undo";
-        maximise_output.childNodes[1].nodeValue =
-            maximise_output.getAttribute("title") === "Maximise" ? " Max" : " Restore";
+        saveToFile.childNodes[1].nodeValue = " Save to file";
+        switchIO.childNodes[1].nodeValue = " Move output to input";
+        undoSwitch.childNodes[1].nodeValue = " Undo";
+        maximiseOutput.childNodes[1].nodeValue =
+            maximiseOutput.getAttribute("title") === "Maximise" ? " Max" : " Restore";
     }
 };
 
@@ -125,8 +125,8 @@ OutputWaiter.prototype.adjust_width = function() {
  * Handler for save click events.
  * Saves the current output to a file, downloaded as a URL octet stream.
  */
-OutputWaiter.prototype.save_click = function() {
-    var data = Utils.to_base64(this.app.dish_str),
+OutputWaiter.prototype.saveClick = function() {
+    var data = Utils.toBase64(this.app.dishStr),
         filename = window.prompt("Please enter a filename:", "download.dat");
         
     if (filename) {
@@ -148,10 +148,10 @@ OutputWaiter.prototype.save_click = function() {
  * Handler for switch click events.
  * Moves the current output into the input textarea.
  */
-OutputWaiter.prototype.switch_click = function() {
-    this.switch_orig_data = this.manager.input.get();
+OutputWaiter.prototype.switchClick = function() {
+    this.switchOrigData = this.manager.input.get();
     document.getElementById("undo-switch").disabled = false;
-    this.app.set_input(this.app.dish_str);
+    this.app.setInput(this.app.dishStr);
 };
 
 
@@ -159,8 +159,8 @@ OutputWaiter.prototype.switch_click = function() {
  * Handler for undo switch click events.
  * Removes the output from the input and replaces the input that was removed.
  */
-OutputWaiter.prototype.undo_switch_click = function() {
-    this.app.set_input(this.switch_orig_data);
+OutputWaiter.prototype.undoSwitchClick = function() {
+    this.app.setInput(this.switchOrigData);
     document.getElementById("undo-switch").disabled = true;
 };
 
@@ -169,20 +169,20 @@ OutputWaiter.prototype.undo_switch_click = function() {
  * Handler for maximise output click events.
  * Resizes the output frame to be as large as possible, or restores it to its original size.
  */
-OutputWaiter.prototype.maximise_output_click = function(e) {
+OutputWaiter.prototype.maximiseOutputClick = function(e) {
     var el = e.target.id === "maximise-output" ? e.target : e.target.parentNode;
 
     if (el.getAttribute("title") === "Maximise") {
-        this.app.column_splitter.collapse(0);
-        this.app.column_splitter.collapse(1);
-        this.app.io_splitter.collapse(0);
+        this.app.columnSplitter.collapse(0);
+        this.app.columnSplitter.collapse(1);
+        this.app.ioSplitter.collapse(0);
 
         el.setAttribute("title", "Restore");
         el.innerHTML = "<img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAlUlEQVQ4y93RwQpBQRQG4C9ba1fxBteGPIj38BTejFJKLFnwCJIiCsW1mcV0k9yx82/OzGK+OXMGOpiiLTFjFNiilQI0sQ7IJiAjLKsgGVYB2YdaVO0kwy46/BVQi9ZDNPyQWen2ub/KufS8y7shfkq9tF9U7SC+/YluKvAI9YZeFeCECXJcA3JHP2WgMXJM/ZUcBwxeM+YuSWTgMtUAAAAASUVORK5CYII='> Restore";
-        this.adjust_width();
+        this.adjustWidth();
     } else {
         el.setAttribute("title", "Maximise");
         el.innerHTML = "<img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAi0lEQVQ4y83TMQrCQBCF4S+5g4rJEdJ7KE+RQ1lrIQQCllroEULuoM0Ww3a7aXwwLAzMPzDvLcz4hnooUItT1rsoVNy+4lgLWNL7RlcCmDBij2eCfNCrUITc0dRCrhj8m5otw0O6SV8LuAV3uhrAAa8sJ2Np7KPFawhgscVLjH9bCDhjt8WNKft88w/HjCvuVqu53QAAAABJRU5ErkJggg=='> Max";
-        this.app.reset_layout();
+        this.app.resetLayout();
     }
 };

src/js/views/html/RecipeWaiter.js

@@ -14,79 +14,79 @@
 var RecipeWaiter = function(app, manager) {
     this.app = app;
     this.manager = manager;
-    this.remove_intent = false;
+    this.removeIntent = false;
 };
 
 
 /**
  * Sets up the drag and drop capability for operations in the operations and recipe areas.
  */
-RecipeWaiter.prototype.initialise_operation_drag_n_drop = function() {
-    var rec_list = document.getElementById("rec_list");
+RecipeWaiter.prototype.initialiseOperationDragNDrop = function() {
+    var recList = document.getElementById("rec-list");
     
     
     // Recipe list
-    Sortable.create(rec_list, {
+    Sortable.create(recList, {
         group: "recipe",
         sort: true,
         animation: 0,
         delay: 0,
         filter: ".arg-input,.arg", // Relies on commenting out a line in Sortable.js which calls evt.preventDefault()
-        setData: function(dataTransfer, drag_el) {
-            dataTransfer.setData("Text", drag_el.querySelector(".arg-title").textContent);
+        setData: function(dataTransfer, dragEl) {
+            dataTransfer.setData("Text", dragEl.querySelector(".arg-title").textContent);
         },
         onEnd: function(evt) {
-            if (this.remove_intent) {
+            if (this.removeIntent) {
                 evt.item.remove();
                 evt.target.dispatchEvent(this.manager.operationremove);
             }
         }.bind(this)
     });
     
-    Sortable.utils.on(rec_list, "dragover", function() {
-        this.remove_intent = false;
+    Sortable.utils.on(recList, "dragover", function() {
+        this.removeIntent = false;
     }.bind(this));
     
-    Sortable.utils.on(rec_list, "dragleave", function() {
-        this.remove_intent = true;
+    Sortable.utils.on(recList, "dragleave", function() {
+        this.removeIntent = true;
         this.app.progress = 0;
     }.bind(this));
 
-    Sortable.utils.on(rec_list, "touchend", function(e) {
+    Sortable.utils.on(recList, "touchend", function(e) {
         var loc = e.changedTouches[0],
             target = document.elementFromPoint(loc.clientX, loc.clientY);
 
-        this.remove_intent = !rec_list.contains(target);
+        this.removeIntent = !recList.contains(target);
     }.bind(this));
     
     // Favourites category
-    document.querySelector("#categories a").addEventListener("dragover", this.fav_dragover.bind(this));
-    document.querySelector("#categories a").addEventListener("dragleave", this.fav_dragleave.bind(this));
-    document.querySelector("#categories a").addEventListener("drop", this.fav_drop.bind(this));
+    document.querySelector("#categories a").addEventListener("dragover", this.favDragover.bind(this));
+    document.querySelector("#categories a").addEventListener("dragleave", this.favDragleave.bind(this));
+    document.querySelector("#categories a").addEventListener("drop", this.favDrop.bind(this));
 };
 
 
 /**
  * Creates a drag-n-droppable seed list of operations.
  *
- * @param {element} list_el - The list the initialise
+ * @param {element} listEl - The list the initialise
  */
-RecipeWaiter.prototype.create_sortable_seed_list = function(list_el) {
-    Sortable.create(list_el, {
+RecipeWaiter.prototype.createSortableSeedList = function(listEl) {
+    Sortable.create(listEl, {
         group: {
             name: "recipe",
             pull: "clone",
             put: false
         },
         sort: false,
-        setData: function(dataTransfer, drag_el) {
-            dataTransfer.setData("Text", drag_el.textContent);
+        setData: function(dataTransfer, dragEl) {
+            dataTransfer.setData("Text", dragEl.textContent);
         },
         onStart: function(evt) {
             $(evt.item).popover("destroy");
             evt.item.setAttribute("data-toggle", "popover-disabled");
         },
-        onEnd: this.op_sort_end.bind(this)
+        onEnd: this.opSortEnd.bind(this)
     });
 };
 
@@ -99,9 +99,9 @@ RecipeWaiter.prototype.create_sortable_seed_list = function(list_el) {
  * @fires Manager#operationadd
  * @param {event} evt
  */
-RecipeWaiter.prototype.op_sort_end = function(evt) {
-    if (this.remove_intent) {
-        if (evt.item.parentNode.id === "rec_list") {
+RecipeWaiter.prototype.opSortEnd = function(evt) {
+    if (this.removeIntent) {
+        if (evt.item.parentNode.id === "rec-list") {
             evt.item.remove();
         }
         return;
@@ -112,11 +112,11 @@ RecipeWaiter.prototype.op_sort_end = function(evt) {
     $(evt.clone).popover();
     $(evt.clone).children("[data-toggle=popover]").popover();
     
-    if (evt.item.parentNode.id !== "rec_list") {
+    if (evt.item.parentNode.id !== "rec-list") {
         return;
     }
     
-    this.build_recipe_operation(evt.item);
+    this.buildRecipeOperation(evt.item);
     evt.item.dispatchEvent(this.manager.operationadd);
 };
 
@@ -128,7 +128,7 @@ RecipeWaiter.prototype.op_sort_end = function(evt) {
  *
  * @param {event} e
  */
-RecipeWaiter.prototype.fav_dragover = function(e) {
+RecipeWaiter.prototype.favDragover = function(e) {
     if (e.dataTransfer.effectAllowed !== "move")
         return false;
     
@@ -153,7 +153,7 @@ RecipeWaiter.prototype.fav_dragover = function(e) {
  *
  * @param {event} e
  */
-RecipeWaiter.prototype.fav_dragleave = function(e) {
+RecipeWaiter.prototype.favDragleave = function(e) {
     e.stopPropagation();
     e.preventDefault();
     document.querySelector("#categories a").classList.remove("favourites-hover");
@@ -166,13 +166,13 @@ RecipeWaiter.prototype.fav_dragleave = function(e) {
  *
  * @param {event} e
  */
-RecipeWaiter.prototype.fav_drop = function(e) {
+RecipeWaiter.prototype.favDrop = function(e) {
     e.stopPropagation();
     e.preventDefault();
     e.target.classList.remove("favourites-hover");
     
-    var op_name = e.dataTransfer.getData("Text");
-    this.app.add_favourite(op_name);
+    var opName = e.dataTransfer.getData("Text");
+    this.app.addFavourite(opName);
 };
 
 
@@ -181,7 +181,7 @@ RecipeWaiter.prototype.fav_drop = function(e) {
  *
  * @fires Manager#statechange
  */
-RecipeWaiter.prototype.ing_change = function() {
+RecipeWaiter.prototype.ingChange = function() {
     window.dispatchEvent(this.manager.statechange);
 };
 
@@ -193,7 +193,7 @@ RecipeWaiter.prototype.ing_change = function() {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.disable_click = function(e) {
+RecipeWaiter.prototype.disableClick = function(e) {
     var icon = e.target;
     
     if (icon.getAttribute("disabled") === "false") {
@@ -218,7 +218,7 @@ RecipeWaiter.prototype.disable_click = function(e) {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.breakpoint_click = function(e) {
+RecipeWaiter.prototype.breakpointClick = function(e) {
     var bp = e.target;
 
     if (bp.getAttribute("break") === "false") {
@@ -240,7 +240,7 @@ RecipeWaiter.prototype.breakpoint_click = function(e) {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.operation_dblclick = function(e) {
+RecipeWaiter.prototype.operationDblclick = function(e) {
     e.target.remove();
     window.dispatchEvent(this.manager.statechange);
 };
@@ -253,7 +253,7 @@ RecipeWaiter.prototype.operation_dblclick = function(e) {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.operation_child_dblclick = function(e) {
+RecipeWaiter.prototype.operationChildDblclick = function(e) {
     e.target.parentNode.remove();
     window.dispatchEvent(this.manager.statechange);
 };
@@ -262,31 +262,31 @@ RecipeWaiter.prototype.operation_child_dblclick = function(e) {
 /**
  * Generates a configuration object to represent the current recipe.
  *
- * @returns {recipe_config}
+ * @returns {recipeConfig}
  */
-RecipeWaiter.prototype.get_config = function() {
-    var config = [], ingredients, ing_list, disabled, bp, item,
-        operations = document.querySelectorAll("#rec_list li.operation");
+RecipeWaiter.prototype.getConfig = function() {
+    var config = [], ingredients, ingList, disabled, bp, item,
+        operations = document.querySelectorAll("#rec-list li.operation");
     
     for (var i = 0; i < operations.length; i++) {
         ingredients = [];
         disabled = operations[i].querySelector(".disable-icon");
         bp = operations[i].querySelector(".breakpoint");
-        ing_list = operations[i].querySelectorAll(".arg");
+        ingList = operations[i].querySelectorAll(".arg");
         
-        for (var j = 0; j < ing_list.length; j++) {
-            if (ing_list[j].getAttribute("type") === "checkbox") {
+        for (var j = 0; j < ingList.length; j++) {
+            if (ingList[j].getAttribute("type") === "checkbox") {
                 // checkbox
-                ingredients[j] = ing_list[j].checked;
-            } else if (ing_list[j].classList.contains("toggle-string")) {
-                // toggle_string
+                ingredients[j] = ingList[j].checked;
+            } else if (ingList[j].classList.contains("toggle-string")) {
+                // toggleString
                 ingredients[j] = {
-                    option: ing_list[j].previousSibling.children[0].textContent.slice(0, -1),
-                    string: ing_list[j].value
+                    option: ingList[j].previousSibling.children[0].textContent.slice(0, -1),
+                    string: ingList[j].value
                 };
             } else {
                 // all others
-                ingredients[j] = ing_list[j].value;
+                ingredients[j] = ingList[j].value;
             }
         }
         
@@ -315,8 +315,8 @@ RecipeWaiter.prototype.get_config = function() {
  *
  * @param {number} position
  */
-RecipeWaiter.prototype.update_breakpoint_indicator = function(position) {
-    var operations = document.querySelectorAll("#rec_list li.operation");
+RecipeWaiter.prototype.updateBreakpointIndicator = function(position) {
+    var operations = document.querySelectorAll("#rec-list li.operation");
     for (var i = 0; i < operations.length; i++) {
         if (i === position) {
             operations[i].classList.add("break");
@@ -333,19 +333,19 @@ RecipeWaiter.prototype.update_breakpoint_indicator = function(position) {
  *
  * @param {element} el - The operation stub element from the operations pane
  */
-RecipeWaiter.prototype.build_recipe_operation = function(el) {
-    var op_name = el.textContent;
-    var op = new HTMLOperation(op_name, this.app.operations[op_name], this.app, this.manager);
-    el.innerHTML = op.to_full_html();
+RecipeWaiter.prototype.buildRecipeOperation = function(el) {
+    var opName = el.textContent;
+    var op = new HTMLOperation(opName, this.app.operations[opName], this.app, this.manager);
+    el.innerHTML = op.toFullHtml();
     
-    if (this.app.operations[op_name].flow_control) {
+    if (this.app.operations[opName].flowControl) {
         el.classList.add("flow-control-op");
     }
     
     // Disable auto-bake if this is a manual op - this should be moved to the 'operationadd'
     // handler after event restructuring
-    if (op.manual_bake && this.app.auto_bake_) {
-        this.manager.controls.set_auto_bake(false);
+    if (op.manualBake && this.app.autoBake_) {
+        this.manager.controls.setAutoBake(false);
         this.app.alert("Auto-Bake is disabled by default when using this operation.", "info", 5000);
     }
 };
@@ -357,13 +357,13 @@ RecipeWaiter.prototype.build_recipe_operation = function(el) {
  * @param {string} name - The name of the operation to add
  * @returns {element}
  */
-RecipeWaiter.prototype.add_operation = function(name) {
+RecipeWaiter.prototype.addOperation = function(name) {
     var item = document.createElement("li");
     
     item.classList.add("operation");
     item.innerHTML = name;
-    this.build_recipe_operation(item);
-    document.getElementById("rec_list").appendChild(item);
+    this.buildRecipeOperation(item);
+    document.getElementById("rec-list").appendChild(item);
     
     item.dispatchEvent(this.manager.operationadd);
     return item;
@@ -375,27 +375,27 @@ RecipeWaiter.prototype.add_operation = function(name) {
  *
  * @fires Manager#operationremove
  */
-RecipeWaiter.prototype.clear_recipe = function() {
-    var rec_list = document.getElementById("rec_list");
-    while (rec_list.firstChild) {
-        rec_list.removeChild(rec_list.firstChild);
+RecipeWaiter.prototype.clearRecipe = function() {
+    var recList = document.getElementById("rec-list");
+    while (recList.firstChild) {
+        recList.removeChild(recList.firstChild);
     }
-    rec_list.dispatchEvent(this.manager.operationremove);
+    recList.dispatchEvent(this.manager.operationremove);
 };
 
 
 /**
- * Handler for operation dropdown events from toggle_string arguments.
+ * Handler for operation dropdown events from toggleString arguments.
  * Sets the selected option as the name of the button.
  *
  * @param {event} e
  */
-RecipeWaiter.prototype.dropdown_toggle_click = function(e) {
+RecipeWaiter.prototype.dropdownToggleClick = function(e) {
     var el = e.target,
         button = el.parentNode.parentNode.previousSibling;
         
     button.innerHTML = el.textContent + " <span class='caret'></span>";
-    this.ing_change();
+    this.ingChange();
 };
 
 
@@ -406,7 +406,7 @@ RecipeWaiter.prototype.dropdown_toggle_click = function(e) {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.op_add = function(e) {
+RecipeWaiter.prototype.opAdd = function(e) {
     window.dispatchEvent(this.manager.statechange);
 };
 
@@ -418,6 +418,6 @@ RecipeWaiter.prototype.op_add = function(e) {
  * @fires Manager#statechange
  * @param {event} e
  */
-RecipeWaiter.prototype.op_remove = function(e) {
+RecipeWaiter.prototype.opRemove = function(e) {
     window.dispatchEvent(this.manager.statechange);
 };

src/js/views/html/WindowWaiter.js

@@ -18,9 +18,9 @@ var WindowWaiter = function(app) {
  * Resets the layout of CyberChef's panes after 200ms (so that continuous resizing doesn't cause
  * continuous resetting).
  */
-WindowWaiter.prototype.window_resize = function() {
-    clearTimeout(this.reset_layout_timeout);
-    this.reset_layout_timeout = setTimeout(this.app.reset_layout.bind(this.app), 200);
+WindowWaiter.prototype.windowResize = function() {
+    clearTimeout(this.resetLayoutTimeout);
+    this.resetLayoutTimeout = setTimeout(this.app.resetLayout.bind(this.app), 200);
 };
 
 
@@ -29,8 +29,8 @@ WindowWaiter.prototype.window_resize = function() {
  * Saves the current time so that we can calculate how long the window was unfocussed for when
  * focus is returned.
  */
-WindowWaiter.prototype.window_blur = function() {
-    this.window_blur_time = new Date().getTime();
+WindowWaiter.prototype.windowBlur = function() {
+    this.windowBlurTime = new Date().getTime();
 };
 
 
@@ -44,9 +44,9 @@ WindowWaiter.prototype.window_blur = function() {
  * This will stop baking taking a long time when the CyberChef browser tab has been unfocused for
  * a long time and the browser has swapped out all its memory.
  */
-WindowWaiter.prototype.window_focus = function() {
-    var unfocused_time = new Date().getTime() - this.window_blur_time;
-    if (unfocused_time > 60000) {
-        this.app.silent_bake();
+WindowWaiter.prototype.windowFocus = function() {
+    var unfocusedTime = new Date().getTime() - this.windowBlurTime;
+    if (unfocusedTime > 60000) {
+        this.app.silentBake();
     }
 };

src/js/views/html/main.js

@@ -10,7 +10,7 @@
  * Main function used to build the CyberChef web app.
  */
 var main = function() {
-    var default_favourites = [
+    var defaultFavourites = [
         "To Base64",
         "From Base64",
         "To Hex",
@@ -23,27 +23,27 @@ var main = function() {
         "Fork"
     ];
     
-    var default_options = {
-        update_url          : true,
-        show_highlighter    : true,
-        treat_as_utf8       : true,
-        word_wrap           : true,
-        show_errors         : true,
-        error_timeout       : 4000,
-        auto_bake_threshold : 200,
-        attempt_highlight   : true,
-        snow                : false,
+    var defaultOptions = {
+        updateUrl         : true,
+        showHighlighter   : true,
+        treatAsUtf8       : true,
+        wordWrap          : true,
+        showErrors        : true,
+        errorTimeout      : 4000,
+        autoBakeThreshold : 200,
+        attemptHighlight  : true,
+        snow              : false,
     };
 
     document.removeEventListener("DOMContentLoaded", main, false);
-    window.app = new HTMLApp(Categories, OperationConfig, default_favourites, default_options);
+    window.app = new HTMLApp(Categories, OperationConfig, defaultFavourites, defaultOptions);
     window.app.setup();
 };
 
 // Fix issues with browsers that don't support console.log()
 window.console = console || {log: function() {}, error: function() {}};
 
-window.compile_time = moment.tz("<%= grunt.template.today() %>", "ddd MMM D YYYY HH:mm:ss", "UTC").valueOf();
-window.compile_message = "<%= compile_msg %>";
+window.compileTime = moment.tz("<%= grunt.template.today() %>", "ddd MMM D YYYY HH:mm:ss", "UTC").valueOf();
+window.compileMessage = "<%= compileMsg %>";
 
 document.addEventListener("DOMContentLoaded", main, false);

src/static/stats.txt

@@ -1,9 +1,9 @@
 211	source files
-114836	lines
+114840	lines
 4.3M	size
 
 141	JavaScript source files
-105679	lines
+105680	lines
 3.7M	size
 
 83	third party JavaScript source files
@@ -11,7 +11,7 @@
 3.0M	size
 
 58	first party JavaScript source files
-19421	lines
+19422	lines
 732K	size
 
 3.4M	uncompressed JavaScript size