Merge pull request #188 from atom/old-fasioned-dialog

Implement alert() and confirm() with dialog API

atom.gyp

@@ -32,6 +32,7 @@
       'common/api/lib/shell.coffee',
       'common/lib/init.coffee',
       'renderer/lib/init.coffee',
+      'renderer/lib/override.coffee',
       'renderer/api/lib/ipc.coffee',
       'renderer/api/lib/remote.coffee',
     ],

browser/atom_javascript_dialog_manager.cc

@@ -8,6 +8,18 @@
 
 namespace atom {
 
+void AtomJavaScriptDialogManager::RunJavaScriptDialog(
+    content::WebContents* web_contents,
+    const GURL& origin_url,
+    const std::string& accept_lang,
+    content::JavaScriptMessageType javascript_message_type,
+    const string16& message_text,
+    const string16& default_prompt_text,
+    const DialogClosedCallback& callback,
+    bool* did_suppress_message) {
+  callback.Run(false, string16());
+}
+
 void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
     const string16& message_text,

browser/atom_javascript_dialog_manager.h

@@ -20,7 +20,7 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
       const string16& message_text,
       const string16& default_prompt_text,
       const DialogClosedCallback& callback,
-      bool* did_suppress_message) OVERRIDE {}
+      bool* did_suppress_message) OVERRIDE;
   virtual void RunBeforeUnloadDialog(
       content::WebContents* web_contents,
       const string16& message_text,

renderer/lib/init.coffee

@@ -42,39 +42,5 @@ else
   global.__filename = __filename
   global.__dirname = __dirname
 
-# Redirect window.onerror to uncaughtException.
-window.onerror = (error) ->
-  if global.process.listeners('uncaughtException').length > 0
-    global.process.emit 'uncaughtException', error
-    true
-  else
-    false
-
-# Override default window.close, see:
-# https://github.com/atom/atom-shell/issues/70
-window.close = ->
-  require('remote').getCurrentWindow().close()
-
-# Override default window.open.
-window.open = (url, name, features) ->
-  options = {}
-  for feature in features.split ','
-    [name, value] = feature.split '='
-    options[name] =
-      if value is 'yes'
-        true
-      else if value is 'no'
-        false
-      else
-        value
-
-  options.x ?= options.left
-  options.y ?= options.top
-  options.title ?= name
-  options.width ?= 800
-  options.height ?= 600
-
-  BrowserWindow = require('remote').require 'browser-window'
-  browser = new BrowserWindow options
-  browser.loadUrl url
-  browser
+# Override default web functions.
+require path.join(__dirname, 'override')

renderer/lib/override.coffee

@@ -0,0 +1,54 @@
+# Redirect window.onerror to uncaughtException.
+window.onerror = (error) ->
+  if global.process.listeners('uncaughtException').length > 0
+    global.process.emit 'uncaughtException', error
+    true
+  else
+    false
+
+# Override default window.close, see:
+# https://github.com/atom/atom-shell/issues/70
+window.close = ->
+  require('remote').getCurrentWindow().close()
+
+# Override default window.open.
+window.open = (url, name, features) ->
+  options = {}
+  for feature in features.split ','
+    [name, value] = feature.split '='
+    options[name] =
+      if value is 'yes'
+        true
+      else if value is 'no'
+        false
+      else
+        value
+
+  options.x ?= options.left
+  options.y ?= options.top
+  options.title ?= name
+  options.width ?= 800
+  options.height ?= 600
+
+  BrowserWindow = require('remote').require 'browser-window'
+  browser = new BrowserWindow options
+  browser.loadUrl url
+  browser
+
+# Use the dialog API to implement alert().
+window.alert = (message, title='') ->
+  remote = require 'remote'
+  dialog = remote.require 'dialog'
+  buttons = ['OK']
+  dialog.showMessageBox remote.getCurrentWindow(), {message, title, buttons}
+
+# And the confirm().
+window.confirm = (message, title='') ->
+  remote = require 'remote'
+  dialog = remote.require 'dialog'
+  buttons = ['OK', 'Cancel']
+  not dialog.showMessageBox remote.getCurrentWindow(), {message, title, buttons}
+
+# But we do not support prompt().
+window.prompt = ->
+  throw new Error('prompt() is and will not be supported in atom-shell.')