diff --git a/package.json b/package.json index a1dbf08d0..06159c52f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.0", - "telepath": "0.19.0", + "telepath": "0.20.0", "temp": "0.5.0", "underscore-plus": "0.2.0" }, diff --git a/src/editor.coffee b/src/editor.coffee index a422d8a77..e657781dc 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -720,9 +720,9 @@ class Editor extends View selectedText = @getSelectedText() @hiddenInput.css('width', '100%') @hiddenInput.on 'compositionupdate', (e) => - @insertText(e.originalEvent.data, {select: true, skipUndo: true}) + @insertText(e.originalEvent.data, {select: true, undo: 'skip'}) @hiddenInput.on 'compositionend', => - @insertText(selectedText, {select: true, skipUndo: true}) + @insertText(selectedText, {select: true, undo: 'skip'}) @hiddenInput.css('width', '1px') lastInput = '' diff --git a/src/selection.coffee b/src/selection.coffee index 483f9d32f..f0103e164 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -1,5 +1,6 @@ {Range} = require 'telepath' {Emitter} = require 'emissary' +{pick} = require 'underscore' # Public: Represents a selection in the {EditSession}. module.exports = @@ -297,8 +298,8 @@ class Selection # + autoDecreaseIndent: # if `true`, decreases indent level appropriately (for example, when a # closing bracket is inserted) - # + skipUndo: - # if `true`, skips the undo stack for this operation. + # + undo: + # if `skip`, skips the undo stack for this operation. insertText: (text, options={}) -> oldBufferRange = @getBufferRange() @editSession.destroyFoldsContainingBufferRow(oldBufferRange.end.row) @@ -309,7 +310,7 @@ class Selection if options.indentBasis? and not options.autoIndent text = @normalizeIndents(text, options.indentBasis) - newBufferRange = @editSession.buffer.change(oldBufferRange, text, skipUndo: options.skipUndo) + newBufferRange = @editSession.buffer.change(oldBufferRange, text, pick(options, 'undo')) if options.select @setBufferRange(newBufferRange, isReversed: wasReversed) else