starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-20 07:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we add 'http://' to URLs even when a username is used.

Browse Source
This commit is contained in:
Simo Kinnunen
2015-02-06 12:23:12 +09:00
parent 9209b923c7
commit 21b4ebe9e4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/units/device/plugins/browser.js
View File

@@ -67,9 +67,17 @@ module.exports = syrup.serial()
.then(updateBrowsers) .then(updateBrowsers)
} }
function ensureHttpProtocol(url) {
// Check for '://' because a protocol-less URL might include
// a username:password combination.
return (url.indexOf('://') === -1 ? 'http://' : '') + url
}
service.on('browserPackageChange', updateBrowsers) service.on('browserPackageChange', updateBrowsers)
router.on(wire.BrowserOpenMessage, function(channel, message) { router.on(wire.BrowserOpenMessage, function(channel, message) {
message.url = ensureHttpProtocol(message.url)
if (message.browser) { if (message.browser) {
log.info('Opening "%s" in "%s"', message.url, message.browser) log.info('Opening "%s" in "%s"', message.url, message.browser)
} }

7
res/app/control-panes/dashboard/navigation/navigation-controller.js
View File

@@ -24,10 +24,9 @@ module.exports = function NavigationCtrl($scope, $rootScope) {
} }
function addHttp(textUrl) { function addHttp(textUrl) {
if (textUrl.indexOf(':') === -1 && textUrl.indexOf('.') !== -1) { // Check for '://' because a protocol-less URL might include
return 'http://' + textUrl // a username:password combination.
} return (textUrl.indexOf('://') === -1 ? 'http://' : '') + textUrl
return textUrl
} }
$scope.blurUrl = false $scope.blurUrl = false