You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2015/07/14 02:29:48 UTC
cordova-lib git commit: Add support for --target=edge to launch app
in Edge browser.
Repository: cordova-lib
Updated Branches:
refs/heads/master 37bc821a5 -> 2d78d760c
Add support for --target=edge to launch app in Edge browser.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/2d78d760
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/2d78d760
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/2d78d760
Branch: refs/heads/master
Commit: 2d78d760c93f5d9d5fdf8ee67c827fddef9cf9e7
Parents: 37bc821
Author: Tim Barham <ti...@microsoft.com>
Authored: Tue Jul 14 09:06:41 2015 +1000
Committer: Tim Barham <ti...@microsoft.com>
Committed: Tue Jul 14 09:13:43 2015 +1000
----------------------------------------------------------------------
cordova-serve/src/browser.js | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2d78d760/cordova-serve/src/browser.js
----------------------------------------------------------------------
diff --git a/cordova-serve/src/browser.js b/cordova-serve/src/browser.js
index 5b3b40e..2eb78df 100644
--- a/cordova-serve/src/browser.js
+++ b/cordova-serve/src/browser.js
@@ -30,12 +30,13 @@ var exec = require('./exec'),
* @return {Q} Promise to launch the specified browser
*/
module.exports = function (opts) {
- //target, url, dataDir
var target = opts.target || 'chrome';
var url = opts.url || '';
return getBrowser(target, opts.dataDir).then(function (browser) {
var args;
+
+ var urlAdded = false;
switch (process.platform) {
case 'darwin':
args = ['open'];
@@ -51,7 +52,13 @@ module.exports = function (opts) {
// responsibility to "cmd /c", which has that logic built in.
//
// Furthermore, if "cmd /c" double-quoted the first parameter, then "start" will interpret it as a window title,
- // so we need to add a dummy empty-string window title: http://stackoverflow.com/a/154090/3191
+ // so we need to add a dummy empty-string window title: http://stackoverflow.com/a/154090/3191
+
+ if (target === 'edge') {
+ browser += ':' + url;
+ urlAdded = true;
+ }
+
args = ['cmd /c start ""', browser];
break;
case 'linux':
@@ -60,7 +67,10 @@ module.exports = function (opts) {
args = [browser];
break;
}
- args.push(url);
+
+ if (!urlAdded) {
+ args.push(url);
+ }
var command = args.join(' ');
console.log('Executing command: ' + command);
return exec(command);
@@ -77,7 +87,8 @@ function getBrowser(target, dataDir) {
'chrome': 'chrome --user-data-dir=%TEMP%\\' + dataDir,
'safari': 'safari',
'opera': 'opera',
- 'firefox': 'firefox'
+ 'firefox': 'firefox',
+ 'edge': 'microsoft-edge'
},
'darwin': {
'chrome': '"Google Chrome" --args' + chromeArgs,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org