diff --git a/bower.json b/bower.json index 38a4766e..439d65fa 100644 --- a/bower.json +++ b/bower.json @@ -6,6 +6,7 @@ "angular-route": "~1.3.0-beta.8", "angular-sanitize": "~1.3.0-beta.8", "angular-animate": "~1.3.0-beta.8", + "angular-touch": "~1.3.0-beta.8", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#7a90ef40be7e944afae38e195dc4a74ec34cc258", "socket.io-client": "~0.9.16", "lodash": "~2.4.1", diff --git a/res/app/app.js b/res/app/app.js index e3f097fc..c36e03e0 100644 --- a/res/app/app.js +++ b/res/app/app.js @@ -1,12 +1,13 @@ require('angular') require('angular-route') - +require('angular-touch') require('angular-gettext') require('ng-file-upload') angular.module('app', [ 'ngRoute', + 'ngTouch', 'gettext', 'angularFileUpload', require('./layout').name, diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.jade index 24762974..c5f92d5c 100644 --- a/res/app/control-panes/control-panes.jade +++ b/res/app/control-panes/control-panes.jade @@ -1,5 +1,5 @@ div(ng-if='$root.basicMode') - div(style='width: 320px; height: 540px;') + div(style='width: 320px; height: 482px;') .remote-control div(ng-include='"control-panes/device-control/device-control.jade"').fill-height diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css index 860831df..9a30ee87 100644 --- a/res/app/control-panes/device-control/device-control.css +++ b/res/app/control-panes/device-control/device-control.css @@ -10,6 +10,13 @@ device-screen { position: relative; display: block; overflow: hidden; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } device-screen canvas { diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index 78a9e3ad..7ef99782 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -2,7 +2,7 @@ .as-cell.fill-height .as-table.fill-height - .stf-vnc-navbar.as-row + .stf-vnc-navbar.as-row(ng-if='!$root.basicMode') .pull-right button(ng-click='control.identify()', tooltip='Find Device', tooltip-placement='bottom').btn.btn-sm.btn-info-outline diff --git a/res/app/menu/menu.jade b/res/app/menu/menu.jade index 1055df85..7b9a4775 100644 --- a/res/app/menu/menu.jade +++ b/res/app/menu/menu.jade @@ -17,7 +17,7 @@ .btn-group button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native - li + li(ng-if='!$root.basicMode') a(ng-href='/#!/help') i.fa.fa-question-circle - | {{ !$root.basicMode ? "Help" : '' | translate }} + | {{ "Help" | translate }} diff --git a/res/app/views/index.jade b/res/app/views/index.jade index 37edbb02..f9841046 100644 --- a/res/app/views/index.jade +++ b/res/app/views/index.jade @@ -2,6 +2,7 @@ doctype html html head meta(charset='utf-8') + meta(name='viewport', content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui') title STF body(ng-app='app', ng-cloak).bg-1.fill-height div(ng-controller='LayoutCtrl').fill-height diff --git a/webpack.config.js b/webpack.config.js index 683cc0ca..67778886 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -53,6 +53,7 @@ module.exports = { , { test: /\.html/, loader: 'html-loader' } , { test: /angular\.js/, loader: 'exports?angular'} , { test: /angular-route\.js/, loader: 'imports?angular=angular'} + , { test: /angular-touch\.js/, loader: 'imports?angular=angular'} , { test: /angular-animate\.js/, loader: 'imports?angular=angular'} , { test: /angular-growl\.js/, loader: 'imports?angular=angular'} , { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}