From b34d25f82df56401dd393173a49e188ed91eba8c Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 12 Apr 2012 15:59:45 +0200 Subject: [PATCH] small cleanups --- lib/ace/commands/command_manager.js | 2 +- lib/ace/commands/multi_select_commands.js | 4 ++-- lib/ace/multi_select.js | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/ace/commands/command_manager.js b/lib/ace/commands/command_manager.js index 428562d7..380611eb 100644 --- a/lib/ace/commands/command_manager.js +++ b/lib/ace/commands/command_manager.js @@ -13,7 +13,7 @@ var CommandManager = function(platform, commands) { this.addCommands(commands); this.setDefaultHandler("exec", function(e) { - e.command.exec(e.editor, e.args || {}) + e.command.exec(e.editor, e.args || {}); }); }; diff --git a/lib/ace/commands/multi_select_commands.js b/lib/ace/commands/multi_select_commands.js index f120069a..7ca053c6 100644 --- a/lib/ace/commands/multi_select_commands.js +++ b/lib/ace/commands/multi_select_commands.js @@ -56,7 +56,7 @@ require("./default_commands").commands.forEach(function(command) { else if (mapOver.test(command.name)) command.multiSelectAction = "forEach"; else if (command.name == "transposeletters") - command.multiSelectAction = function(editor) {editor.transposeSelections(1); } + command.multiSelectAction = function(editor) {editor.transposeSelections(1); }; }); // commands to enter multiselect mode @@ -105,7 +105,7 @@ exports.defaultCommands = [{ exec: function(editor) { editor.multiSelect.splitIntoLines(); }, bindKey: {win: "Ctrl-Shift-L", mac: "Ctrl-Shift-L"}, readonly: true -}, ]; +}]; // commands active in multiselect mode exports.multiEditCommands = [{ diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js index b82524a6..634310bc 100644 --- a/lib/ace/multi_select.js +++ b/lib/ace/multi_select.js @@ -266,7 +266,7 @@ var EditSession = require("./edit_session").EditSession; // extend Editor var Editor = require("./editor").Editor; ;(function() { - this.updateSelectionMarkers = function(orientedRange) { + this.updateSelectionMarkers = function() { this.renderer.updateCursor(); this.renderer.updateBackMarkers(); }; @@ -353,9 +353,10 @@ var Editor = require("./editor").Editor; this.forEachSelection = function(cmd, args) { if (this.inVirtualSelectionMode) return; - var session = this.session - var selection = this.selection - var rangeList = selection.rangeList + + var session = this.session; + var selection = this.selection; + var rangeList = selection.rangeList; var reg = selection._eventRegistry; selection._eventRegistry = {}; @@ -390,9 +391,11 @@ var Editor = require("./editor").Editor; var text = ""; if (this.inMultiSelectMode) { var ranges = this.multiSelect.rangeList.ranges; + text = []; for (var i = 0; i < ranges.length; i++) { - text += this.session.getTextRange(ranges[i]); + text.push(this.session.getTextRange(ranges[i])); } + text = text.join(this.session.getDocument().getNewLineCharacter()); } else if (!this.selection.isEmpty()) { text = this.session.getTextRange(this.getSelectionRange()); } @@ -414,8 +417,8 @@ var Editor = require("./editor").Editor; }, readonly: true, multiSelectAction: "forEach" - } - this.commands.exec(cmd, this) + }; + this.commands.exec(cmd, this); }; // commands @@ -500,13 +503,12 @@ var Editor = require("./editor").Editor; var range = sel.toOrientedRange(); if (range.isEmpty()) { - var range = session.getWordRange(range.start.row, range.start.column) + var range = session.getWordRange(range.start.row, range.start.column); range.cursor = range.end; this.multiSelect.addRange(range); } var needle = session.getTextRange(range); - var newRange = find(session, needle, dir); if (newRange) { newRange.cursor = dir == -1 ? newRange.start : newRange.end; @@ -558,7 +560,7 @@ exports.onSessionChange = function(e) { else this.$onSingleSelect(); } -} +}; // adds multicursor support to editor instance function MultiSelect(editor) {