You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by al...@apache.org on 2017/08/30 10:03:01 UTC
cordova-paramedic git commit: Disable browser pop-up for newer
version of cordova-browser
Repository: cordova-paramedic
Updated Branches:
refs/heads/master e0c9cb778 -> 211100d4f
Disable browser pop-up for newer version of cordova-browser
Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/211100d4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/211100d4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/211100d4
Branch: refs/heads/master
Commit: 211100d4fcbb9001d6769782fd7bdacb2580d096
Parents: e0c9cb7
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Wed Aug 30 13:02:43 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Wed Aug 30 13:02:43 2017 +0300
----------------------------------------------------------------------
lib/paramedic.js | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/211100d4/lib/paramedic.js
----------------------------------------------------------------------
diff --git a/lib/paramedic.js b/lib/paramedic.js
index 7eec31d..549c6ef 100644
--- a/lib/paramedic.js
+++ b/lib/paramedic.js
@@ -193,7 +193,7 @@ ParamedicRunner.prototype.installPlatform = function () {
logger.info('cordova-paramedic: monkey patching Android platform to disable gradle daemon...');
var gradleBuilderFile = path.join(self.tempFolder.name, 'platforms/android/cordova/lib/builders/GradleBuilder.js');
// remove the line where the gradle daemon is forced on
- if (appPatcher.monkeyPatch(gradleBuilderFile, /args\.push\('\-Dorg\.gradle\.daemon=true'\);/, '')) {
+ if (appPatcher.monkeyPatch(gradleBuilderFile, /args\.push\('\-Dorg\.gradle\.daemon=true'\);/, '//args.push(\'-Dorg.gradle.daemon=true\');')) {
logger.info('cordova-paramedic: success!');
} else {
logger.info('cordova-paramedic: couldn\'t apply the patch. It must be good news: does cordova-android not hard-code gradle daemon anymore?');
@@ -202,12 +202,19 @@ ParamedicRunner.prototype.installPlatform = function () {
logger.info('cordova-paramedic: I like patching stuff, so...');
logger.info('cordova-paramedic: monkey patching browser platform to disable browser pop-up.');
var cordovaRunFile = path.join(self.tempFolder.name, 'platforms/browser/cordova/run');
- if (appPatcher.monkeyPatch(cordovaRunFile, /return cordovaServe\.launchBrowser\(.*\)\;/, '')) {
+ // we need to supply some replacement string so this method can properly return a result
+ if (appPatcher.monkeyPatch(cordovaRunFile, /return cordovaServe\.launchBrowser\(.*\)\;/, '// no pop-up please')) {
logger.info('cordova-paramedic: success!');
self.browserPatched = true;
} else {
- logger.info('cordova-paramedic: couldn\'t apply the patch. Not a big deal, though: things should work anyway.');
- self.browserPatched = false;
+ cordovaRunFile = path.join(self.tempFolder.name, 'platforms/browser/cordova/lib/run.js');
+ if (appPatcher.monkeyPatch(cordovaRunFile, /return server\.launchBrowser\(\{'target'\: args\.target\, 'url'\: projectUrl\}\)\;/, '// no pop-up please')) {
+ logger.info('cordova-paramedic: success!');
+ self.browserPatched = true;
+ } else {
+ logger.info('cordova-paramedic: couldn\'t apply the patch. Not a big deal, though: things should work anyway.');
+ self.browserPatched = false;
+ }
}
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org