Skip to content

Commit 0e16531

Browse files
nightwingnightwing
committed
Merge remote-tracking branch 'remotes/origin/master' into 11
Conflicts: plugins-client/ext.searchinfiles/searchinfiles.js plugins-client/ext.searchinfiles/skin.xml plugins-client/ext.searchreplace/libsearch.js plugins-client/ext.searchreplace/searchreplace.js
2 parents 46ae4e5 + 9b8329c commit 0e16531

37 files changed

Lines changed: 1116 additions & 638 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ apfdebug:
1212
cd node_modules/packager; node package.js projects/apf_cloud9_debug.apr
1313
cd node_modules/packager; cat build/apf_debug.js | sed 's/\(\/\*FILEHEAD(\).*\/apf\/\(.*\)/\1\2/g' > ../../plugins-client/lib.apf/www/apf-packaged/apf_debug.js
1414

15+
# package_apf--temporary fix for non-workering infra
16+
pack_apf:
17+
mkdir -p build/src
18+
mv plugins-client/lib.apf/www/apf-packaged/apf_release.js build/src/apf_release.js
19+
node build/r.js -o name=./build/src/apf_release.js out=./plugins-client/lib.apf/www/apf-packaged/apf_release.js baseUrl=.
20+
1521
# packages core
1622
core:
1723
mkdir -p build/src

