From 6dd0764e91e73cb613231ef9a3d105ffd3251bfc Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Thu, 25 Jun 2015 10:47:30 +0000 Subject: [PATCH 1/5] Make sure generated tokens are never valid JavaScript --- node_modules/c9/uid.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/node_modules/c9/uid.js b/node_modules/c9/uid.js index 51573ede..55eac7f2 100644 --- a/node_modules/c9/uid.js +++ b/node_modules/c9/uid.js @@ -8,5 +8,8 @@ module.exports = function(length) { .toString("base64") .replace(/[^a-zA-Z0-9]/g, ""); } - return uid.slice(0, length); + // HACK: make sure unique id is never syntactically valid JavaScript + // See http://balpha.de/2013/02/plain-text-considered-harmful-a-cross-domain-exploit/ + uid = "9c" +uid.slice(0, length - 2); + return uid; }; \ No newline at end of file From 058508d97a127e8cb87f8c487d08e53ce08b9917 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 25 Jun 2015 14:13:53 +0400 Subject: [PATCH 2/5] change \r\n to \n when pasting in terminal --- plugins/c9.ide.terminal/aceterm/input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index d9bdc17a..07060d55 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -206,7 +206,7 @@ define(function(require, exports, module) { }]); ace.onPaste = function(text) { - this.send(text); + this.send(text.replace(/\r\n/g, "\n")); }; ace.setKeyboardHandler(this); From 02fcbfe6b5ec06696cd679839280e7a6f7043556 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 25 Jun 2015 14:33:08 +0400 Subject: [PATCH 3/5] expose useWrapMode global setting in the ui --- plugins/c9.ide.ace/ace.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js index 886fc835..a689326d 100644 --- a/plugins/c9.ide.ace/ace.js +++ b/plugins/c9.ide.ace/ace.js @@ -891,7 +891,11 @@ define(function(require, exports, module) { { caption : "Timed", value : "true" } ], position: 14000 - } + }, + "Enable Wrapping For New Documents" : { + type: "checkbox", + path: "user/ace/@useWrapMode" + }, } } }, handle); From 0f83dcd570de3a40193db7cd89863298b268b6e9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 25 Jun 2015 19:13:19 +0400 Subject: [PATCH 4/5] allow enabling emmet from a mode --- node_modules/ace/lib/ace/ext/emmet.js | 15 ++++++++++----- package.json | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/node_modules/ace/lib/ace/ext/emmet.js b/node_modules/ace/lib/ace/ext/emmet.js index 4faacef2..3c5d6344 100644 --- a/node_modules/ace/lib/ace/ext/emmet.js +++ b/node_modules/ace/lib/ace/ext/emmet.js @@ -212,7 +212,7 @@ AceEmmetEditor.prototype = { * @return {String} */ getProfileName: function() { - switch(this.getSyntax()) { + switch (this.getSyntax()) { case "css": return "css"; case "xml": case "xsl": @@ -223,8 +223,10 @@ AceEmmetEditor.prototype = { if (!profile) profile = this.ace.session.getLines(0,2).join("").search(/]+XHTML/i) != -1 ? "xhtml": "html"; return profile; + default: + var mode = this.ace.session.$mode; + return mode.emmetConfig && mode.emmetConfig.profile || "xhtml"; } - return "xhtml"; }, /** @@ -392,15 +394,18 @@ exports.updateCommands = function(editor, enabled) { } }; -exports.isSupportedMode = function(modeId) { - return modeId && /css|less|scss|sass|stylus|html|php|twig|ejs|handlebars/.test(modeId); +exports.isSupportedMode = function(mode) { + if (!mode) return false; + if (mode.emmetConfig) return true; + var id = mode.$id || mode; + return /css|less|scss|sass|stylus|html|php|twig|ejs|handlebars/.test(id); }; var onChangeMode = function(e, target) { var editor = target; if (!editor) return; - var enabled = exports.isSupportedMode(editor.session.$modeId); + var enabled = exports.isSupportedMode(editor.session.$mode); if (e.enableEmmet === false) enabled = false; if (enabled) { diff --git a/package.json b/package.json index 11ebbfd0..95354021 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "c9.ide.find.replace": "#e4daf722b8", "c9.ide.run.debug": "#23a188b91a", "c9.automate": "#47e2c429c9", - "c9.ide.ace.emmet": "#e5f1a92ac3", + "c9.ide.ace.emmet": "#0ab4c6cd68", "c9.ide.ace.gotoline": "#4d1a93172c", "c9.ide.ace.keymaps": "#43445d6306", "c9.ide.ace.repl": "#f3a62c1f2a", From 4d3a4957181f7c8132e752e6cc08f37be17c6505 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 25 Jun 2015 19:15:22 +0400 Subject: [PATCH 5/5] restore value of last search in commands panel after reload --- plugins/c9.ide.keys/panel.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.keys/panel.js b/plugins/c9.ide.keys/panel.js index 4fe0a554..b854d964 100644 --- a/plugins/c9.ide.keys/panel.js +++ b/plugins/c9.ide.keys/panel.js @@ -1,6 +1,7 @@ define(function(require, exports, module) { main.consumes = [ - "Panel", "ui", "menus", "panels", "commands", "tabManager", "layout" + "Panel", "ui", "menus", "panels", "commands", "tabManager", "layout", + "settings" ]; main.provides = ["commands.panel"]; return main; @@ -13,6 +14,7 @@ define(function(require, exports, module) { var panels = imports.panels; var layout = imports.layout; var commands = imports.commands; + var settings = imports.settings; var markup = require("text!./panel.xml"); var search = require('../c9.ide.navigate/search'); @@ -130,6 +132,7 @@ define(function(require, exports, module) { txtFilter.ace.on("input", function(e) { var val = txtFilter.getValue(); filter(val); + settings.set("state/commandPanel/@value", val); }); function onblur(e) { @@ -154,8 +157,10 @@ define(function(require, exports, module) { setTimeout(function(){ // Assign the dataprovider tree.setDataProvider(ldSearch); - tree.selection.$wrapAround = true; + var val = settings.get("state/commandPanel/@value"); + if (val) + txtFilter.ace.setValue(val); }, 200); }