changes resulting from resource moves from pilot to cockpit

demo/boot.js

@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*
 require({
     paths: {
         demo: "../demo",
@@ -45,42 +44,41 @@ require({
     }
 });
 
-var deps = [ "pilot/fixoldbrowsers", "ace/plugin_manager",
+//*
-             "ace/environment", "demo/demo" ];
+var deps = [
+    "pilot/fixoldbrowsers",
+    "ace/plugin_manager",
+    "ace/environment",
+    "demo/demo"
+];
 
-var plugins = [ "pilot/index", "cockpit/index", "ace/index" ];
 require(deps, function() {
     var catalog = require("ace/plugin_manager").catalog;
+
+    var plugins = [ "cockpit/index", "ace/index" ];
     catalog.registerPlugins(plugins).then(function() {
         var env = require("ace/environment").create();
         catalog.startupPlugins({ env: env }).then(function() {
+            var gcli = require("cockpit/index");
+            new gcli.CliView(env);
+
             require("demo/demo").launch(env);
         });
     });
 });
-*/
+//*/
-
-require({
-    paths: {
-        demo: "../demo",
-        ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
-        pilot: "../support/cockpit/support/pilot/lib/pilot"
-    }
-});
 
+/*
 var deps = [
-    "ace/environment", "pilot/index", "cockpit/index", "ace/index",
+    "ace/environment", "cockpit/index", "ace/index", "demo/demo",
     "pilot/fixoldbrowsers"
 ];
 
-require(deps, function(environment, pilot, cockpit) {
+require(deps, function(environment, cockpit, ace, demo) {
     var data = { env: environment.create() };
-    pilot.startup(data);
     cockpit.startup(data);
     new cockpit.CliView(data.env);
-
+    ace.startup(data);
-    require([ "demo/demo" ], function(demo) {
     demo.launch(data.env);
-    });
 }.bind(this));
+//*/

demo/demo.js

@@ -40,7 +40,7 @@
 define(function(require, exports, module) {
 
 exports.launch = function(env) {
-    var canon = require("pilot/canon");
+    var canon = require("cockpit/canon");
     var event = require("pilot/event");
     var Editor = require("ace/editor").Editor;
     var Renderer = require("ace/virtual_renderer").VirtualRenderer;

lib/ace/commands/default_commands.js

@@ -41,7 +41,7 @@
 define(function(require, exports, module) {
 
 var lang = require("pilot/lang");
-var canon = require("pilot/canon");
+var canon = require("cockpit/canon");
 
 function bindKey(win, mac) {
     return {
@@ -51,6 +51,10 @@ function bindKey(win, mac) {
     };
 }
 
+/**
+ * TODO: This could be done more concisely and reversibly
+ */
+exports.startup = function() {
     canon.addCommand({
         name: "null",
         exec: function(env, args, request) {  }
@@ -398,5 +402,7 @@ canon.addCommand({
         bindKey: bindKey("Ctrl-T", "Ctrl-T"),
         exec: function(env, args, request) { env.editor.transposeLetters(); }
     });
+};
+
 
 });

lib/ace/commands/settings.js

@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 
-var canon = require('pilot/canon');
+var canon = require('cockpit/canon');
 
 var pref = {
     metadata: {

lib/ace/environment.js

@@ -37,11 +37,14 @@
 define(function(require, exports, module) {
 
 
+var settings = require("ace/settings").settings;
+
 /**
 * Create an environment object
 */
 function create() {
     return {
+        settings: settings
     };
 };
 

lib/ace/keyboard/keybinding.js

@@ -40,7 +40,7 @@ define(function(require, exports, module) {
 
 var useragent = require("pilot/useragent");
 var event = require("pilot/event");
-var canon = require("pilot/canon");
+var canon = require("cockpit/canon");
 
 var keyUtil  = require("ace/keys");
 var settings  = require("ace/settings").settings;

lib/ace/plugin_manager.js

@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var Promise = require("pilot/promise").Promise;
+var Promise = require("ace/promise").Promise;
 
 exports.REASONS = {
     APP_STARTUP: 1,

lib/ace/settings.js

@@ -44,12 +44,12 @@ define(function(require, exports, module) {
 
 var console = require('pilot/console');
 var oop = require('pilot/oop');
-var types = require('pilot/types');
+var types = require('cockpit/types');
 var EventEmitter = require('pilot/event_emitter').EventEmitter;
 
-var SelectionType = require('pilot/types/basic').SelectionType;
+var SelectionType = require('cockpit/basic').SelectionType;
-var DeferredType = require('pilot/types/basic').DeferredType;
+var DeferredType = require('cockpit/basic').DeferredType;
-var Argument = require('pilot/argument').Argument;
+var Argument = require('cockpit/argument').Argument;
 
 
 /**
@@ -314,7 +314,7 @@ exports.CookiePersister = CookiePersister;
 
 
 /**
- * EVIL: This relies on us using settingValue in the same event as setting
+ * This relies on us using settingValue in the same event as setting
  * The alternative is to have some central place where we store the current
  * command line, but this might be a lesser evil for now.
  */
@@ -330,22 +330,17 @@ var setting = new SelectionType({
     },
     noMatch: function() {
         lastSetting = null;
-    }
+    },
-});
+    stringify: function(setting) {
-(function() {
-    var originalStringify = setting.stringify;
-    setting.stringify = function(setting) {
         lastSetting = setting;
-        return originalStringify.call(this, setting);
+        return SelectionType.prototype.stringify.call(this, setting);
-    };
+    },
-
+    parse: function(arg) {
-    var originalParse = setting.parse;
+        var conversion = SelectionType.prototype.parse.call(this, arg);
-    setting.parse = function(arg) {
-        var conversion = originalParse.call(this, arg);
         lastSetting = conversion.value;
         return conversion;
-    };
+    }
-})();
+});
 
 /**
  * Something of a hack to allow the set command to give a clearer definition

lib/ace/settings/default-settings.js

@@ -38,17 +38,9 @@
 
 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.',
@@ -76,7 +68,7 @@ var settings = {
     },
     selectionStyle: {
         description: 'Type of text selection.',
-        type: 'selectionStyle',
+        type: { name: 'selection', data: [ 'line', 'text' ] },
         defaultValue: 'line',
         onChange: function onChange(event) {
             if (env.editor) env.editor.setSelectionStyle(event.value);
@@ -86,7 +78,6 @@ var settings = {
 
 exports.startup = function startup(data) {
     env = data.env;
-    types.registerTypes(settingTypes);
     data.env.settings.addSettings(settings);
 };
 

support/cockpit

@@ -1 +1 @@
-Subproject commit e20180cc3311b0d366e2624ddd1b150767bb41e4
+Subproject commit ebd56b41a28bb28805ae92b3d2356fdbed3a49c9