From 39bfd0f669edc97e5188f497c02937f413a51f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:00:28 +0200 Subject: [PATCH 1/6] Updating tray to Tray because of typo "tray" is not a module, but "Tray" is. --- src/remote.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote.js b/src/remote.js index 4dfa6c7..7ddeb98 100644 --- a/src/remote.js +++ b/src/remote.js @@ -1,6 +1,6 @@ var remoteModules = ['app', 'autoUpdater', 'BrowserWindow', 'contentTracing', 'dialog', 'globalShortcut', 'Menu', 'MenuItem', 'powerMonitor', 'powerSaveBlocker', - 'protocol', 'webContents', 'tray']; + 'protocol', 'webContents', 'Tray']; var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'events', 'fs', 'http', 'https', 'net', 'os', 'path', 'punycode', 'querystring', 'readline', 'stream', 'string_decoder', 'tls', 'dgram', 'url', 'util', 'v8', 'vm', 'zlib']; From d7f8a5f3ccfea29d136a821a08aa0f81716851d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:07:04 +0200 Subject: [PATCH 2/6] Updating documentation to proper implementation. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22af6a8..07ad245 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ or ```js angular.module('myModule').config(['remoteProvider', function(remoteProvider) { - remoteProvider.register({name: 'newName', require: 'moment'}); + remoteProvider.register('newName', 'moment'); }]); ``` From 7e47b41dd6243124f9355d1fbbf6c99c4a845e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:13:17 +0200 Subject: [PATCH 3/6] Add possibility to register additional electron modules with custom name. --- src/remote.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/remote.js b/src/remote.js index 7ddeb98..c900ce3 100644 --- a/src/remote.js +++ b/src/remote.js @@ -8,8 +8,9 @@ var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'event angular.module('angular-electron').provider('remote', ['$provide', function($provide) { var remote = electronRequire('electron').remote; - function registerElectronModule(_module) { - $provide.service(_module, function() { + function registerElectronModule(_module, _require) { + _require = _require || _module; + $provide.service(_require, function() { return remote[_module]; }); } @@ -23,6 +24,7 @@ angular.module('angular-electron').provider('remote', ['$provide', function($pro } this.register = registerNodeModule; + this.registerFromElectron = registerElectronModule; this.$get = [function() { return remote; From 757d17c714292d9c5ad668632cec48fa31f5e6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:16:09 +0200 Subject: [PATCH 4/6] Updating compiled sources. --- angular-electron.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/angular-electron.js b/angular-electron.js index 372cb4b..43f3833 100644 --- a/angular-electron.js +++ b/angular-electron.js @@ -19,7 +19,7 @@ angular.module('angular-electron').constant('process', electronProcess); var remoteModules = ['app', 'autoUpdater', 'BrowserWindow', 'contentTracing', 'dialog', 'globalShortcut', 'Menu', 'MenuItem', 'powerMonitor', 'powerSaveBlocker', - 'protocol', 'webContents', 'tray']; + 'protocol', 'webContents', 'Tray']; var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'events', 'fs', 'http', 'https', 'net', 'os', 'path', 'punycode', 'querystring', 'readline', 'stream', 'string_decoder', 'tls', 'dgram', 'url', 'util', 'v8', 'vm', 'zlib']; @@ -27,8 +27,9 @@ var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'event angular.module('angular-electron').provider('remote', ['$provide', function($provide) { var remote = electronRequire('electron').remote; - function registerElectronModule(_module) { - $provide.service(_module, function() { + function registerElectronModule(_module, _require) { + _require = _require || _module; + $provide.service(_require, function() { return remote[_module]; }); } @@ -42,6 +43,7 @@ angular.module('angular-electron').provider('remote', ['$provide', function($pro } this.register = registerNodeModule; + this.registerFromElectron = registerElectronModule; this.$get = [function() { return remote; From 73f5dda8bc157e9c0f4988011dcb47433891c34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:23:36 +0200 Subject: [PATCH 5/6] Bugfix --- angular-electron.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/angular-electron.js b/angular-electron.js index 43f3833..042d035 100644 --- a/angular-electron.js +++ b/angular-electron.js @@ -27,10 +27,10 @@ var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'event angular.module('angular-electron').provider('remote', ['$provide', function($provide) { var remote = electronRequire('electron').remote; - function registerElectronModule(_module, _require) { - _require = _require || _module; - $provide.service(_require, function() { - return remote[_module]; + function registerElectronModule(providerName, moduleName) { + moduleName = moduleName || providerName; + $provide.service(providerName, function() { + return remote[moduleName]; }); } From 464340338ff878e993bdb9b631bfc1ec32303fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wehlert?= Date: Wed, 13 Jul 2016 10:23:53 +0200 Subject: [PATCH 6/6] bugfix --- src/remote.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote.js b/src/remote.js index c900ce3..a7d5a81 100644 --- a/src/remote.js +++ b/src/remote.js @@ -8,10 +8,10 @@ var nodeModules = ['buffer', 'child_process', 'cluster', 'crypto', 'dns', 'event angular.module('angular-electron').provider('remote', ['$provide', function($provide) { var remote = electronRequire('electron').remote; - function registerElectronModule(_module, _require) { - _require = _require || _module; - $provide.service(_require, function() { - return remote[_module]; + function registerElectronModule(providerName, moduleName) { + moduleName = moduleName || providerName; + $provide.service(providerName, function() { + return remote[moduleName]; }); }