ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-01 00:45:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mobile_3' into mobile

Browse Source 
Merged fixes regarding circleci check failure
This commit is contained in:
Shivam Dave 2015-08-05 12:27:20 -07:00
commit 7c17581659
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/src/services/AgentService.js
View File

@ -59,7 +59,7 @@ define(
// phone is designated as only an
// iPhone device
function isPhone(ua) {
if (getDeviceUA(ua) == "iPhone") {
if (getDeviceUA(ua)[0] === "iPhone") {
return true;
} else {
return false;

6
platform/commonUI/inspect/src/services/InfoService.js
View File

@ -62,10 +62,10 @@ define(
// to where clicked or pressed)
bubble.css('position', 'absolute');
if (agentService.isPhone(navigator.userAgent)) {
bubble.css('right', 0 + 'px');
bubble.css('left', 0 + 'px');
bubble.css('right', '0px');
bubble.css('left', '0px');
bubble.css('top', 'auto');
bubble.css('bottom', 25 + 'px');
bubble.css('bottom', '25px');
} else {
if (goLeft) {
bubble.css('right', (winDim[0] - position[0] + OFFSET[0]) + 'px');