github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 23:38:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12824 from atom/mb-as-fix-window-method-calls-in-specs

Browse Source 
Fix uses of `call-window-method` IPC channel in specs
This commit is contained in:
Max Brunsfeld
2016-09-29 13:15:11 -07:00
committed by GitHub
parent 1b6cc82e97 51a2360a9b
commit 814817ae4f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/atom-reporter.coffee
View File

@@ -3,6 +3,7 @@ _ = require 'underscore-plus'
grim = require 'grim'
marked = require 'marked'
listen = require '../src/delegated-listener'
ipcHelpers = require '../src/ipc-helpers'
formatStackTrace = (spec, message='', stackTrace) ->
return stackTrace unless stackTrace
@@ -173,7 +174,7 @@ class AtomReporter
listen document, 'click', '.stack-trace', (event) ->
event.currentTarget.classList.toggle('expanded')
@reloadButton.addEventListener('click', -> require('electron').ipcRenderer.send('call-window-method', 'reload'))
@reloadButton.addEventListener('click', -> ipcHelpers.call('window-method', 'reload'))
updateSpecCounts: ->
if @skippedCount

10
src/initialize-test-window.coffee
View File

@@ -1,3 +1,5 @@
ipcHelpers = require './ipc-helpers'
cloneObject = (object) ->
clone = {}
clone[key] = value for key, value of object
@@ -31,19 +33,19 @@ module.exports = ({blobStore}) ->
handleKeydown = (event) ->
# Reload: cmd-r / ctrl-r
if (event.metaKey or event.ctrlKey) and event.keyCode is 82
ipcRenderer.send('call-window-method', 'reload')
ipcHelpers.call('window-method', 'reload')
# Toggle Dev Tools: cmd-alt-i / ctrl-alt-i
if (event.metaKey or event.ctrlKey) and event.altKey and event.keyCode is 73
ipcRenderer.send('call-window-method', 'toggleDevTools')
ipcHelpers.call('window-method', 'toggleDevTools')
# Close: cmd-w / ctrl-w
if (event.metaKey or event.ctrlKey) and event.keyCode is 87
ipcRenderer.send('call-window-method', 'close')
ipcHelpers.call('window-method', 'close')
# Copy: cmd-c / ctrl-c
if (event.metaKey or event.ctrlKey) and event.keyCode is 67
ipcRenderer.send('call-window-method', 'copy')
ipcHelpers.call('window-method', 'copy')
window.addEventListener('keydown', handleKeydown, true)