update code formatting, and general cleanup

lib/ace/commands/default_commands.js

@@ -45,8 +45,9 @@ exports.commands = [{
     name: "showSettingsMenu",
     bindKey: bindKey("Ctrl-,", "Command-,"),
     exec: function(editor) {
-        config.loadModule("ace/ext/show_keyboard_shortcuts", function (e) {
+        config.loadModule("ace/ext/settings_menu", function(module) {
-            e(editor);
+            module.init(editor);
+            editor.showSettingsMenu();
         });
     },
     readOnly: true

lib/ace/ext/keybinding_menu.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Show Keyboard Shortcuts

lib/ace/ext/menu_tools/add_editor_menu_options.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Add Editor Menu Options

lib/ace/ext/menu_tools/element_generator.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Element Generator

lib/ace/ext/menu_tools/get_editor_keyboard_shortcuts.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Get Editor Keyboard Shortcuts

lib/ace/ext/menu_tools/overlay_page.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Overlay Page

lib/ace/ext/settings_menu.js

@@ -30,18 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require,
-    getComputedStyle
-*/
 
 /**
  * Show Settings Menu
@@ -82,13 +72,5 @@ define(function(require, exports, module) {
         Editor.prototype.showSettingsMenu = function() {
             showSettingsMenu(this);
         };
-        editor.commands.addCommands([{
-            name: "showSettingsMenu",
-            bindKey: {win: "Ctrl-q", mac: "Command-q"},
-            exec: function(editor, line) {
-                editor.showSettingsMenu();
-            },
-            readOnly: true
-        }]);
     };
 });

lib/ace/ext/themelist.js

@@ -30,17 +30,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*jslint
+/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
-    indent: 4,
+/*global define, require */
-    maxerr: 50,
-    white: true,
-    browser: true,
-    vars: true
-*/
-/*global
-    define,
-    require
-*/
 
 /**
  * Generates a list of themes available when ace was built.