From 62f9f224916ccb4084ee80544e27456508e68dd6 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Tue, 4 Jan 2011 13:31:01 +0000
Subject: [PATCH 1/9] fix for selection misused - should go via the editor. not
 sure how this got missed out of commits

---
 lib/ace/commands/default_commands.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 4e7d66b1..7ff66bf9 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -41,7 +41,7 @@ var canon = require("pilot/canon");
 
 canon.addCommand({
     name: "selectall",
-    exec: function(env, args, request) { env.selection.selectAll(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectAll(); }
 });
 canon.addCommand({
     name: "removeline",
@@ -101,7 +101,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selecttostart",
-    exec: function(env, args, request) { env.selection.selectFileStart(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectFileStart(); }
 });
 canon.addCommand({
     name: "gotostart",
@@ -109,7 +109,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectup",
-    exec: function(env, args, request) { env.selection.selectUp(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectUp(); }
 });
 canon.addCommand({
     name: "golineup",
@@ -125,7 +125,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selecttoend",
-    exec: function(env, args, request) { env.selection.selectFileEnd(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectFileEnd(); }
 });
 canon.addCommand({
     name: "gotoend",
@@ -133,7 +133,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectdown",
-    exec: function(env, args, request) { env.selection.selectDown(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectDown(); }
 });
 canon.addCommand({
     name: "godown",
@@ -141,7 +141,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectwordleft",
-    exec: function(env, args, request) { env.selection.selectWordLeft(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectWordLeft(); }
 });
 canon.addCommand({
     name: "gotowordleft",
@@ -149,7 +149,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selecttolinestart",
-    exec: function(env, args, request) { env.selection.selectLineStart(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectLineStart(); }
 });
 canon.addCommand({
     name: "gotolinestart",
@@ -157,7 +157,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectleft",
-    exec: function(env, args, request) { env.selection.selectLeft(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectLeft(); }
 });
 canon.addCommand({
     name: "gotoleft",
@@ -165,7 +165,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectwordright",
-    exec: function(env, args, request) { env.selection.selectWordRight(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectWordRight(); }
 });
 canon.addCommand({
     name: "gotowordright",
@@ -173,7 +173,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selecttolineend",
-    exec: function(env, args, request) { env.selection.selectLineEnd(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectLineEnd(); }
 });
 canon.addCommand({
     name: "gotolineend",
@@ -181,7 +181,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectright",
-    exec: function(env, args, request) { env.selection.selectRight(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectRight(); }
 });
 canon.addCommand({
     name: "gotoright",
@@ -213,7 +213,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectlinestart",
-    exec: function(env, args, request) { env.selection.selectLineStart(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectLineStart(); }
 });
 canon.addCommand({
     name: "gotolinestart",
@@ -221,7 +221,7 @@ canon.addCommand({
 });
 canon.addCommand({
     name: "selectlineend",
-    exec: function(env, args, request) { env.selection.selectLineEnd(); }
+    exec: function(env, args, request) { env.editor.getSelection().selectLineEnd(); }
 });
 canon.addCommand({
     name: "gotolineend",

From 725d53824fcd68535f1dfdb8c79e19ed84105bbe Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Tue, 4 Jan 2011 13:31:23 +0000
Subject: [PATCH 2/9] catchup with changes in cockpit - use cockputInput as
 element it

---
 editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor.html b/editor.html
index 2e66ea17..6ef20609 100644
--- a/editor.html
+++ b/editor.html
@@ -177,7 +177,7 @@ echo $output;
 
 ?></script>
 
-    <input id="cockpit" type="text"/>
+    <input id="cockpitInput" type="text"/>
 
 
     <script>

From 496e29de2de8842cb6cb1c1dd795842eb8b07e90 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Tue, 4 Jan 2011 15:52:30 +0000
Subject: [PATCH 3/9] cockpit submodule catchup

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 47df3c34..2b85d45e 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 47df3c340244b15c272ed87b17cd87659f4bcd0c
+Subproject commit 2b85d45e29ef1e3446ad93896fc9e2b20f9f6cd9

From 086d673db160fdb7fe415a83e1426a5fb75f02d7 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Wed, 5 Jan 2011 11:33:15 +0000
Subject: [PATCH 4/9] catchup with cockpit

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 2b85d45e..8d2ddb33 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 2b85d45e29ef1e3446ad93896fc9e2b20f9f6cd9
+Subproject commit 8d2ddb339e40cacc4ea15492bb50323bcc30fb28

From 7e675430b1251fee708d37b76c71fc4603565d79 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Wed, 5 Jan 2011 11:33:43 +0000
Subject: [PATCH 5/9] simplify startup

---
 demo/boot.js | 118 +--------------------------------------------------
 1 file changed, 2 insertions(+), 116 deletions(-)

diff --git a/demo/boot.js b/demo/boot.js
index bbf08f18..d6533cd7 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -35,117 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*
-setupPlugins(function(plugin_manager, settings) {
-  var data = { env: { settings: settings } };
-  plugin_manager.catalog.startupPlugins(data, plugin_manager.REASONS.APP_STARTUP).then(function() {
-    var demo_startup = require("demo_startup");
-    demo_startup.launch(data.env);
-  });
-});
-
-// TODO: Yuck! A global function
-var setupPlugins = function(callback) {
-    var config = {
-      pluginDirs: {
-        "../demo": {
-          singleFiles: ["demo_startup"]
-        }
-      }
-    };
-
-    if (!config.pluginDirs) {
-        config.pluginDirs = {};
-    }
-    // config.pluginDirs["../lib"] = {
-    //     packages: ["ace"]
-    // };
-    config.pluginDirs["../support/cockpit/support/pilot/lib"] = {
-        packages: [ "pilot" ]
-    };
-    config.pluginDirs["../support/cockpit/lib"] = {
-        packages: [ "cockpit" ]
-    };
-
-    var knownPlugins = [];
-
-    var pluginPackageInfo = {
-        "../lib": [
-            {
-                name: "ace",
-                lib: "."
-            }
-        ]
-    };
-
-    var paths = {};
-    var i;
-    var location;
-
-    // we need to ensure that the core plugin directory is loaded first
-    var pluginDirs = [];
-    var pluginDir;
-    for (pluginDir in config.pluginDirs) {
-        pluginDirs.push(pluginDir);
-    }
-    pluginDirs.sort(function(a, b) {
-        if (a == "../plugins") {
-            return -1;
-        } else if (b == "../plugins") {
-            return 1;
-        } else if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    });
-
-    // set up RequireJS to know that our plugins all have a main module called "index"
-    for (var dirNum = 0; dirNum < pluginDirs.length; dirNum++) {
-        pluginDir = pluginDirs[dirNum];
-        var dirInfo = config.pluginDirs[pluginDir];
-        if (dirInfo.packages) {
-            location = pluginPackageInfo[pluginDir];
-            if (location === undefined) {
-                pluginPackageInfo[pluginDir] = location = [];
-            }
-            var packages = dirInfo.packages;
-            for (i = 0; i < packages.length; i++) {
-                location.push({
-                    name: packages[i],
-                    main: "index",
-                    lib: "."
-                });
-                knownPlugins.push(packages[i] + "/index");
-            }
-        }
-        if (dirInfo.singleFiles) {
-            for (i = 0; i < dirInfo.singleFiles.length; i++) {
-                var pluginName = dirInfo.singleFiles[i];
-                paths[pluginName] = pluginDir + "/" + pluginName;
-                knownPlugins.push(pluginName);
-            }
-        }
-    }
-    require({
-        packagePaths: pluginPackageInfo,
-        paths: paths
-    });
-    require(["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings"], function() {
-        var pluginsModule = require("pilot/plugin_manager");
-        var settings = require("pilot/settings").settings;
-        var catalog = pluginsModule.catalog;
-        catalog.registerPlugins(knownPlugins).then(function() {
-            if (callback) {
-                callback(pluginsModule, settings);
-            }
-        });
-    });
-};
-*/
-
 var config = {
     packagePaths: {
         "../lib": [
@@ -166,13 +55,10 @@ var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
 
 require(config, deps, function() {
     var catalog = require("pilot/plugin_manager").catalog;
-    var REASON_START = require("pilot/plugin_manager").REASONS.APP_STARTUP;
-    var settings = require("pilot/settings").settings;
-
     catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() {
         var env = require("pilot/environment").create();
-        catalog.startupPlugins({ env:env }, REASON_START).then(function() {
-          require("demo_startup").launch(env);
+        catalog.startupPlugins({ env: env }).then(function() {
+            require("demo_startup").launch(env);
         });
     });
 });

From 2eb071a309d77c995f6071ee8a9cb735530123dc Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Wed, 5 Jan 2011 17:56:14 +0000
Subject: [PATCH 6/9] catchup with cockpit

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 8d2ddb33..1dc34f75 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 8d2ddb339e40cacc4ea15492bb50323bcc30fb28
+Subproject commit 1dc34f752c682f4f6c5b3894dc389a5c43b0447e

From a7ab6cd1f7002f71b482b7061518fb4e26501ec8 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 7 Jan 2011 12:07:57 +0000
Subject: [PATCH 7/9] project files, back from the dead?

---
 .gitignore | 14 +++++++++++++-
 .project   | 17 -----------------
 2 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 .project

diff --git a/.gitignore b/.gitignore
index 354d9ca3..dcdafe7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,15 @@
+
+# Junk that could exist anywhere:
 .DS_Store
+*.swp
+*.tmp
+
+# Project files that should not be in the repo
+.project
+.settings/
 .settings.xml
-.settings.xml.old
\ No newline at end of file
+.settings.xml.old
+
+# A handy place to put stuff that git should ignore:
+/ignore/
+
diff --git a/.project b/.project
deleted file mode 100644
index dbb46bdc..00000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>editor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

From 60ddae77a8c4ece200fa37654c51bd2e393218bc Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 7 Jan 2011 12:12:23 +0000
Subject: [PATCH 8/9] catchup with cockpit

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 8d2ddb33..308e3478 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 8d2ddb339e40cacc4ea15492bb50323bcc30fb28
+Subproject commit 308e347893b9ed0645b46aa3f31d1d4fb5205fcc

From 5a74d8f944acf395af6eda1bf85df93d49853c4e Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 7 Jan 2011 12:20:09 +0000
Subject: [PATCH 9/9] catchup with cockpit

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 308e3478..3c5401f5 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 308e347893b9ed0645b46aa3f31d1d4fb5205fcc
+Subproject commit 3c5401f5bc5cd9ffbbf8ebc1e45ecfa39ee898ba