From b133fa087425bd266c4e15246c110deaa251697b Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Tue, 11 Jan 2011 13:35:42 +0100 Subject: [PATCH 1/5] Porting ace to teleport + requirejs --- demo/boot.js | 14 ++++++++------ editor.html | 6 ++---- package.json | 18 +++++++++++++++--- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/demo/boot.js b/demo/boot.js index 36bcb00f..6a039428 100644 --- a/demo/boot.js +++ b/demo/boot.js @@ -36,12 +36,14 @@ * ***** END LICENSE BLOCK ***** */ var config = { - paths: { - demo: "../demo", - ace: "../lib/ace", - cockpit: "../support/cockpit/lib/cockpit", - pilot: "../support/cockpit/support/pilot/lib/pilot" - } + baseUrl: "../../packages/", + packages: [ + { name: "ace", lib: "lib/ace" }, + { name: "cockpit", lib: "lib/cockpit" }, + { name: "pilot", lib: "lib/pilot" }, + { name: "demo", location: "ace/demo", lib: "." }, + { name: "require", location: "requirejs/require", lib: "." } + ] }; require(config, ["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings", diff --git a/editor.html b/editor.html index f1b20bf5..86acbb57 100644 --- a/editor.html +++ b/editor.html @@ -196,9 +196,7 @@ echo $output; ?> - - - - + + diff --git a/package.json b/package.json index f27b9a63..af3e3c79 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,29 @@ { "name": "ace", "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE", - "version": "0.1", + "version": "0.1.0", "homepage" : "http://github.com/ajaxorg/ace", "engines": {"node": ">= 0.1.102"}, "author": "Fabian Jakobs ", - "main": "src/ace/ace", "repository" : { "type" : "git", "url" : "http://github.com/ajaxorg/ace.git" }, + "overlay": { + "teleport": { + "directories": { + "lib": "lib/ace" + } + } + }, + "dependencies": { + "pilot": ">=0.1.0", + "cockpit": ">=0.1.0", + "teleport": ">=0.2.4", + "requirejs": ">=0.22.0" + }, "licenses": [{ "type": "LGPLv3", "url": "http://www.gnu.org/licenses/lgpl-3.0.txt"} ] -} \ No newline at end of file +} From 2d04a7f57b45c794b9e1a0493f8be1666b4b9d4a Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Fri, 28 Jan 2011 18:14:41 +0100 Subject: [PATCH 2/5] Adding new teleport to a dependencies. --- demo/boot.js | 18 +++++++++--------- editor.html | 6 ++++-- package.json | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/demo/boot.js b/demo/boot.js index 41f2e5f2..8ba8e433 100644 --- a/demo/boot.js +++ b/demo/boot.js @@ -1,4 +1,5 @@ -/* ***** BEGIN LICENSE BLOCK ***** +/* 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 @@ -20,6 +21,7 @@ * * Contributor(s): * Kevin Dangoor (kdangoor@mozilla.com) + * 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 @@ -36,14 +38,12 @@ * ***** END LICENSE BLOCK ***** */ var config = { - baseUrl: "../../packages/", - packages: [ - { name: "ace", lib: "lib/ace" }, - { name: "cockpit", lib: "lib/cockpit" }, - { name: "pilot", lib: "lib/pilot" }, - { name: "demo", location: "ace/demo", lib: "." }, - { name: "require", location: "requirejs/require", lib: "." } - ] + paths: { + demo: "../demo", + ace: "../lib/ace", + cockpit: "../support/cockpit/lib/cockpit", + pilot: "../support/pilot/lib/pilot", + } }; var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings", diff --git a/editor.html b/editor.html index 42a8a179..9849cbcb 100644 --- a/editor.html +++ b/editor.html @@ -139,7 +139,9 @@ echo $output; ?> - - + + + + diff --git a/package.json b/package.json index 2615c8d9..0c46000c 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "dependencies": { "pilot": ">=0.1.0", "cockpit": ">=0.1.0", - "teleport": ">=0.2.4", + "teleport": ">=0.2.6", "requirejs": ">=0.22.0", - "asyncjs": ">=0.0.2", + "asyncjs": ">=0.0.2", "jsdom": ">=0.1.23", "htmlparser": ">=1.7.2", "dryice": ">=0.1.0" @@ -39,4 +39,4 @@ "type": "LGPL", "url": "http://www.gnu.org/licenses/lgpl.html" }] -} \ No newline at end of file +} From c4e7ccd9c875b4d11853578bf109f30ca23bbea5 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Sat, 29 Jan 2011 01:03:12 +0100 Subject: [PATCH 3/5] Reduce amount of dependencies for teleport. --- package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0c46000c..be75d1ac 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,11 @@ "overlay": { "teleport": { "directories": { - "lib": "lib/ace" + "lib": "lib/ace", + "dependencies": { + "cockpit": ">=0.1.0", + "pilot": ">=0.1.0" + } } } }, @@ -21,7 +25,6 @@ "pilot": ">=0.1.0", "cockpit": ">=0.1.0", "teleport": ">=0.2.6", - "requirejs": ">=0.22.0", "asyncjs": ">=0.0.2", "jsdom": ">=0.1.23", "htmlparser": ">=1.7.2", From 3969d7c94c6cf8791f556e91ea14e4b2d5c14987 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Mon, 31 Jan 2011 16:11:29 +0100 Subject: [PATCH 4/5] Updating versions of ace and it's dependencies. --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 39869a33..ed708c92 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ace", "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE", - "version": "0.1.0", + "version": "0.1.1", "homepage" : "http://github.com/ajaxorg/ace", "engines": {"node": ">= 0.2.0"}, "author": "Fabian Jakobs ", @@ -15,15 +15,15 @@ "directories": { "lib": "lib/ace", "dependencies": { - "cockpit": ">=0.1.0", - "pilot": ">=0.1.0" + "cockpit": ">=0.1.1", + "pilot": ">=0.1.1" } } } }, "dependencies": { - "pilot": ">=0.1.0", - "cockpit": ">=0.1.0", + "pilot": ">=0.1.1", + "cockpit": ">=0.1.1", "teleport": ">=0.2.6", "asyncjs": ">=0.0.2", "jsdom": ">=0.1.23", From 47545824575ee925b4d468ee8eb59f4c7ac3cab8 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Mon, 31 Jan 2011 18:26:21 +0100 Subject: [PATCH 5/5] removing unneccessary changes --- demo/boot.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/demo/boot.js b/demo/boot.js index 8ba8e433..c5ca3b28 100644 --- a/demo/boot.js +++ b/demo/boot.js @@ -1,5 +1,4 @@ -/* vim:ts=4:sts=4:sw=4: - * ***** BEGIN LICENSE BLOCK ***** +/* ***** 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 @@ -21,7 +20,6 @@ * * Contributor(s): * Kevin Dangoor (kdangoor@mozilla.com) - * 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 @@ -42,7 +40,7 @@ var config = { demo: "../demo", ace: "../lib/ace", cockpit: "../support/cockpit/lib/cockpit", - pilot: "../support/pilot/lib/pilot", + pilot: "../support/pilot/lib/pilot" } };