🐛 Fix modified state subscriptions not changed when the editor is cha…

…nged
abe33 · Nov 27, 2015 · 8b38aac · 8b38aac
1 parent bc3f7e7
commit 8b38aac
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/lib/csv-editor.coffee b/lib/csv-editor.coffee
@@ -194,12 +194,15 @@ class CSVEditor
 
           @getTableEditor(filePath, options, layout).then (tableEditor) =>
             CSVEditor.tableEditorForPath[filePath] = tableEditor
+            @editorSubscriptions.dispose()
             @editor = tableEditor
+            @subscribeToEditor()
             @emitter.emit 'did-change', this
             debounceChange()
           .catch (err) =>
             # The file content has changed for a format that cannot be parsed
             # We drop the editor and replace it with the csv form
+            @editorSubscriptions.dispose()
             @editor.destroy()
             delete @editor
             @emitter.emit 'did-change', this

diff --git a/spec/csv-editor-spec.coffee b/spec/csv-editor-spec.coffee
@@ -159,6 +159,30 @@ describe "CSVEditor", ->
                 ['1', '2']
               ])
 
+            describe 'making new changes', ->
+              [modifiedSpy] = []
+
+              beforeEach ->
+                nextAnimationFrame()
+
+                modifiedSpy = jasmine.createSpy('did-change-modified')
+
+                csvEditor.onDidChangeModified(modifiedSpy)
+
+              describe 'on the previous table', ->
+                beforeEach ->
+                  tableEditor.addRow ['Jack', 68, 'male']
+
+                it 'does not dispatch a did-change-modified event', ->
+                  expect(modifiedSpy).not.toHaveBeenCalled()
+
+              describe 'on the new table', ->
+                beforeEach ->
+                  csvEditor.editor.addRow ['Jack', 68, 'male']
+
+                it 'dispatches a did-change-modified event', ->
+                  expect(modifiedSpy).toHaveBeenCalled()
+
           describe 'when the table is in a modified state', ->
             [conflictSpy] = []
             beforeEach ->