From fb532d5e76da9a0c2c64749e3cac2fd3bcfa478a Mon Sep 17 00:00:00 2001 From: Arron Bailiss Date: Wed, 28 Oct 2015 16:34:18 +0000 Subject: [PATCH 01/38] Add test mode settings for services-test server --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 61d0c5ba..03742606 100755 --- a/server.js +++ b/server.js @@ -44,7 +44,8 @@ function getDefaultSettings() { "prod": "deploy", "beta": "beta", "dev": "devel", - "onlinedev": "onlinedev" + "onlinedev": "onlinedev", + "test": "test" }; return modes[suffix] || "devel"; } From a1b273b6e1c66f8cd03057e4357b34ca435adb9a Mon Sep 17 00:00:00 2001 From: Harutyun Amirjanyan Date: Thu, 22 Oct 2015 19:33:41 +0400 Subject: [PATCH 02/38] Revert "Revert "fix symlink loop detection"" --- node_modules/vfs-local/localfs.js | 35 +++++++++++++++++-------------- plugins/c9.fs/fs.cache.xml.js | 4 ++-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index f9376f77..1984e00d 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -350,7 +350,7 @@ module.exports = function setup(fsOptions) { // This helper function doesn't follow node conventions in the callback, // there is no err, only entry. - function createStatEntry(file, fullpath, callback) { + function createStatEntry(file, fullpath, callback, _loop) { fs.lstat(fullpath, function (err, stat) { var entry = { name: file @@ -378,26 +378,29 @@ module.exports = function setup(fsOptions) { return callback(entry); } fs.readlink(fullpath, function (err, link) { - if (entry.name == link) { - entry.linkStatErr = "ELOOP: recursive symlink"; - return callback(entry); - } - if (err) { entry.linkErr = err.stack; return callback(entry); } + var fullLinkPath = pathResolve(dirname(fullpath), link); + if (!_loop) { + _loop = {fullLinkPath: fullpath, max: 100}; + } + if (fullLinkPath.toLowerCase() == _loop.fullLinkPath.toLowerCase() || _loop.max --< 0) { + entry.linkErr = "ELOOP: recursive symlink"; + return callback(entry); + } entry.link = link; - resolvePath(pathResolve(dirname(fullpath), link), {alreadyRooted: true}, function (err, newpath) { - if (err) { - entry.linkStatErr = err; - return callback(entry); - } - createStatEntry(basename(newpath), newpath, function (linkStat) { - entry.linkStat = linkStat; - linkStat.fullPath = newpath.substr(base.length) || "/"; - return callback(entry); - }); + resolvePath(fullLinkPath, {alreadyRooted: true}, function (err, newpath) { + if (err) { + entry.linkErr = err; + return callback(entry); + } + createStatEntry(basename(newpath), newpath, function (linkStat) { + entry.linkStat = linkStat; + linkStat.fullPath = newpath.substr(base.length) || "/"; + return callback(entry); + }, _loop); }); }); } diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index dda745dd..c9ad1844 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -561,8 +561,8 @@ define(function(require, exports, module) { node.size = stat.size; if (stat.mtime != undefined) node.mtime = stat.mtime; - if (original_stat) - node.link = stat.fullPath; + if (original_stat || stat.linkErr) + node.link = stat.fullPath || stat.linkErr; node.isFolder = isFolder; } From ecd1d928def3a7cdf734483e79bc1308a9f016cd Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 2 Nov 2015 16:17:58 -0800 Subject: [PATCH 03/38] Add api support for salesforce --- configs/client-default.js | 2 ++ plugins/c9.ide.editors/tab.js | 7 +++++++ plugins/c9.ide.editors/undomanager.js | 6 ++++-- plugins/c9.ide.ui/forms.js | 29 ++++++++++++++++----------- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 746f4a6b..c586565f 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -721,6 +721,8 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", + "plugins/salesforce.sync/package.editor", + // git integration "plugins/c9.ide.scm/scm", "plugins/c9.ide.scm/scmpanel", diff --git a/plugins/c9.ide.editors/tab.js b/plugins/c9.ide.editors/tab.js index 11c18440..e841ebef 100644 --- a/plugins/c9.ide.editors/tab.js +++ b/plugins/c9.ide.editors/tab.js @@ -258,6 +258,8 @@ define(function(require, module, exports) { ); return; } + + var currentValue = plugin.document.value; editorType = type; amlTab.setAttribute("type", "editor::" + type); @@ -265,6 +267,11 @@ define(function(require, module, exports) { if (amlPane.getPage() == amlTab) { amlPane.activepage = -1; amlPane.set(amlTab); + + plugin.document.value = currentValue; + // TODO undo managers for different editors conflict + // however, resetting removes changed state + // plugin.document.undoManager.reset(); } callback(); diff --git a/plugins/c9.ide.editors/undomanager.js b/plugins/c9.ide.editors/undomanager.js index a275e5a5..2bfbe834 100644 --- a/plugins/c9.ide.editors/undomanager.js +++ b/plugins/c9.ide.editors/undomanager.js @@ -25,6 +25,7 @@ define(function(require, module, exports) { return false; var item = stack[position]; + if (!item) return; if (!item.undo) item = stack[position] = findItem(item); position--; @@ -43,6 +44,7 @@ define(function(require, module, exports) { position++; var item = stack[position]; + if (!item) return; if (!item.redo) item = stack[position] = findItem(item); item.redo(); @@ -119,7 +121,7 @@ define(function(require, module, exports) { stack: stack .filter(function(item){ return item; }) .map(function(item) { - return item.getState ? item.getState() : item; + return item && item.getState ? item.getState() : item; }) }; } @@ -141,7 +143,7 @@ define(function(require, module, exports) { return emit("itemFind", { state: compressedItem }); } - function reset(){ + function reset(keepChange){ if (position == -1) return; diff --git a/plugins/c9.ide.ui/forms.js b/plugins/c9.ide.ui/forms.js index 471a9e4a..0ab3e6f8 100644 --- a/plugins/c9.ide.ui/forms.js +++ b/plugins/c9.ide.ui/forms.js @@ -456,20 +456,25 @@ define(function(require, exports, module) { case "dropdown": var dropdown = el.lastChild; - var data = item.items.map(function(item) { - return ""; - }).join(""); - if (data) { - setTimeout(function(){ - dropdown.$model.load("" + data + ""); - + if (item.items) { + var data = item.items.map(function(item) { + return ""; + }).join(""); + if (data) { setTimeout(function(){ - var value = item.value || dropdown.value; - dropdown.value = -999; - dropdown.setAttribute("value", value); + dropdown.$model.load("" + data + ""); + + setTimeout(function(){ + var value = item.value || dropdown.value; + dropdown.value = -999; + dropdown.setAttribute("value", value); + }); }); - }); + } + } + else if (item.value) { + dropdown.setAttribute("value", item.value); } break; default: From 78f96f3333712cff066da1693282bde3c767055a Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 3 Nov 2015 01:28:38 +0000 Subject: [PATCH 04/38] cleanup --- configs/client-default.js | 2 -- plugins/c9.ide.editors/undomanager.js | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index c586565f..746f4a6b 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -721,8 +721,6 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", - "plugins/salesforce.sync/package.editor", - // git integration "plugins/c9.ide.scm/scm", "plugins/c9.ide.scm/scmpanel", diff --git a/plugins/c9.ide.editors/undomanager.js b/plugins/c9.ide.editors/undomanager.js index 2bfbe834..a275e5a5 100644 --- a/plugins/c9.ide.editors/undomanager.js +++ b/plugins/c9.ide.editors/undomanager.js @@ -25,7 +25,6 @@ define(function(require, module, exports) { return false; var item = stack[position]; - if (!item) return; if (!item.undo) item = stack[position] = findItem(item); position--; @@ -44,7 +43,6 @@ define(function(require, module, exports) { position++; var item = stack[position]; - if (!item) return; if (!item.redo) item = stack[position] = findItem(item); item.redo(); @@ -121,7 +119,7 @@ define(function(require, module, exports) { stack: stack .filter(function(item){ return item; }) .map(function(item) { - return item && item.getState ? item.getState() : item; + return item.getState ? item.getState() : item; }) }; } @@ -143,7 +141,7 @@ define(function(require, module, exports) { return emit("itemFind", { state: compressedItem }); } - function reset(keepChange){ + function reset(){ if (position == -1) return; From 671b8b12127a9c7f00ff576f01768e257427cde8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 13:12:48 +0100 Subject: [PATCH 05/38] c9-auto-bump 3.1.177 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ded882c..c11e2cd0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.176", + "version": "3.1.177", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7cdd6ca576b687047dda0526446a3272eff35a37 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 14:31:08 +0100 Subject: [PATCH 06/38] c9-auto-bump 3.1.178 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c11e2cd0..2f38b0c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.177", + "version": "3.1.178", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 49ff859f04c6e873d007b52c90111dbe1ced32e7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 15:16:00 +0100 Subject: [PATCH 07/38] c9-auto-bump 3.1.179 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f38b0c4..09a8b24e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.178", + "version": "3.1.179", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 139d6fcc38d1ad23ca16f1bb87c64b923ef4ea45 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 16:06:41 +0100 Subject: [PATCH 08/38] c9-auto-bump 3.1.180 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09a8b24e..f6531d37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.179", + "version": "3.1.180", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f5a35b07cb1c2ba9a454e9ec512f136108a65b18 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 16:15:44 +0100 Subject: [PATCH 09/38] c9-auto-bump 3.1.181 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f6531d37..15316a9c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.180", + "version": "3.1.181", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e70c4220239d3997f06677cc8861abf90d20696a Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 16:27:49 +0100 Subject: [PATCH 10/38] c9-auto-bump 3.1.182 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15316a9c..09ab43b9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.181", + "version": "3.1.182", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 80c71387e96ac26ada08a4de84e6ed2b35564fcd Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 17:12:00 +0100 Subject: [PATCH 11/38] c9-auto-bump 3.1.183 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09ab43b9..96f21f99 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.182", + "version": "3.1.183", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e856f0ac1aaddd90053282964d450c477406f734 Mon Sep 17 00:00:00 2001 From: matthijs Date: Tue, 3 Nov 2015 16:23:30 +0000 Subject: [PATCH 12/38] WIP deploy workflow-staging --- server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server.js b/server.js index 61d0c5ba..a67c528b 100755 --- a/server.js +++ b/server.js @@ -41,6 +41,7 @@ function getDefaultSettings() { var suffix = hostname.trim().split("-").pop() || ""; var modes = { + "workflowstaging": "workflow-staging", "prod": "deploy", "beta": "beta", "dev": "devel", From 01a9437492a33ad6694667d79c79d03c48e059d1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 17:36:51 +0100 Subject: [PATCH 13/38] c9-auto-bump 3.1.184 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96f21f99..8c507f58 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.183", + "version": "3.1.184", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 582e3f8e89578a13c9e2b1d22e91f38b040baf87 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 17:55:57 +0100 Subject: [PATCH 14/38] c9-auto-bump 3.1.185 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c507f58..c175c3d3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.184", + "version": "3.1.185", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 644f9f066a9523af299c6b3ff7f7d0524c8a4b70 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 18:23:42 +0100 Subject: [PATCH 15/38] c9-auto-bump 3.1.186 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c175c3d3..2dd7e10b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.185", + "version": "3.1.186", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 92f0adf4019dea2379874754a77b01236b71ea94 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 18:38:28 +0100 Subject: [PATCH 16/38] c9-auto-bump 3.1.187 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2dd7e10b..272f8854 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.186", + "version": "3.1.187", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 96426b0c56979e202604481c0538a939855f5ec3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 3 Nov 2015 18:38:51 +0100 Subject: [PATCH 17/38] c9-auto-bump 3.1.188 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 272f8854..9bbb2a52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.187", + "version": "3.1.188", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From caec661e728ad2112ba110f33ec2281cd644ffe1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 10:15:47 +0100 Subject: [PATCH 18/38] c9-auto-bump 3.1.189 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bbb2a52..a5881a8e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.188", + "version": "3.1.189", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1cfcb0cc4e8d64cd9c3290bb7173238514c86a0d Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 10:35:57 +0100 Subject: [PATCH 19/38] c9-auto-bump 3.1.190 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5881a8e..789620e8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.189", + "version": "3.1.190", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 81a3077b058c3550ef521fd5f84652d1133eca2c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 10:57:24 +0100 Subject: [PATCH 20/38] c9-auto-bump 3.1.191 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 789620e8..ee092f8f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.190", + "version": "3.1.191", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From af4d6369919d9ff89c6a9194fd1242e17a12b241 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 11:23:05 +0100 Subject: [PATCH 21/38] c9-auto-bump 3.1.192 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee092f8f..ff2853c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.191", + "version": "3.1.192", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c1a2b051263b1439bba092bac79ee477c5bb38f5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 11:51:14 +0100 Subject: [PATCH 22/38] c9-auto-bump 3.1.193 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff2853c1..d0e39018 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.192", + "version": "3.1.193", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 545d2d9859e2a746b925cf8f9361c475c1331688 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 11:55:26 +0100 Subject: [PATCH 23/38] c9-auto-bump 3.1.194 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0e39018..c89e57ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.193", + "version": "3.1.194", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 99dec31e5cfcb1b19d23e5216a95811dbf17090f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 12:13:44 +0100 Subject: [PATCH 24/38] c9-auto-bump 3.1.195 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c89e57ff..11cc09e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.194", + "version": "3.1.195", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 34f2c480fd855946512f0636b4ac7a9b261c9bd3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 12:48:59 +0100 Subject: [PATCH 25/38] c9-auto-bump 3.1.196 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 11cc09e7..3d52e3ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.195", + "version": "3.1.196", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6356fcd3593c05cbf940904e1aa9f6cc2de66d54 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 12:59:38 +0100 Subject: [PATCH 26/38] c9-auto-bump 3.1.197 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d52e3ea..3ee8f843 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.196", + "version": "3.1.197", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 14c0069d4972be8311a482ad9ee6aa580625bbbe Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 4 Nov 2015 12:10:17 +0000 Subject: [PATCH 27/38] remove unused code --- plugins/c9.ide.clipboard/html5.js | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/plugins/c9.ide.clipboard/html5.js b/plugins/c9.ide.clipboard/html5.js index 61b157b2..e57b1f38 100644 --- a/plugins/c9.ide.clipboard/html5.js +++ b/plugins/c9.ide.clipboard/html5.js @@ -23,39 +23,17 @@ define(function(require, exports, module) { function main(options, imports, register) { var Plugin = imports.Plugin; - var showError = imports["dialog.error"].show; /***** Initialization *****/ var plugin = new Plugin("Ajax.org", main.consumes); - var requested, nativeObject; + var nativeObject; var loaded = false; function load(){ if (loaded) return false; loaded = true; - - // Chrome Specific - if (window.chrome && window.chrome.permissions) { - var chrome = window.chrome; - var permissions = { - permissions: ["clipboardRead", "clipboardWrite"], - origins: [location.origin] - }; - - chrome.permissions.contains(permissions, function(allowed) { - if (!allowed) { - chrome.permissions.request(permissions, function(result) { - if (result) { - showError("The browser has granted copy " - + "and paste permissions. Restart the " - + "browser to enable these permissions"); - } - }); - } - }); - } } /***** Methods *****/ @@ -94,10 +72,7 @@ define(function(require, exports, module) { }; document.addEventListener("copy", setData, true); - // @todo test if this is sync - requested = true; var result = execCommand("copy"); - requested = false; document.removeEventListener("copy", setData, true); @@ -123,10 +98,7 @@ define(function(require, exports, module) { }; document.addEventListener("paste", getData, true); - // @todo test if this is sync - requested = true; var result = execCommand("paste"); - requested = false; document.removeEventListener("paste", getData, true); @@ -173,6 +145,7 @@ define(function(require, exports, module) { }); plugin.on("unload", function(){ loaded = false; + nativeObject = null; }); /***** Register and define API *****/ From e3a65449ff2cc40e609456881e7ca4c2a5d0060b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 13:59:58 +0100 Subject: [PATCH 28/38] c9-auto-bump 3.1.198 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ee8f843..9472f8cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.197", + "version": "3.1.198", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5b83a821964efa2ddba2fab43e107c5c3f91f239 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:01:10 +0100 Subject: [PATCH 29/38] c9-auto-bump 3.1.199 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9472f8cd..4bf9dd4e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.198", + "version": "3.1.199", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5c9f9cdb88131dfc07abc6246b6b7efb8f7627d2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:18:42 +0100 Subject: [PATCH 30/38] c9-auto-bump 3.1.200 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4bf9dd4e..e346d35e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.199", + "version": "3.1.200", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 47c182006e3ca9c4f37f2d2e548b364dc4552c09 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 4 Nov 2015 13:28:45 +0000 Subject: [PATCH 31/38] mock linked services for the SDK --- configs/client-default.js | 5 +- .../c9.ide.services/linked-services-mock.js | 59 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 plugins/c9.ide.services/linked-services-mock.js diff --git a/configs/client-default.js b/configs/client-default.js index 746f4a6b..943872fc 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -748,7 +748,10 @@ module.exports = function(options) { }); } if (!hosted) { - plugins.push("plugins/c9.ide.analytics/mock_analytics"); + plugins.push( + "plugins/c9.ide.analytics/mock_analytics", + "plugins/c9.ide.services/linked-services-mock" + ); } // Collab diff --git a/plugins/c9.ide.services/linked-services-mock.js b/plugins/c9.ide.services/linked-services-mock.js new file mode 100644 index 00000000..8d9f8082 --- /dev/null +++ b/plugins/c9.ide.services/linked-services-mock.js @@ -0,0 +1,59 @@ +define(function(require, exports, module) { + "use strict"; + + main.consumes = ["Plugin"]; + main.provides = ["linked-services"]; + return main; + + function main(options, imports, register) { + var Plugin = imports.Plugin; + var plugin = new Plugin("Ajax.org", main.consumes); + + function getServices(callback) { + setTimeout(function() { + callback(null, options.services || { + "github": { + "visible": true, + "hasRepositories": true, + "service": "github", + "title": "GitHub", + "accounts": [], + "maxAccounts": 1, + "maxProjects": 100 + }, + "mbed": { + "visible": false, + "hasRepositories": false, + "service": "mbed", + "title": "Mbed", + "accounts": [{ + "id": "mbed:154229", + "login": "fjakobs", + "metadata": {}, + "projects": [] + }], + "maxAccounts": 1, + "maxProjects": 100 + } + }); + }, 0); + } + + function getAccessToken(serviceId, callback) { + callback(new Error("Not Implemented")); + } + + /** + * Provides client-side Salesforce API access + * @singleton + **/ + plugin.freezePublicAPI({ + getServices: getServices, + getAccessToken: getAccessToken + }); + + register(null, { + "linked-services": plugin + }); + } +}); From 9cfc0100e43eb4debbbd35ece0a7b18b0f43b09e Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:30:50 +0100 Subject: [PATCH 32/38] c9-auto-bump 3.1.201 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e346d35e..cceac299 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.200", + "version": "3.1.201", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ce9400c6f26998c4d0f387dd64a2f7bd921f8bab Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:36:47 +0100 Subject: [PATCH 33/38] c9-auto-bump 3.1.202 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cceac299..a38f4d06 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.201", + "version": "3.1.202", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 23514c940c5d266f00900bd481fac18d06d9dd0a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:44:40 +0100 Subject: [PATCH 34/38] c9-auto-bump 3.1.203 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a38f4d06..ec258f7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.202", + "version": "3.1.203", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e4847d6360b91a8f573f5525eb8e6fba3bb20089 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 14:58:34 +0100 Subject: [PATCH 35/38] c9-auto-bump 3.1.204 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec258f7c..33011f19 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.203", + "version": "3.1.204", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1c165823f8749e177f0c7219a1adbe81b4ce52c6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 15:00:35 +0100 Subject: [PATCH 36/38] c9-auto-bump 3.1.205 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33011f19..351eaa0b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.204", + "version": "3.1.205", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b27e2beab0538f893c8ad74646497076677297b3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 15:11:30 +0100 Subject: [PATCH 37/38] c9-auto-bump 3.1.206 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 351eaa0b..98831ea8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.205", + "version": "3.1.206", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From aace9c2413aa8d21c38344ad422af66659b2dafd Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 4 Nov 2015 15:14:34 +0100 Subject: [PATCH 38/38] c9-auto-bump 3.1.207 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98831ea8..145d0b5a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.206", + "version": "3.1.207", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",