diff --git a/lib/ace/settings/default-settings.js b/lib/ace/settings/default-settings.js index 4e5e0fdf..cb1092aa 100644 --- a/lib/ace/settings/default-settings.js +++ b/lib/ace/settings/default-settings.js @@ -38,16 +38,16 @@ define(function(require, exports, module) { -var types = require('pilot/types') -var SelectionType = require('pilot/types/basic').SelectionType +var types = require('pilot/types'); +var SelectionType = require('pilot/types/basic').SelectionType; -var env +var env; var settingTypes = { selectionStyle: new SelectionType({ data: [ 'line', 'text' ] }) -} +}; var settings = { printMargin: { @@ -55,23 +55,23 @@ var settings = { type: 'number', defaultValue: 80, onChange: function onChange(event) { - if (env.editor) env.editor.setPrintMarginColumn(event.value) + if (env.editor) env.editor.setPrintMarginColumn(event.value); } }, showIvisibles: { description: 'Whether or not to show invisible characters.', - type: 'bool', + type: 'boolean', defaultValue: false, onChange: function onChange(event) { - if (env.editor) env.editor.setShowInvisibles(event.value) + if (env.editor) env.editor.setShowInvisibles(event.value); } }, highlightActiveLine: { description: 'Whether or not highlight active line.', - type: 'bool', + type: 'boolean', defaultValue: true, onChange: function onChange(event) { - if (env.editor) env.editor.setHighlightActiveLine(event.value) + if (env.editor) env.editor.setHighlightActiveLine(event.value); } }, selectionStyle: { @@ -79,19 +79,19 @@ var settings = { type: 'selectionStyle', defaultValue: 'line', onChange: function onChange(event) { - if (env.editor) env.editor.setSelectionStyle(event.value) + if (env.editor) env.editor.setSelectionStyle(event.value); } } -} +}; exports.startup = function startup(data, reason) { - env = data.env - types.registerTypes(settingTypes) - data.env.settings.addSettings(settings) -} + env = data.env; + types.registerTypes(settingTypes); + data.env.settings.addSettings(settings); +}; exports.shutdown = function shutdown(data, reason) { - data.env.settings.removeSettings(settings) -} + data.env.settings.removeSettings(settings); +}; -}) +}); diff --git a/support/cockpit b/support/cockpit index 4db2acd7..56a7887f 160000 --- a/support/cockpit +++ b/support/cockpit @@ -1 +1 @@ -Subproject commit 4db2acd7d27bf8073eab841e8f8266e9d1cf0fa7 +Subproject commit 56a7887f269e31e2bf96cb3bf85d5ac9373111c6