From 4055d76eb87dc6c08672e6cd51e3949fc696d137 Mon Sep 17 00:00:00 2001 From: Giorgio Modoni Date: Mon, 23 Jan 2017 12:56:49 +0100 Subject: [PATCH 1/3] to close issue #9 - add module without electron create electronRequire empty object to start module without electron --- src/process.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/process.js b/src/process.js index a95b012..675c996 100644 --- a/src/process.js +++ b/src/process.js @@ -1 +1,16 @@ angular.module('angular-electron').constant('process', electronProcess); + +if (typeof electronRequire == 'undefined') { + var electronRequire = function () { + return { + remote: { + getCurrentWindow: function () { + return false; + }, + getCurrentWebContents: function () { + return false; + } + }, + }; + } + } From 113c9f74241b9a0c2ae64b6670ce9c6d378e6846 Mon Sep 17 00:00:00 2001 From: Giorgio Modoni Date: Mon, 23 Jan 2017 16:55:31 +0100 Subject: [PATCH 2/3] build with without electron fix --- angular-electron.js | 15 +++++++++++++++ angular-electron.min.js | 2 +- src/process.js | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/angular-electron.js b/angular-electron.js index 372cb4b..b226d57 100644 --- a/angular-electron.js +++ b/angular-electron.js @@ -17,6 +17,21 @@ angular.module('angular-electron').directive('externalLink', ['shell', function angular.module('angular-electron').constant('process', electronProcess); +if (typeof electronRequire == 'undefined') { + var electronRequire = function () { + return { + remote: { + getCurrentWindow: function () { + return false; + }, + getCurrentWebContents: function () { + return false; + } + } + }; + } + } + var remoteModules = ['app', 'autoUpdater', 'BrowserWindow', 'contentTracing', 'dialog', 'globalShortcut', 'Menu', 'MenuItem', 'powerMonitor', 'powerSaveBlocker', 'protocol', 'webContents', 'tray']; diff --git a/angular-electron.min.js b/angular-electron.min.js index 151751e..3b70e52 100644 --- a/angular-electron.min.js +++ b/angular-electron.min.js @@ -1 +1 @@ -!function(e,n,r,t){"use strict";e.module("angular-electron",[]),e.module("angular-electron").directive("externalLink",["shell",function(e){return{restrict:"A",link:function(n,r,t){r.on("click",function(n){n.preventDefault(),e.openExternal(t.href||t.externalLink)})}}}]),e.module("angular-electron").constant("process",r);var o=["app","autoUpdater","BrowserWindow","contentTracing","dialog","globalShortcut","Menu","MenuItem","powerMonitor","powerSaveBlocker","protocol","webContents","tray"],c=["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"];e.module("angular-electron").provider("remote",["$provide",function(r){function t(e){r.service(e,function(){return i[e]})}function u(e,n){n=n||e,r.service(e,function(){return"function"==typeof n?n(i):i.require(n)})}var i=n("electron").remote;this.register=u,this.$get=[function(){return i}],r.constant("remoteProcess",i.process),r.constant("currentWindow",i.getCurrentWindow()),r.constant("currentWebContents",i.getCurrentWebContents()),e.forEach(o,function(e){t(e)}),e.forEach(c,function(e){u(e.name||e,e.require)})}]);var u=["desktopCapturer","ipcRenderer","webFrame","clipboard","crashReporter","nativeImage","screen","shell"];e.forEach(u,function(r){e.module("angular-electron").service(r.name||r,[function(){return n("electron")[r.require||r]}])}),e.module("angular-electron").service("safeShutdown",["$q","currentWindow","app",function(n,r,o){function c(e){i.push(e)}function u(){var r=[];return e.forEach(i,function(e){var n=e();n!==t&&n.then!==t&&r.push(n)}),n.all(r)}var i=[];return r.safeReload=function(){u().then(function(){r.reload()})},o.safeQuit=function(){u().then(function(){o.quit()})},{register:c}}])}(window.angular,window.require,window.process); \ No newline at end of file +!function(e,n,r,t){"use strict";if(e.module("angular-electron",[]),e.module("angular-electron").directive("externalLink",["shell",function(e){return{restrict:"A",link:function(n,r,t){r.on("click",function(n){n.preventDefault(),e.openExternal(t.href||t.externalLink)})}}}]),e.module("angular-electron").constant("process",r),"undefined"==typeof n)var n=function(){return{remote:{getCurrentWindow:function(){return!1},getCurrentWebContents:function(){return!1}}}};var o=["app","autoUpdater","BrowserWindow","contentTracing","dialog","globalShortcut","Menu","MenuItem","powerMonitor","powerSaveBlocker","protocol","webContents","tray"],u=["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"];e.module("angular-electron").provider("remote",["$provide",function(r){function t(e){r.service(e,function(){return i[e]})}function c(e,n){n=n||e,r.service(e,function(){return"function"==typeof n?n(i):i.require(n)})}var i=n("electron").remote;this.register=c,this.$get=[function(){return i}],r.constant("remoteProcess",i.process),r.constant("currentWindow",i.getCurrentWindow()),r.constant("currentWebContents",i.getCurrentWebContents()),e.forEach(o,function(e){t(e)}),e.forEach(u,function(e){c(e.name||e,e.require)})}]);var c=["desktopCapturer","ipcRenderer","webFrame","clipboard","crashReporter","nativeImage","screen","shell"];e.forEach(c,function(r){e.module("angular-electron").service(r.name||r,[function(){return n("electron")[r.require||r]}])}),e.module("angular-electron").service("safeShutdown",["$q","currentWindow","app",function(n,r,o){function u(e){i.push(e)}function c(){var r=[];return e.forEach(i,function(e){var n=e();n!==t&&n.then!==t&&r.push(n)}),n.all(r)}var i=[];return r.safeReload=function(){c().then(function(){r.reload()})},o.safeQuit=function(){c().then(function(){o.quit()})},{register:u}}])}(window.angular,window.require,window.process); \ No newline at end of file diff --git a/src/process.js b/src/process.js index 675c996..e96c58e 100644 --- a/src/process.js +++ b/src/process.js @@ -10,7 +10,7 @@ if (typeof electronRequire == 'undefined') { getCurrentWebContents: function () { return false; } - }, + } }; } } From eb627a9fe4d8773f1e2d6e209cccf5fe18e814ee Mon Sep 17 00:00:00 2001 From: Giorgio Modoni Date: Mon, 23 Jan 2017 17:04:00 +0100 Subject: [PATCH 3/3] new subbersion --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18e4456..57cff1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-electron", - "version": "0.2.1", + "version": "0.2.2", "description": "angularjs helpers for electron apps", "repository": { "type": "git",