Merge branch 'master' into as-order-line-nodes

src/browser/main.coffee

@@ -13,6 +13,9 @@ start = ->
   setupCompileCache()
   return if handleStartupEventWithSquirrel()
 
+    # NB: This prevents Win10 from showing dupe items in the taskbar
+    app.setAppUserModelId('com.squirrel.atom.atom')
+
   args = parseCommandLine()
 
   addPathToOpen = (event, pathToOpen) ->

src/command-registry.coffee

@@ -175,12 +175,8 @@ class CommandRegistry
   # * `commandName` {String} indicating the name of the command to dispatch.
   dispatch: (target, commandName, detail) ->
     event = new CustomEvent(commandName, {bubbles: true, detail})
-    eventWithTarget = Object.create event,
-      target: value: target
-      preventDefault: value: ->
-      stopPropagation: value: ->
-      stopImmediatePropagation: value: ->
-    @handleCommandEvent(eventWithTarget)
+    Object.defineProperty(event, 'target', value: target)
+    @handleCommandEvent(event)
 
   # Public: Invoke the given callback before dispatching a command event.
   #
@@ -208,34 +204,36 @@ class CommandRegistry
       @selectorBasedListenersByCommandName[commandName] = listeners.slice()
     return
 
-  handleCommandEvent: (originalEvent) =>
+  handleCommandEvent: (event) =>
     propagationStopped = false
     immediatePropagationStopped = false
     matched = false
-    currentTarget = originalEvent.target
+    currentTarget = event.target
+    {preventDefault, stopPropagation, stopImmediatePropagation, abortKeyBinding} = event
 
-    syntheticEvent = Object.create originalEvent,
-      eventPhase: value: Event.BUBBLING_PHASE
-      currentTarget: get: -> currentTarget
-      preventDefault: value: ->
-        originalEvent.preventDefault()
-      stopPropagation: value: ->
-        originalEvent.stopPropagation()
-        propagationStopped = true
-      stopImmediatePropagation: value: ->
-        originalEvent.stopImmediatePropagation()
-        propagationStopped = true
-        immediatePropagationStopped = true
-      abortKeyBinding: value: ->
-        originalEvent.abortKeyBinding?()
+    dispatchedEvent = new CustomEvent(event.type, {bubbles: true, detail: event.detail})
+    Object.defineProperty dispatchedEvent, 'eventPhase', value: Event.BUBBLING_PHASE
+    Object.defineProperty dispatchedEvent, 'currentTarget', get: -> currentTarget
+    Object.defineProperty dispatchedEvent, 'target', value: currentTarget
+    Object.defineProperty dispatchedEvent, 'preventDefault', value: ->
+      event.preventDefault()
+    Object.defineProperty dispatchedEvent, 'stopPropagation', value: ->
+      event.stopPropagation()
+      propagationStopped = true
+    Object.defineProperty dispatchedEvent, 'stopImmediatePropagation', value: ->
+      event.stopImmediatePropagation()
+      propagationStopped = true
+      immediatePropagationStopped = true
+    Object.defineProperty dispatchedEvent, 'abortKeyBinding', value: ->
+      event.abortKeyBinding?()
 
-    @emitter.emit 'will-dispatch', syntheticEvent
+    @emitter.emit 'will-dispatch', dispatchedEvent
 
     loop
-      listeners = @inlineListenersByCommandName[originalEvent.type]?.get(currentTarget) ? []
+      listeners = @inlineListenersByCommandName[event.type]?.get(currentTarget) ? []
       if currentTarget.webkitMatchesSelector?
         selectorBasedListeners =
-          (@selectorBasedListenersByCommandName[originalEvent.type] ? [])
+          (@selectorBasedListenersByCommandName[event.type] ? [])
             .filter (listener) -> currentTarget.webkitMatchesSelector(listener.selector)
             .sort (a, b) -> a.compare(b)
         listeners = listeners.concat(selectorBasedListeners)
@@ -244,13 +242,13 @@ class CommandRegistry
 
       for listener in listeners
         break if immediatePropagationStopped
-        listener.callback.call(currentTarget, syntheticEvent)
+        listener.callback.call(currentTarget, dispatchedEvent)
 
       break if currentTarget is window
       break if propagationStopped
       currentTarget = currentTarget.parentNode ? window
 
-    @emitter.emit 'did-dispatch', syntheticEvent
+    @emitter.emit 'did-dispatch', dispatchedEvent
 
     matched