From d2db9e1a5dab86849ff812833b27600e2b6381ec Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Thu, 10 Dec 2015 14:12:04 -0800
Subject: [PATCH] fix(*): Fix for "apply is not a function" lost in revert of
 e275f35

---
 spec/n1-spec-reporter.coffee     | 4 ++--
 src/browser/application.coffee   | 6 ++++++
 src/compile-support/cjsx.js      | 4 +---
 src/nylas-env.coffee             | 8 ++++----
 src/window-thin-bootstrap.coffee | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/spec/n1-spec-reporter.coffee b/spec/n1-spec-reporter.coffee
index a0598c09e..adcb18fa7 100644
--- a/spec/n1-spec-reporter.coffee
+++ b/spec/n1-spec-reporter.coffee
@@ -83,7 +83,7 @@ class N1SpecReporter extends View
     @on 'click', '.stack-trace', ->
       $(this).toggleClass('expanded')
 
-    @reloadButton.on 'click', -> require('electron').ipcRenderer.send('call-window-method', 'restart')
+    @reloadButton.on 'click', -> require('electron').ipcRenderer.send('call-webcontents-method', 'reload')
 
   reportRunnerResults: (runner) ->
     @updateSpecCounts()
@@ -249,7 +249,7 @@ class N1SpecReporter extends View
     specSummaryElement = $("#spec-summary-#{spec.id}")
     specSummaryElement.removeClass('pending')
     specSummaryElement.attr('title', spec.getFullName())
-    
+
     results = spec.results()
     if results.skipped
       specSummaryElement.addClass("skipped")
diff --git a/src/browser/application.coffee b/src/browser/application.coffee
index ac1c26e32..5b63debca 100644
--- a/src/browser/application.coffee
+++ b/src/browser/application.coffee
@@ -356,9 +356,15 @@ class Application
 
     ipcMain.on 'call-window-method', (event, method, args...) ->
       win = BrowserWindow.fromWebContents(event.sender)
+      console.error("Method #{method} does not exist on BrowserWindow!") unless win[method]
       win[method](args...)
 
+    ipcMain.on 'call-devtools-webcontents-method', (event, method, args...) ->
+      # If devtools aren't open the `webContents::devToolsWebContents` will be null
+      event.sender.devToolsWebContents?[method](args...)
+
     ipcMain.on 'call-webcontents-method', (event, method, args...) ->
+      console.error("Method #{method} does not exist on WebContents!") unless event.sender[method]
       event.sender[method](args...)
 
     ipcMain.on 'action-bridge-rebroadcast-to-all', (event, args...) =>
diff --git a/src/compile-support/cjsx.js b/src/compile-support/cjsx.js
index 86015f533..8445e18ec 100644
--- a/src/compile-support/cjsx.js
+++ b/src/compile-support/cjsx.js
@@ -132,9 +132,7 @@ var hotCompile = (function () {
 }());
 
 function registerHotCompile() {
-  CoffeeScript.FILE_EXTENSIONS.forEach(function(ext) {
-    require.extensions[ext] = hotCompile;
-  });
+  require.extensions['.cjsx'] = hotCompile;
 
   if (process.mainModule === module) {
     var path = require('path');
diff --git a/src/nylas-env.coffee b/src/nylas-env.coffee
index 74f7ccd83..e1712ac27 100644
--- a/src/nylas-env.coffee
+++ b/src/nylas-env.coffee
@@ -506,7 +506,7 @@ class NylasEnvConstructor extends Model
 
   # Extended: Reload the current window.
   reload: ->
-    ipcRenderer.send('call-window-method', 'restart')
+    ipcRenderer.send('call-webcontents-method', 'reload')
 
   # Updates the window load settings - called when the app is ready to display
   # a hot-loaded window. Causes listeners registered with `onWindowPropsReceived`
@@ -773,15 +773,15 @@ class NylasEnvConstructor extends Model
 
   # Extended: Open the dev tools for the current window.
   openDevTools: ->
-    ipcRenderer.send('call-window-method', 'openDevTools')
+    ipcRenderer.send('call-webcontents-method', 'openDevTools')
 
   # Extended: Toggle the visibility of the dev tools for the current window.
   toggleDevTools: ->
-    ipcRenderer.send('call-window-method', 'toggleDevTools')
+    ipcRenderer.send('call-webcontents-method', 'toggleDevTools')
 
   # Extended: Execute code in dev tools.
   executeJavaScriptInDevTools: (code) ->
-    ipcRenderer.send('call-webcontents-method', 'executeJavaScriptInDevTools', code)
+    ipcRenderer.send('call-devtools-webcontents-method', 'executeJavaScript', code)
 
   ###
   Section: Private
diff --git a/src/window-thin-bootstrap.coffee b/src/window-thin-bootstrap.coffee
index 7b9e0b8de..736b9689d 100644
--- a/src/window-thin-bootstrap.coffee
+++ b/src/window-thin-bootstrap.coffee
@@ -34,4 +34,4 @@ prefs.activate()
 
 ipc.on 'command', (command, args) ->
   if command is 'window:toggle-dev-tools'
-    ipc.send('call-window-method', 'toggleDevTools')
+    ipc.send('call-webcontents-method', 'toggleDevTools')