From fec1507ff48f984ef978afb5d09eaf8d17f612ae Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 18 Nov 2015 21:10:40 -0500 Subject: [PATCH] Require ipc-renderer where it belongs --- spec/jasmine-test-runner.coffee | 2 +- spec/text-editor-component-spec.js | 2 +- spec/window-event-handler-spec.coffee | 2 +- spec/workspace-element-spec.coffee | 2 +- src/application-delegate.coffee | 2 +- src/atom-environment.coffee | 2 +- src/browser/atom-portable.coffee | 2 +- src/initialize-test-window.coffee | 2 +- src/menu-manager.coffee | 2 +- src/register-default-commands.coffee | 2 +- src/text-editor-component.coffee | 2 +- src/workspace-element.coffee | 2 +- static/index.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/jasmine-test-runner.coffee b/spec/jasmine-test-runner.coffee index 64191c1f4..8192d4328 100644 --- a/spec/jasmine-test-runner.coffee +++ b/spec/jasmine-test-runner.coffee @@ -2,7 +2,7 @@ fs = require 'fs' _ = require 'underscore-plus' fs = require 'fs-plus' path = require 'path' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' module.exports = ({logFile, headless, testPaths, buildAtomEnvironment}) -> window[key] = value for key, value of require '../vendor/jasmine' diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js index a7b6818f5..c6062d0ec 100644 --- a/spec/text-editor-component-spec.js +++ b/spec/text-editor-component-spec.js @@ -4585,7 +4585,7 @@ describe('TextEditorComponent', function () { it('pastes the previously selected text at the clicked location', async function () { let clipboardWrittenTo = false - spyOn(require('ipc-main'), 'send').andCallFake(function (eventName, selectedText) { + spyOn(require('ipc-renderer'), 'send').andCallFake(function (eventName, selectedText) { if (eventName === 'write-text-to-selection-clipboard') { require('../src/safe-clipboard').writeText(selectedText, 'selection') clipboardWrittenTo = true diff --git a/spec/window-event-handler-spec.coffee b/spec/window-event-handler-spec.coffee index 9cd68d5e8..052fed8c0 100644 --- a/spec/window-event-handler-spec.coffee +++ b/spec/window-event-handler-spec.coffee @@ -4,7 +4,7 @@ fs = require 'fs-plus' temp = require 'temp' TextEditor = require '../src/text-editor' WindowEventHandler = require '../src/window-event-handler' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' describe "WindowEventHandler", -> [projectPath, windowEventHandler] = [] diff --git a/spec/workspace-element-spec.coffee b/spec/workspace-element-spec.coffee index 110b8d562..01dddc5b7 100644 --- a/spec/workspace-element-spec.coffee +++ b/spec/workspace-element-spec.coffee @@ -1,4 +1,4 @@ -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' path = require 'path' temp = require('temp').track() diff --git a/src/application-delegate.coffee b/src/application-delegate.coffee index c5b65a4c8..d9a032fef 100644 --- a/src/application-delegate.coffee +++ b/src/application-delegate.coffee @@ -1,5 +1,5 @@ _ = require 'underscore-plus' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' remote = require 'remote' shell = require 'shell' webFrame = require 'web-frame' diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index d2e069a85..a0049e50b 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -1,6 +1,6 @@ crypto = require 'crypto' path = require 'path' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' _ = require 'underscore-plus' {deprecate} = require 'grim' diff --git a/src/browser/atom-portable.coffee b/src/browser/atom-portable.coffee index 37324e615..eeda81152 100644 --- a/src/browser/atom-portable.coffee +++ b/src/browser/atom-portable.coffee @@ -1,6 +1,6 @@ fs = require 'fs-plus' path = require 'path' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' module.exports = class AtomPortable diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee index b90eb0ed2..ad085730e 100644 --- a/src/initialize-test-window.coffee +++ b/src/initialize-test-window.coffee @@ -14,7 +14,7 @@ module.exports = ({blobStore}) -> try path = require 'path' - ipc = require 'ipc-main' + ipc = require 'ipc-renderer' {getWindowLoadSettings} = require './window-load-settings-helpers' AtomEnvironment = require '../src/atom-environment' ApplicationDelegate = require '../src/application-delegate' diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index 7f73fdb41..9eabcb697 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -1,7 +1,7 @@ path = require 'path' _ = require 'underscore-plus' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' CSON = require 'season' fs = require 'fs-plus' {Disposable} = require 'event-kit' diff --git a/src/register-default-commands.coffee b/src/register-default-commands.coffee index b873b0728..7e8a728bc 100644 --- a/src/register-default-commands.coffee +++ b/src/register-default-commands.coffee @@ -1,4 +1,4 @@ -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' module.exports = ({commandRegistry, commandInstaller, config}) -> commandRegistry.add 'atom-workspace', diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee index 525c7a3af..c0f1486b5 100644 --- a/src/text-editor-component.coffee +++ b/src/text-editor-component.coffee @@ -2,7 +2,7 @@ _ = require 'underscore-plus' scrollbarStyle = require 'scrollbar-style' {Range, Point} = require 'text-buffer' {CompositeDisposable} = require 'event-kit' -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' TextEditorPresenter = require './text-editor-presenter' GutterContainerComponent = require './gutter-container-component' diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee index 5b734c3f0..89e990c66 100644 --- a/src/workspace-element.coffee +++ b/src/workspace-element.coffee @@ -1,4 +1,4 @@ -ipc = require 'ipc-main' +ipc = require 'ipc-renderer' path = require 'path' {Disposable, CompositeDisposable} = require 'event-kit' Grim = require 'grim' diff --git a/static/index.js b/static/index.js index d62efd4f0..651f2b54c 100644 --- a/static/index.js +++ b/static/index.js @@ -83,7 +83,7 @@ var initialize = require(loadSettings.windowInitializationScript) initialize({blobStore: blobStore}) - require('ipc-main').send('window-command', 'window:loaded') + require('ipc-renderer').send('window-command', 'window:loaded') } function setupCsonCache (cacheDir) {