From 69a0acd5547ddf160396a9f8af79fa1ccfb7f232 Mon Sep 17 00:00:00 2001 From: abe33 Date: Mon, 16 Nov 2015 10:06:35 +0100 Subject: [PATCH 1/4] :bug: Fix typo in project deserializer method Addresses #9598 --- src/project.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project.coffee b/src/project.coffee index 935e3a213..bb9c8be80 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -55,7 +55,7 @@ class Project extends Model ### deserialize: (state, deserializerManager) -> - states.paths = [state.path] if state.path? # backward compatibility + state.paths = [state.path] if state.path? # backward compatibility @buffers = _.compact state.buffers.map (bufferState) -> # Check that buffer's file path is accessible From fb5b1ba7f394e7c970d04d29af551d81c2fd277b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 19 Nov 2015 07:13:37 -0800 Subject: [PATCH 2/4] 1.2.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f0914b69..cd970440d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.2.2", + "version": "1.2.3", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 57503e4294b0826e994f54392697e9a2207dc722 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 19 Nov 2015 11:09:37 -0800 Subject: [PATCH 3/4] Prepare 1.3.0-beta5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92da702e3..1f6686295 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.3.0-beta4", + "version": "1.3.0-beta5", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From 23102198ced59593cab282f5a1dd45850692b9bf Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 18 Nov 2015 20:58:19 -0800 Subject: [PATCH 4/4] =?UTF-8?q?Don=E2=80=99t=20change=20key=20name=20in=20?= =?UTF-8?q?serialized=20application=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We changed it internally for clarity, but this is breaking compatibility with restoring state when upgrading from previous versions. Fixes #9690 --- src/browser/atom-application.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index f825899e3..7f182b584 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -441,7 +441,7 @@ class AtomApplication states = [] for window in @windows if not window.isSpec and window.projectDirectoryPaths? - states.push(projectDirectoryPaths: window.projectDirectoryPaths) + states.push(initialPaths: window.projectDirectoryPaths) if states.length > 0 or allowEmpty @storageFolder.store('application.json', states) @@ -449,7 +449,7 @@ class AtomApplication if (states = @storageFolder.load('application.json'))?.length > 0 for state in states @openWithOptions(_.extend(options, { - pathsToOpen: state.projectDirectoryPaths + pathsToOpen: state.initialPaths urlsToOpen: [] devMode: @devMode safeMode: @safeMode