Revert "Flush DOM before displaying context menu"

This commit is contained in:
Antonio Scandurra
2016-12-06 17:29:49 +01:00
committed by GitHub
parent 847ca8f71b
commit 8e6cef458c
2 changed files with 8 additions and 6 deletions

View File

@@ -4,7 +4,6 @@ fs = require 'fs-plus'
{calculateSpecificity, validateSelector} = require 'clear-cut'
{Disposable} = require 'event-kit'
{remote} = require 'electron'
ipcHelpers = require './ipc-helpers'
MenuHelpers = require './menu-helpers'
platformContextMenu = require('../package.json')?._atomMenu?['context-menu']
@@ -201,8 +200,7 @@ class ContextMenuManager
menuTemplate = @templateForEvent(event)
return unless menuTemplate?.length > 0
ipcHelpers.call('window-method', 'openContextMenu', menuTemplate)
remote.getCurrentWindow().emit('context-menu', menuTemplate)
return
clear: ->

View File

@@ -3,7 +3,6 @@ path = require 'path'
fs = require 'fs'
url = require 'url'
{EventEmitter} = require 'events'
ContextMenu = require './context-menu'
module.exports =
class AtomWindow
@@ -101,8 +100,11 @@ class AtomWindow
hasProjectPath: -> @getLoadSettings().initialPaths?.length > 0
openContextMenu: (menuTemplate) ->
new ContextMenu(menuTemplate, this)
setupContextMenu: ->
ContextMenu = require './context-menu'
@browserWindow.on 'context-menu', (menuTemplate) =>
new ContextMenu(menuTemplate, this)
containsPaths: (paths) ->
for pathToCheck in paths
@@ -164,6 +166,8 @@ class AtomWindow
unless url is @browserWindow.webContents.getURL()
event.preventDefault()
@setupContextMenu()
if @isSpec
# Spec window's web view should always have focus
@browserWindow.on 'blur', =>