Add "electron" module

diff --git a/atom/browser/api/lib/exports/electron.coffee b/atom/browser/api/lib/exports/electron.coffee
new file mode 100644 (file)
index 0000000..6c79297
--- /dev/null
+++ b/atom/browser/api/lib/exports/electron.coffee
@@ -0,0 +1,47 @@
+# Import common modules.
+module.exports = require '../../../../common/api/lib/exports/electron'
+
+Object.defineProperties module.exports,
+  # Browser side modules, please sort with alphabet order.
+  app:
+    enumerable: true
+    get: -> require '../app'
+  autoUpdater:
+    enumerable: true
+    get: -> require '../auto-updater'
+  BrowserWindow:
+    enumerable: true
+    get: -> require '../browser-window'
+  contentTracing:
+    enumerable: true
+    get: -> require '../content-tracing'
+  dialog:
+    enumerable: true
+    get: -> require '../dialog'
+  ipcMain:
+    enumerable: true
+    get: -> require '../ipc-main'
+  globalShortcut:
+    enumerable: true
+    get: -> require '../global-shortcut'
+  Menu:
+    enumerable: true
+    get: -> require '../menu'
+  MenuItem:
+    enumerable: true
+    get: -> require '../menu-item'
+  powerMonitor:
+    enumerable: true
+    get: -> require '../power-monitor'
+  powerSaveBlocker:
+    enumerable: true
+    get: -> require '../power-save-blocker'
+  protocol:
+    enumerable: true
+    get: -> require '../protocol'
+  screen:
+    enumerable: true
+    get: -> require '../screen'
+  tray:
+    enumerable: true
+    get: -> require '../tray'

diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index 80d2da3..fd6059b 100644 (file)
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -17,6 +17,7 @@ require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
 # Electron's built-in libraries.
 globalPaths = Module.globalPaths
 globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
+globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports')
 
 if process.platform is 'win32'
   # Redirect node's console to use our own implementations, since node can not

diff --git a/atom/common/api/lib/exports/electron.coffee b/atom/common/api/lib/exports/electron.coffee
new file mode 100644 (file)
index 0000000..a57d5be
--- /dev/null
+++ b/atom/common/api/lib/exports/electron.coffee
@@ -0,0 +1,15 @@
+Object.defineProperties exports,
+  # Common modules, please sort with alphabet order.
+  clipboard:
+    # Must be enumerable, otherwise it woulde be invisible to remote module.
+    enumerable: true
+    get: -> require '../clipboard'
+  crashRepoter:
+    enumerable: true
+    get: -> require '../crash-reporter'
+  nativeImage:
+    enumerable: true
+    get: -> require '../native-image'
+  shell:
+    enumerable: true
+    get: -> require '../shell'

diff --git a/atom/renderer/api/lib/exports/electron.coffee b/atom/renderer/api/lib/exports/electron.coffee
new file mode 100644 (file)
index 0000000..5d7f2a5
--- /dev/null
+++ b/atom/renderer/api/lib/exports/electron.coffee
@@ -0,0 +1,17 @@
+# Import common modules.
+module.exports = require '../../../../common/api/lib/exports/electron'
+
+Object.defineProperties module.exports,
+  # Renderer side modules, please sort with alphabet order.
+  ipcRenderer:
+    enumerable: true
+    get: -> require '../ipc-renderer'
+  remote:
+    enumerable: true
+    get: -> require '../remote'
+  screen:
+    enumerable: true
+    get: -> require '../screen'
+  webFrame:
+    enumerable: true
+    get: -> require '../web-frame'

diff --git a/atom/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee
index ed3482f..4779794 100644 (file)
--- a/atom/renderer/lib/init.coffee
+++ b/atom/renderer/lib/init.coffee
@@ -17,6 +17,7 @@ require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
 # of Atom's built-in libraries.
 globalPaths = Module.globalPaths
 globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
+globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports')
 
 # The global variable will be used by ipc for event dispatching
 v8Util = process.atomBinding 'v8_util'

diff --git a/filenames.gypi b/filenames.gypi
index 4dc709c..de7ee26 100644 (file)
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -16,6 +16,7 @@
       'atom/browser/api/lib/browser-window.coffee',
       'atom/browser/api/lib/content-tracing.coffee',
       'atom/browser/api/lib/dialog.coffee',
+      'atom/browser/api/lib/exports/electron.coffee',
       'atom/browser/api/lib/global-shortcut.coffee',
       'atom/browser/api/lib/ipc.coffee',
       'atom/browser/api/lib/ipc-main.coffee',
@@ -38,6 +39,7 @@
       'atom/common/api/lib/clipboard.coffee',
       'atom/common/api/lib/crash-reporter.coffee',
       'atom/common/api/lib/deprecate.coffee',
+      'atom/common/api/lib/exports/electron.coffee',
       'atom/common/api/lib/native-image.coffee',
       'atom/common/api/lib/shell.coffee',
       'atom/common/lib/init.coffee',
@@ -50,6 +52,7 @@
       'atom/renderer/lib/web-view/web-view.coffee',
       'atom/renderer/lib/web-view/web-view-attributes.coffee',
       'atom/renderer/lib/web-view/web-view-constants.coffee',
+      'atom/renderer/api/lib/exports/electron.coffee',
       'atom/renderer/api/lib/ipc.coffee',
       'atom/renderer/api/lib/ipc-renderer.coffee',
       'atom/renderer/api/lib/remote.coffee',