From 17e979bf3fed455f6a66252f0dde1da603dfb366 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 9 Dec 2015 09:14:54 +0000 Subject: [PATCH 01/23] Show error when html5.js can't be loaded --- node_modules/architect/architect.js | 10 ++++------ package.json | 1 + plugins/c9.vfs.standalone/views/standalone.html.ejs | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js index 59d552b2..de683671 100644 --- a/node_modules/architect/architect.js +++ b/node_modules/architect/architect.js @@ -277,11 +277,9 @@ else (function () { }); } - function resolveConfig(config, base, callback) { - if (typeof base == "function") { - callback = base; - base = ""; - } + function resolveConfig(config, base, callback, errback) { + if (typeof base == "function") + return resolveConfig(config, "", arguments[1], arguments[2]); var paths = [], pluginIndexes = {}; config.forEach(function (plugin, index) { @@ -306,7 +304,7 @@ else (function () { plugin.consumes = module.consumes || []; }); callback(null, config); - }); + }, errback); } }()); diff --git a/package.json b/package.json index 343bb108..6cbc61dc 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", + "c9.ide.language.python": "#undefined", "c9.ide.mount": "#b9a5a2d45c", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs index cc280dc2..7a9e3811 100644 --- a/plugins/c9.vfs.standalone/views/standalone.html.ejs +++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs @@ -109,6 +109,9 @@ if (window.hideLoader) window.hideLoader(); } + }, function loadError(mod) { + if (mod.id === "plugins/c9.ide.clipboard/html5") + return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?unpacked=1 added to the URL."); }); }); From 3580a85cf6e462c23955d0bba6ce05d961387a37 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 9 Dec 2015 12:20:11 +0100 Subject: [PATCH 02/23] Fix message --- plugins/c9.vfs.standalone/views/standalone.html.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs index 7a9e3811..cfdfbe85 100644 --- a/plugins/c9.vfs.standalone/views/standalone.html.ejs +++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs @@ -111,9 +111,9 @@ } }, function loadError(mod) { if (mod.id === "plugins/c9.ide.clipboard/html5") - return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?unpacked=1 added to the URL."); + return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?packed=1 added to the URL."); }); }); - \ No newline at end of file + From 90ba04ed7626eba3e964c05aaae1d6776bb2011c Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Dec 2015 17:46:50 +0100 Subject: [PATCH 03/23] Revert "Revert base_handler refactoring" --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 8b1892e8..b1f7952c 100644 --- a/package.json +++ b/package.json @@ -55,17 +55,17 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#a279b3826f", - "c9.ide.language.css": "#36150db526", - "c9.ide.language.generic": "#365368d108", - "c9.ide.language.html": "#e7b5ab7ff8", + "c9.ide.language": "#cf6efd83d1", + "c9.ide.language.css": "#be07d72209", + "c9.ide.language.generic": "#2b5cc6275e", + "c9.ide.language.html": "#9be847c0ce", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#1fd30cdf38", - "c9.ide.language.javascript.immediate": "#3e4f50e694", - "c9.ide.language.javascript.eslint": "#b3a4891ca7", - "c9.ide.language.javascript.tern": "#a70b174dd2", - "c9.ide.language.javascript.infer": "#8d2f248e33", - "c9.ide.language.jsonalyzer": "#f94698abff", + "c9.ide.language.javascript": "#1a0b1584c2", + "c9.ide.language.javascript.immediate": "#c8b1e5767a", + "c9.ide.language.javascript.eslint": "#586becb51d", + "c9.ide.language.javascript.tern": "#b03b4dc50b", + "c9.ide.language.javascript.infer": "#001fe08ecb", + "c9.ide.language.jsonalyzer": "#f3c2f606f8", "c9.ide.collab": "#30efed939e", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#e0deed4000", + "c9.ide.language.python": "#6fe0137f39", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From 3da57b80122509490fc83a3d94c81e3f73fef3b5 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Dec 2015 22:57:10 +0400 Subject: [PATCH 04/23] fix another regression after language handler refactor --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1f7952c..7b9daad3 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#cf6efd83d1", + "c9.ide.language": "#a411bd0986", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From 41e365cd12181faa533adae3c65809ebc36364af Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Dec 2015 15:20:56 +0000 Subject: [PATCH 05/23] Fix err serialization (passing as normal argument wouldn't get it properly serialized, stripping .message and .stack) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 60a2db24..3b777bb7 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#b3a4891ca7", "c9.ide.language.javascript.tern": "#a70b174dd2", "c9.ide.language.javascript.infer": "#8d2f248e33", - "c9.ide.language.jsonalyzer": "#2ebf2b73d6", + "c9.ide.language.jsonalyzer": "#7f49ff2785", "c9.ide.collab": "#10c224f9b8", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", From 773ddde159cea9121d615fce62b57e4cfb76127e Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 12:59:25 +0000 Subject: [PATCH 06/23] Fix error propagation --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3b777bb7..43842517 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#a279b3826f", + "c9.ide.language": "#a09c17c3ce", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#b3a4891ca7", "c9.ide.language.javascript.tern": "#a70b174dd2", "c9.ide.language.javascript.infer": "#8d2f248e33", - "c9.ide.language.jsonalyzer": "#7f49ff2785", + "c9.ide.language.jsonalyzer": "#92237b475a", "c9.ide.collab": "#10c224f9b8", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", From 30878e4719d44385d57b4510276d23f69bbae46d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 12:59:34 +0000 Subject: [PATCH 07/23] Fix cwd for files in workspace root --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43842517..a35b5173 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#ed39fb324b", + "c9.ide.language.python": "#eba0ea01e1", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From d1e18d17a1f6e95d1001463682cc07bbe1f49f00 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 13:41:04 +0000 Subject: [PATCH 08/23] Improve default cwd --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a35b5173..dae74820 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#a09c17c3ce", + "c9.ide.language": "#b523db804f", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#eba0ea01e1", + "c9.ide.language.python": "#10498750c5", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From 6d94e82f7d02a91524244cb18e1035ec9ed120a4 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 13:54:49 +0000 Subject: [PATCH 09/23] Improve docHtml support --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dae74820..0108599f 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#b523db804f", + "c9.ide.language": "#8d56ee72c5", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", From 5f140ae88bf9c094da656f58b02ff3fb10b58806 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 13:55:26 +0000 Subject: [PATCH 10/23] Be less picky with guessTooltip() e.g. show tooltip for Python classes like from django.http import HttpResponse HttpResponse( --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0108599f..7cd86ffb 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#8d56ee72c5", + "c9.ide.language": "#e2fab5d5fa", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", From b12d5d4f3f6102de4d2d271566d9970b0bd772c6 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 14:04:15 +0000 Subject: [PATCH 11/23] Hack away some self parameters --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7cd86ffb..1a61f6a9 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#10498750c5", + "c9.ide.language.python": "#8c7fb7e7a3", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From 4fad4752214192de635234ed742033b969c5f8e7 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 14:24:40 +0000 Subject: [PATCH 12/23] Fix regex --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1a61f6a9..65324e14 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#e2fab5d5fa", + "c9.ide.language": "#edaf50452c", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#b3a4891ca7", "c9.ide.language.javascript.tern": "#a70b174dd2", "c9.ide.language.javascript.infer": "#8d2f248e33", - "c9.ide.language.jsonalyzer": "#92237b475a", + "c9.ide.language.jsonalyzer": "#8a4d7987be", "c9.ide.collab": "#10c224f9b8", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", From 67e9fa2b83070ac060259a87c3a7c81125f90c6a Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 16:06:34 +0100 Subject: [PATCH 13/23] Remove unnecessary escape --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65324e14..705fbbd2 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#edaf50452c", + "c9.ide.language": "#4d077709db", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", From e63a709c5264040482128f5e917430bcf64f53d5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sat, 2 Jan 2016 14:29:08 +0000 Subject: [PATCH 14/23] Fix escape issues --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 705fbbd2..fd1e42f1 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#4d077709db", + "c9.ide.language": "#205411926b", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", From d188297c006976e32b55fff33f33e492d8484bbc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 3 Jan 2016 14:25:51 +0100 Subject: [PATCH 15/23] Fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd1e42f1..22e2ebe8 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#205411926b", + "c9.ide.language": "#61f92eba52", "c9.ide.language.css": "#36150db526", "c9.ide.language.generic": "#365368d108", "c9.ide.language.html": "#e7b5ab7ff8", From 3a45dba9e81486e2364480cc406224727266335e Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 3 Jan 2016 21:50:06 +0100 Subject: [PATCH 16/23] c9-auto-bump 3.1.879 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f9cdf97..5919557f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.878", + "version": "3.1.879", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0690d2f860b8e5b75d8f4efaf804a44a76a7f28f Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 3 Jan 2016 22:44:24 +0100 Subject: [PATCH 17/23] c9-auto-bump 3.1.880 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5919557f..f04a52a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.879", + "version": "3.1.880", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From dd62eea635ea99dbd6bcaae33e55b28d5c14cf1b Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:35:38 +0100 Subject: [PATCH 18/23] c9-auto-bump 3.1.881 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f04a52a3..9caf05ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.880", + "version": "3.1.881", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 646a54ccd55e3ae26881a8f07baf55e028c4ee7a Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:36:53 +0100 Subject: [PATCH 19/23] c9-auto-bump 3.1.882 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9caf05ba..721c72bd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.881", + "version": "3.1.882", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5e52296da6fe2a25c7422d3842ea87f4f7cf1baf Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:39:51 +0100 Subject: [PATCH 20/23] c9-auto-bump 3.1.883 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 721c72bd..84e19332 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.882", + "version": "3.1.883", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 47c6c2b84ef587ffb4778322c08ad61b1a469ac3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:40:19 +0100 Subject: [PATCH 21/23] c9-auto-bump 3.1.884 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0bfe527..2a8b2078 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.883", + "version": "3.1.884", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d2b2c038aefea3fe6649aa89b80e19193cdfcfe6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:42:56 +0100 Subject: [PATCH 22/23] c9-auto-bump 3.1.885 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4335e5d8..0b40bd84 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.884", + "version": "3.1.885", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c14e96d69d951a9102a989374b7ffa03a4ec5648 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 09:43:09 +0100 Subject: [PATCH 23/23] c9-auto-bump 3.1.886 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b40bd84..bb272186 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.885", + "version": "3.1.886", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",