From ce9d9f2bf4faf10ab66589f0dc104912a9f85a7d Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 26 Jan 2011 12:13:43 +0100 Subject: [PATCH] Implementing CLI settings that are shown in the demo editor. Conflicts: support/pilot --- demo/boot.js | 6 +- lib/ace/defaults.js | 51 +++++++++++++++ lib/ace/settings/default-settings.js | 97 ++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 lib/ace/defaults.js create mode 100644 lib/ace/settings/default-settings.js diff --git a/demo/boot.js b/demo/boot.js index e84bfe3f..c5ca3b28 100644 --- a/demo/boot.js +++ b/demo/boot.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ var config = { - paths: { + paths: { demo: "../demo", ace: "../lib/ace", cockpit: "../support/cockpit/lib/cockpit", @@ -47,10 +47,12 @@ var config = { var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings", "pilot/environment", "demo/startup" ]; +var plugins = [ "pilot/index", "cockpit/index", "ace/defaults" ]; + require(config); require(deps, function() { var catalog = require("pilot/plugin_manager").catalog; - catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() { + catalog.registerPlugins(plugins).then(function() { var env = require("pilot/environment").create(); catalog.startupPlugins({ env: env }).then(function() { require("demo/startup").launch(env); diff --git a/lib/ace/defaults.js b/lib/ace/defaults.js new file mode 100644 index 00000000..bd217cd1 --- /dev/null +++ b/lib/ace/defaults.js @@ -0,0 +1,51 @@ +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Irakli Gozalishvili (http://jeditoolkit.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +var settings = require("ace/settings/default-settings") + +exports.startup = function startup(data, reason) { + settings.startup(data, reason) +} + +exports.shutdown = function shutdown(data, reason) { + settings.shutdown(data, reason) +} + +}) diff --git a/lib/ace/settings/default-settings.js b/lib/ace/settings/default-settings.js new file mode 100644 index 00000000..4e5e0fdf --- /dev/null +++ b/lib/ace/settings/default-settings.js @@ -0,0 +1,97 @@ +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Irakli Gozalishvili (http://jeditoolkit.com) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +var types = require('pilot/types') +var SelectionType = require('pilot/types/basic').SelectionType + +var env + +var settingTypes = { + selectionStyle: new SelectionType({ + data: [ 'line', 'text' ] + }) +} + +var settings = { + printMargin: { + description: 'Position of the print margin column.', + type: 'number', + defaultValue: 80, + onChange: function onChange(event) { + if (env.editor) env.editor.setPrintMarginColumn(event.value) + } + }, + showIvisibles: { + description: 'Whether or not to show invisible characters.', + type: 'bool', + defaultValue: false, + onChange: function onChange(event) { + if (env.editor) env.editor.setShowInvisibles(event.value) + } + }, + highlightActiveLine: { + description: 'Whether or not highlight active line.', + type: 'bool', + defaultValue: true, + onChange: function onChange(event) { + if (env.editor) env.editor.setHighlightActiveLine(event.value) + } + }, + selectionStyle: { + description: 'Type of text selection.', + type: 'selectionStyle', + defaultValue: 'line', + onChange: function onChange(event) { + 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) +} + +exports.shutdown = function shutdown(data, reason) { + data.env.settings.removeSettings(settings) +} + +})