diff --git a/package.json b/package.json index 87a10ea48..a348a1bf2 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.21.0", + "telepath": "0.23.0", "temp": "0.5.0", "underscore-plus": "0.2.0" }, diff --git a/src/root-view.coffee b/src/root-view.coffee index b482ef6b7..4d2ad289a 100644 --- a/src/root-view.coffee +++ b/src/root-view.coffee @@ -179,15 +179,18 @@ class RootView extends View editSession = activePane.itemForUri(project.relativize(filePath)) if activePane and filePath promise = project.open(filePath, {initialLine}) if not editSession - Q(editSession ? promise).then (editSession) => - if not activePane - activePane = new Pane(editSession) - @panes.setRoot(activePane) + Q(editSession ? promise) + .then (editSession) => + if not activePane + activePane = new Pane(editSession) + @panes.setRoot(activePane) - activePane.showItem(editSession) - activePane.focus() if changeFocus - @trigger "uri-opened" - editSession + activePane.showItem(editSession) + activePane.focus() if changeFocus + @trigger "uri-opened" + editSession + .catch (error) -> + console.error(error.stack ? error) # Private: Only used in specs openSync: (uri, {changeFocus, initialLine, pane, split}={}) -> diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee index f08d4f489..da5d9acf1 100644 --- a/src/text-buffer.coffee +++ b/src/text-buffer.coffee @@ -50,7 +50,7 @@ class TextBuffer @useSerializedText = @state.get('isModified') != false else {@project, filePath} = optionsOrState - @text = new telepath.MutableString(initialText ? '') + @text = new telepath.String(initialText ? '', replicated: false) @id = guid.create().toString() @state = site.createDocument id: @id