From 4a26e1848715cd3c90958e37874f078dcfe96253 Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Tue, 23 Aug 2016 13:32:17 -0700
Subject: [PATCH 1/3] Move exports.WinShell to property to avoid unepected
 process type used in electron_run_as_node

---
 exports/atom.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/exports/atom.js b/exports/atom.js
index 50c8c687f..7bb7cdb1e 100644
--- a/exports/atom.js
+++ b/exports/atom.js
@@ -27,7 +27,12 @@ const atomExport = {
 
 // Shell integration is required by both Squirrel and Settings-View
 if (process.platform === 'win32') {
-  atomExport.WinShell = require('../src/main-process/win-shell')
+  Object.defineProperty(atomExport, 'WinShell', {
+    enumerable: true,
+    get () {
+      return require('../src/main-process/win-shell')
+    }
+  })
 }
 
 // The following classes can't be used from a Task handler and should therefore

From b6a72b058d350920fcdf4281bda00dc49fc2adfc Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Tue, 23 Aug 2016 13:32:42 -0700
Subject: [PATCH 2/3] Set the app name in Windows file handler to handle beta

---
 src/main-process/win-shell.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main-process/win-shell.coffee b/src/main-process/win-shell.coffee
index 2bb993e9c..2abf9b5c5 100644
--- a/src/main-process/win-shell.coffee
+++ b/src/main-process/win-shell.coffee
@@ -40,7 +40,10 @@ class ShellOption
 exports.appName = appName
 
 exports.fileHandler = new ShellOption("\\Software\\Classes\\Applications\\#{exeName}",
-  [{key: 'shell\\open\\command', name: '', value: "#{appPath} \"%1\""}]
+  [
+    {key: 'shell\\open', name: 'FriendlyAppName', value: "#{appName}"},
+    {key: 'shell\\open\\command', name: '', value: "#{appPath} \"%1\""}
+  ]
 )
 
 contextParts = [

From 922f44ff11767547c8e3d0a4abf965492d57f91d Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Wed, 24 Aug 2016 18:08:25 -0700
Subject: [PATCH 3/3] Color serialization fixes atom/settings-view#832

---
 src/color.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/color.js b/src/color.js
index 9db9e9b16..6208d6837 100644
--- a/src/color.js
+++ b/src/color.js
@@ -85,6 +85,10 @@ export default class Color {
     return `rgba(${this.red}, ${this.green}, ${this.blue}, ${this.alpha})`
   }
 
+  toJSON () {
+    return this.alpha === 1 ? this.toHexString() : this.toRGBAString()
+  }
+
   isEqual (color) {
     if (this === color) {
       return true