diff --git a/package.json b/package.json index 29b5d1be6..8b39a3491 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "metrics": "0.12.0", "package-generator": "0.20.0", "release-notes": "0.12.0", - "settings-view": "0.44.0", + "settings-view": "0.45.0", "snippets": "0.15.0", "spell-check": "0.14.0", "status-bar": "0.19.0", diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee index 0bb622bf3..1d4a8e959 100644 --- a/spec/atom-spec.coffee +++ b/spec/atom-spec.coffee @@ -14,7 +14,7 @@ describe "the `atom` global", -> pack = atom.packages.loadPackage('package-with-activation-events') spyOn(pack, 'activateStylesheets').andCallThrough() expect(pack.mainModule).toBeNull() - object = deserialize({deserializer: 'Foo', data: 5}) + object = atom.deserializers.deserialize({deserializer: 'Foo', data: 5}) expect(pack.mainModule).toBeDefined() expect(object.constructor.name).toBe 'Foo' expect(object.data).toBe 5 diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee index ca2e1cb1d..a38659fc1 100644 --- a/spec/display-buffer-spec.coffee +++ b/spec/display-buffer-spec.coffee @@ -20,7 +20,7 @@ describe "DisplayBuffer", -> displayBuffer.setTabLength(4) displayBuffer.setEditorWidthInChars(64) displayBuffer.createFold(2, 4) - displayBuffer2 = deserialize(displayBuffer.serialize()) + displayBuffer2 = atom.deserializers.deserialize(displayBuffer.serialize()) expect(displayBuffer2.id).toBe displayBuffer.id expect(displayBuffer2.buffer).toBe displayBuffer.buffer expect(displayBuffer2.tokenizedBuffer.buffer).toBe displayBuffer.tokenizedBuffer.buffer diff --git a/spec/editor-spec.coffee b/spec/editor-spec.coffee index 2dfbe96a2..93d2b79a2 100644 --- a/spec/editor-spec.coffee +++ b/spec/editor-spec.coffee @@ -28,7 +28,7 @@ describe "Editor", -> editor.foldBufferRow(4) expect(editor.isFoldedAtBufferRow(4)).toBeTruthy() - editor2 = deserialize(editor.serialize()) + editor2 = atom.deserializers.deserialize(editor.serialize()) expect(editor2.id).toBe editor.id expect(editor2.getBuffer().getPath()).toBe editor.getBuffer().getPath() diff --git a/spec/pane-container-spec.coffee b/spec/pane-container-spec.coffee index d1f14541e..52a1dde0d 100644 --- a/spec/pane-container-spec.coffee +++ b/spec/pane-container-spec.coffee @@ -9,7 +9,7 @@ describe "PaneContainer", -> beforeEach -> class TestView extends View - registerDeserializer(this) + atom.deserializers.add(this) @deserialize: ({name}) -> new TestView(name) @content: -> @div tabindex: -1 initialize: (@name) -> @text(@name) @@ -25,7 +25,7 @@ describe "PaneContainer", -> pane3 = pane2.splitDown(new TestView('3')) afterEach -> - unregisterDeserializer(TestView) + atom.deserializers.remove(TestView) describe ".focusNextPane()", -> it "focuses the pane following the focused pane or the first pane if no pane has focus", -> diff --git a/spec/pane-spec.coffee b/spec/pane-spec.coffee index 29d40105d..7e86912ee 100644 --- a/spec/pane-spec.coffee +++ b/spec/pane-spec.coffee @@ -16,7 +16,7 @@ describe "Pane", -> isEqual: (other) -> @id == other.id and @text == other.text beforeEach -> - registerDeserializer(TestView) + atom.deserializers.add(TestView) container = new PaneContainer view1 = new TestView(id: 'view-1', text: 'View 1') view2 = new TestView(id: 'view-2', text: 'View 2') @@ -26,7 +26,7 @@ describe "Pane", -> container.setRoot(pane) afterEach -> - unregisterDeserializer(TestView) + atom.deserializers.remove(TestView) describe ".initialize(items...)", -> it "displays the first item in the pane", -> @@ -678,12 +678,12 @@ describe "Pane", -> describe "serialization", -> it "can serialize and deserialize the pane and all its items", -> - newPane = deserialize(pane.serialize()) + newPane = atom.deserializers.deserialize(pane.serialize()) expect(newPane.getItems()).toEqual [view1, editor1, view2, editor2] it "restores the active item on deserialization", -> pane.showItem(editor2) - newPane = deserialize(pane.serialize()) + newPane = atom.deserializers.deserialize(pane.serialize()) expect(newPane.activeItem).toEqual editor2 it "does not show items that cannot be deserialized", -> @@ -693,7 +693,7 @@ describe "Pane", -> paneState = pane.serialize() paneState.get('items').set(pane.items.indexOf(view2), {deserializer: 'Bogus'}) # nuke serialized state of active item - newPane = deserialize(paneState) + newPane = atom.deserializers.deserialize(paneState) expect(newPane.activeItem).toEqual pane.items[0] expect(newPane.items.length).toBe pane.items.length - 1 @@ -704,7 +704,7 @@ describe "Pane", -> container.remove() project.destroy() window.project = projectReplica - container = deserialize(containerState) + container = atom.deserializers.deserialize(containerState) pane = container.getRoot() container.attachToDom() diff --git a/spec/root-view-spec.coffee b/spec/root-view-spec.coffee index 0782c25d7..1c3b773f3 100644 --- a/spec/root-view-spec.coffee +++ b/spec/root-view-spec.coffee @@ -25,7 +25,7 @@ describe "RootView", -> rootView.remove() project.destroy() window.project = project2 - window.rootView = deserialize(rootViewState) + window.rootView = atom.deserializers.deserialize(rootViewState) rootView.attachToDom() describe "when the serialized RootView has an unsaved buffer", -> diff --git a/spec/syntax-spec.coffee b/spec/syntax-spec.coffee index 2579804fb..9e4795d6d 100644 --- a/spec/syntax-spec.coffee +++ b/spec/syntax-spec.coffee @@ -15,7 +15,7 @@ describe "the `syntax` global", -> filePath = '/foo/bar/file.js' expect(atom.syntax.selectGrammar(filePath).name).not.toBe 'Ruby' atom.syntax.setGrammarOverrideForPath(filePath, 'source.ruby') - syntax2 = deserialize(atom.syntax.serialize()) + syntax2 = atom.deserializers.deserialize(atom.syntax.serialize()) syntax2.addGrammar(grammar) for grammar in atom.syntax.grammars when grammar isnt atom.syntax.nullGrammar expect(syntax2.selectGrammar(filePath).name).toBe 'Ruby' diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee index 12a341edc..6184b3966 100644 --- a/spec/tokenized-buffer-spec.coffee +++ b/spec/tokenized-buffer-spec.coffee @@ -22,7 +22,7 @@ describe "TokenizedBuffer", -> it "constructs a tokenized buffer with the same buffer and tabLength setting", -> buffer = project.bufferForPathSync('sample.js') tokenizedBuffer1 = new TokenizedBuffer(buffer: buffer, tabLength: 4) - tokenizedBuffer2 = deserialize(tokenizedBuffer1.serialize()) + tokenizedBuffer2 = atom.deserializers.deserialize(tokenizedBuffer1.serialize()) expect(tokenizedBuffer2.buffer).toBe tokenizedBuffer1.buffer expect(tokenizedBuffer2.getTabLength()).toBe tokenizedBuffer1.getTabLength() diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee index 780b9cfbf..d8a44578a 100644 --- a/src/display-buffer.coffee +++ b/src/display-buffer.coffee @@ -18,7 +18,7 @@ class DisplayBuffer _.extend @prototype, ConfigObserver @acceptsDocuments: true - registerDeserializer(this) + atom.deserializers.add(this) @version: 2 @deserialize: (state) -> new this(state) diff --git a/src/editor.coffee b/src/editor.coffee index f000ea225..e91adeed1 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -42,7 +42,7 @@ class Editor @acceptsDocuments: true - registerDeserializer(this) + atom.deserializers.add(this) @version: 5 diff --git a/src/pane-container.coffee b/src/pane-container.coffee index 9c90dc3d1..02da6691e 100644 --- a/src/pane-container.coffee +++ b/src/pane-container.coffee @@ -5,7 +5,7 @@ telepath = require 'telepath' # Private: Manages the list of panes within a {RootView} module.exports = class PaneContainer extends View - registerDeserializer(this) + atom.deserializers.add(this) ### Internal ### @acceptsDocuments: true diff --git a/src/syntax.coffee b/src/syntax.coffee index 29131f248..12a5ab6e9 100644 --- a/src/syntax.coffee +++ b/src/syntax.coffee @@ -11,7 +11,7 @@ module.exports = class Syntax Emitter.includeInto(this) - registerDeserializer(this) + atom.deserializers.add(this) @deserialize: ({grammarOverridesByPath}) -> syntax = new Syntax() diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index af5c95409..ab08ad6c2 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -21,7 +21,7 @@ class TokenizedBuffer visible: false @acceptsDocuments: true - registerDeserializer(this) + atom.deserializers.add(this) @deserialize: (state) -> new this(state) diff --git a/src/window.coffee b/src/window.coffee index f3d0d7c0f..9e269211b 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -93,16 +93,6 @@ window.deserializeEditorWindow = -> window.onerror = -> atom.openDevTools() -#TODO remove once all packages use the atom global -window.registerDeserializer = (args...) -> - atom.deserializers.add(args...) -window.unregisterDeserializer = (args...) -> - atom.deserializers.remove(args...) -window.deserialize = (args...) -> - atom.deserializers.deserialize(args...) -window.requireWithGlobals = (args...) -> - atom.requireWithGlobals(args...) - # Public: Measure how long a function takes to run. # # * description: