This commit is contained in:
Joe Walker 2011-04-07 14:19:09 +01:00
Родитель 6af328f0f4
Коммит 45a7be6b43
11 изменённых файлов: 30 добавлений и 30 удалений

Просмотреть файл

@ -119,50 +119,50 @@ copy({
dest: 'build/src/ace-uncompressed.js'
});
console.log('# cockpit ---------');
console.log('# gcli ---------');
project.assumeAllFilesLoaded();
project.addRoot(aceHome + '/support/cockpit/lib');
project.addRoot(aceHome + '/support/gcli/lib');
var cockpit = copy.createDataObject();
var gcli = copy.createDataObject();
copy({
source: [
copy.source.commonjs({
project: project,
require: [ 'cockpit/index' ]
require: [ 'gcli/index' ]
})
],
filter: [ copy.filter.moduleDefines ],
dest: cockpit
dest: gcli
});
copy({
source: {
root: aceHome + '/support/cockpit/lib',
root: aceHome + '/support/gcli/lib',
include: /.*\.css$|.*\.html$/,
exclude: /tests?\//
},
filter: [ copy.filter.addDefines ],
dest: cockpit
dest: gcli
});
copy({
source: {
root: aceHome + '/support/cockpit/lib',
root: aceHome + '/support/gcli/lib',
include: /.*\.png$|.*\.gif$/,
exclude: /tests?\//
},
filter: [ copy.filter.base64 ],
dest: cockpit
dest: gcli
});
// Create the compressed and uncompressed output files
copy({
source: cockpit,
source: gcli,
filter: copy.filter.uglifyjs,
dest: 'build/src/cockpit.js'
dest: 'build/src/gcli.js'
});
copy({
source: cockpit,
dest: 'build/src/cockpit-uncompressed.js'
source: gcli,
dest: 'build/src/gcli-uncompressed.js'
});
@ -270,7 +270,7 @@ copy({
// source: aceHome + "/editor.html",
// filter: [ function(data) {
// var includes = [
// "ace", "cockpit",
// "ace", "gcli",
// "keybinding-vim", "keybinding-emacs",
// "mode-javascript", "mode-css", "mode-html", "mode-php", "mode-python",
// "mode-xml",

Просмотреть файл

@ -39,7 +39,7 @@ require({
paths: {
demo: "../demo",
ace: "../lib/ace",
cockpit: "../support/cockpit/lib/cockpit",
gcli: "../support/cockpit/lib/gcli",
pilot: "../support/cockpit/support/pilot/lib/pilot"
}
});
@ -54,11 +54,11 @@ var deps = [
require(deps, function() {
var catalog = require("ace/plugin_manager").catalog;
var plugins = [ "cockpit/index", "ace/index" ];
var plugins = [ "gcli/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");
var gcli = require("gcli/index");
new gcli.CliView({ env: env });
require("demo/demo").launch(env);

Просмотреть файл

@ -42,7 +42,7 @@ define(function(require, exports, module) {
var keybinding = require('ace/keyboard/keybinding');
exports.launch = function(env) {
var gcli = require("cockpit/index");
var gcli = require("gcli/index");
var event = require("pilot/event");
var Editor = require("ace/editor").Editor;
var Renderer = require("ace/virtual_renderer").VirtualRenderer;

Просмотреть файл

@ -26,7 +26,7 @@ body {
width: 100%;
}
#cockpitInput {
#gcliInput {
position: absolute;
width: 100%;
bottom: 0;
@ -36,7 +36,7 @@ body {
font-size: 120%;
}
#cockpitOutput {
#gcliOutput {
margin: 0 15px;
border: 1px solid #AAA;
-moz-border-radius-topleft: 10px;

Просмотреть файл

@ -448,7 +448,7 @@ bg. Blockquote!
</script>
<input id="cockpitInput" type="text"/>
<input id="gcliInput" type="text"/>
<script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
<script src="demo/boot.js" type="text/javascript"></script>

Просмотреть файл

@ -42,7 +42,7 @@ define(function(require, exports, module) {
var lang = require("pilot/lang");
var gcli = require("cockpit/index");
var gcli = require("gcli/index");
var keybinding = require('ace/keyboard/keybinding');
/**

Просмотреть файл

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

Просмотреть файл

@ -45,7 +45,7 @@ var typecheck = require('pilot/typecheck');
var keyUtil = require('ace/keys');
var settings = require('ace/settings').settings;
var Requisition = require('cockpit/index').Requisition;
var Requisition = require('gcli/index').Requisition;
var KeyBinding = function(editor) {
this.$editor = editor;

Просмотреть файл

@ -44,12 +44,12 @@ define(function(require, exports, module) {
var console = require('pilot/console');
var oop = require('pilot/oop');
var types = require('cockpit/types');
var types = require('gcli/types');
var EventEmitter = require('pilot/event_emitter').EventEmitter;
var SelectionType = require('cockpit/types').SelectionType;
var DeferredType = require('cockpit/types').DeferredType;
var Argument = require('cockpit/argument').Argument;
var SelectionType = require('gcli/types').SelectionType;
var DeferredType = require('gcli/types').DeferredType;
var Argument = require('gcli/argument').Argument;
/**

Просмотреть файл

@ -29,7 +29,7 @@
require({
paths: {
ace: "../lib/ace",
cockpit: "../support/cockpit/lib/cockpit",
gcli: "../support/gcli/lib/gcli",
pilot: "../support/pilot/lib/pilot"
},
packages : [{

@ -1 +1 @@
Subproject commit 193f1c44bbb260c737ef077a47e638899a9375f7
Subproject commit 7a14c62f84cf51e83a31b14d9a79f875bcabeacc