diff --git a/lib/roles/device/plugins/browser.js b/lib/roles/device/plugins/browser.js index e8338bf2..c172e0ab 100644 --- a/lib/roles/device/plugins/browser.js +++ b/lib/roles/device/plugins/browser.js @@ -38,6 +38,13 @@ module.exports = syrup.serial() }) router.on(wire.BrowserOpenMessage, function(channel, message) { + if (message.browser) { + log.info('Opening "%s" in "%s"', message.url, message.browser) + } + else { + log.info('Opening "%s"', message.url) + } + var reply = wireutil.reply(options.serial) adb.startActivity(options.serial, { action: 'android.intent.action.VIEW' diff --git a/res/app/components/stf/control/control-service.js b/res/app/components/stf/control/control-service.js index 5844144c..85ddf4df 100644 --- a/res/app/components/stf/control/control-service.js +++ b/res/app/components/stf/control/control-service.js @@ -198,10 +198,10 @@ module.exports = function ControlServiceFactory( return sendTwoWay('logcat.stop') } - this.openBrowser = function(browser, url) { + this.openBrowser = function(url, browser) { return sendTwoWay('browser.open', { url: url - , browser: browser.id + , browser: browser ? browser.id : null }) } } diff --git a/res/app/control-panes/dashboard/navigation/navigation-controller.js b/res/app/control-panes/dashboard/navigation/navigation-controller.js index 314b6dd0..3bab2bac 100644 --- a/res/app/control-panes/dashboard/navigation/navigation-controller.js +++ b/res/app/control-panes/dashboard/navigation/navigation-controller.js @@ -1,3 +1,10 @@ module.exports = function NavigationCtrl($scope) { - + $scope.activeBrowser = null + + $scope.openURL = function() { + return $scope.control.openBrowser( + $scope.textURL + , $scope.activeBrowser + ) + } } diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade index 699a8be8..424fe119 100644 --- a/res/app/control-panes/dashboard/navigation/navigation.jade +++ b/res/app/control-panes/dashboard/navigation/navigation.jade @@ -1,4 +1,4 @@ -.widget-container.fluid-height.stf-navigation +.widget-container.fluid-height.stf-navigation(ng-controller='NavigationCtrl') .heading i.fa.fa-globe span(translate) Navigation @@ -8,6 +8,12 @@ i.fa.fa-step-backward.pull-right(ng-click='back()', title='{{"Go Back"|translate}}', ng-if='$root.browser == "webview"') .widget-content.padded form + ul + li(ng-repeat='browser in device.browser.apps') + label + input(type='radio', ng-model='activeBrowser', ng-value='browser') + span {{ browser.type }} + .input-group input(type='text', placeholder='http://...', autocomplete='off', ng-model='textURL', typeahead='url for url in urlHistory | filter:$viewValue').form-control