‎configs/default.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd(
1717
var fsUrl = "/workspace";
1818

1919
var port = argv.p || process.env.PORT || 3131;
20+
var host = argv.l || "localhost";
2021

2122
var config = {
2223
name: "Cloud9",
@@ -28,7 +29,7 @@ var config = {
2829
plugins: [{
2930
packagePath: "./cloud9.connect",
3031
port: port,
31-
host: "localhost"
32+
host: host
3233
}, {
3334
packagePath: "./cloud9.sourcemint",
3435
prefix: "/static/bundles",
@@ -54,7 +55,9 @@ var config = {
5455
packagePath: "./cloud9.sandbox",
5556
projectDir: projectDir,
5657
workspaceId: "Cloud9",
57-
unixId: null
58+
userDir: null, // is this always there??
59+
unixId: null,
60+
host: host
5861
}, {
5962
packagePath: "./cloud9.core",
6063
debug: false,

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"jsDAV": ["npm", "https://github.com/ajaxorg/jsDAV/tarball/21c6fea18d3480ef2641d9889e531ded60216082"],
4343
"v8debug": ["npm", "https://github.com/ajaxorg/lib-v8debug/tarball/09ce2bef1c33add76ed5c52ce477df339101b435"],
4444
"treehugger": ["npm", "https://github.com/ajaxorg/treehugger/tarball/c7ee419c6c985d4369d71619b8e97044de3e502e"],
45-
"packager": ["npm", "https://github.com/ajaxorg/packager/tarball/a8527d943900a239c9f3d36b14c995f0119a2760"]
45+
"packager": ["npm", "https://github.com/ajaxorg/packager/tarball/0b1aaac94d21a10a8ee8117495a71f788ca01372"]
4646
},
4747

4848
"repository" : {

‎plugins-client/ext.code/code.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ module.exports = ext.register("ext/code/code", {
311311
doc.addEventListener("prop.value", function(e) {
312312
if (this.editor != _self)
313313
return;
314+
315+
if (!doc || !doc.acesession)
316+
return; //This is probably a deconstructed document
314317

315318
doc.acesession.setValue(e.value || "");
316319

‎plugins-client/ext.console/console.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ module.exports = ext.register("ext/console/console", {
435435

436436
switch (message.type) {
437437
case "node-start":
438-
var clearOnRun = settings.model.queryValue("auto/console/@clearonrun");
439-
if (apf.isTrue(clearOnRun) && window["txtOutput"]) txtOutput.clear();
438+
//var clearOnRun = settings.model.queryValue("auto/console/@clearonrun");
439+
//if (apf.isTrue(clearOnRun) && window["txtOutput"]) txtOutput.clear();
440440
this.createNodeProcessLog(message.pid);
441441
return;
442442
case "node-data":
@@ -675,8 +675,8 @@ module.exports = ext.register("ext/console/console", {
675675

676676
ide.addEventListener("settings.load", function(e){
677677
settings.setDefaults("auto/console", [
678-
["autoshow", "true"],
679-
["clearonrun", "true"]
678+
["autoshow", "true"]
679+
//["clearonrun", "true"]
680680
]);
681681

682682
_self.height = e.model.queryValue("auto/console/@height") || _self.height;

‎plugins-client/ext.console/console.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<a:item type="check"
6767
checked = "[{require('core/settings').model}::auto/console/@autoshow]"
6868
caption = "Auto-show console when running" />
69-
<a:item type="check"
69+
<!--a:item type="check"
7070
checked = "[{require('core/settings').model}::auto/console/@clearonrun]"
71-
caption = "Clear output on run" />
71+
caption = "Clear output on run" /-->
7272
</a:menu>
7373

7474
<a:hbox id="cliBox" class="consoleInputBox" edge="1 1 2 1" padding="4" pack="end" visible="false">

‎plugins-client/ext.dragdrop/dragdrop.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
3030
label.textContent = "Drop files here to upload";
3131
dropbox.appendChild(label);
3232

33-
function decorateNode(holder) {
33+
function decorateNode(holder, id) {
3434
dropbox = holder.dropbox = dropbox.cloneNode(true);
35+
dropbox.setAttribute("id", id);
3536
holder.appendChild(dropbox);
3637

3738
holder.addEventListener("dragenter", dragEnter, false);
@@ -45,7 +46,7 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
4546

4647
ide.addEventListener("init.ext/editors/editors", function(){
4748
_self.nodes.push(tabEditors.$ext);
48-
decorateNode(tabEditors.$ext);
49+
decorateNode(tabEditors.$ext, "tabEditorsDropArea");
4950
});
5051

5152
ide.addEventListener("init.ext/tree/tree", function(){
@@ -64,7 +65,6 @@ module.exports = ext.register("ext/dragdrop/dragdrop", {
6465
ide.addEventListener("init.ext/uploadfiles/uploadfiles", function(){
6566
winUploadFiles.addEventListener("afterrender", function(){
6667
_self.nodes.push(uploadDropArea);
67-
//decorateNode(uploadDropArea.$ext);
6868

6969
uploadDropArea.addEventListener("dragenter", dragEnter, false);
7070
uploadDropArea.addEventListener("dragleave", dragLeave, false);

‎plugins-client/ext.filesystem/filesystem.js‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ var ext = require("core/ext");
1212
var util = require("core/util");
1313
var commands = require("ext/commands/commands");
1414

15+
require("ext/main/main"); //Make sure apf is inited.
16+
1517
module.exports = ext.register("ext/filesystem/filesystem", {
1618
name : "File System",
1719
dev : "Ajax.org",
@@ -314,11 +316,20 @@ module.exports = ext.register("ext/filesystem/filesystem", {
314316
var page = tabEditors.getPage(path);
315317
if (page)
316318
tabEditors.remove(page);
317-
318-
if(!callback)
319-
callback = function() {};
320-
321-
davProject.remove(path, false, callback);
319+
320+
var cb = function(data, state, extra) {
321+
// In WebDAV, a 204 status from the DELETE verb means that the
322+
// file was removed successfully.
323+
if (extra && extra.status && extra.status === 204) {
324+
ide.dispatchEvent("removefile", {
325+
path: path
326+
});
327+
}
328+
329+
if (callback)
330+
callback(data, state, extra);
331+
};
332+
davProject.remove(path, false, cb);
322333
},
323334

324335
/**** Init ****/
@@ -374,13 +385,13 @@ module.exports = ext.register("ext/filesystem/filesystem", {
374385
});
375386

376387
var dav_url = location.href.replace(location.pathname + location.hash, "") + ide.davPrefix;
377-
this.webdav = new apf.webdav({
388+
this.webdav = apf.document.documentElement.appendChild(new apf.webdav({
378389
id : "davProject",
379390
url : dav_url,
380391
onauthfailure: function() {
381392
ide.dispatchEvent("authrequired");
382393
}
383-
});
394+
}));
384395

385396
function openHandler(e) {
386397
ide.send({

0 commit comments

Comments
 (0)