mirror of
https://github.com/nasa/openmct.git
synced 2025-06-12 12:18:16 +00:00
[Mobile] Update agentService usages
This commit is contained in:
@ -19,7 +19,7 @@
|
|||||||
* this source code distribution or the Licensing information page available
|
* this source code distribution or the Licensing information page available
|
||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
/*global define,Promise,window*/
|
/*global define,Promise*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Module defining TreeNodeController. Created by vwoeltje on 11/10/14.
|
* Module defining TreeNodeController. Created by vwoeltje on 11/10/14.
|
||||||
@ -182,14 +182,13 @@ define(
|
|||||||
// and in portrait mode, than, hide the tree menu
|
// and in portrait mode, than, hide the tree menu
|
||||||
TreeNodeController.prototype.setObject = function (ngModel, domainObject) {
|
TreeNodeController.prototype.setObject = function (ngModel, domainObject) {
|
||||||
ngModel.selectedObject = domainObject;
|
ngModel.selectedObject = domainObject;
|
||||||
if (this.agentService.getOrientation(window.innerWidth, window.innerHeight) === "portrait" &&
|
if (this.agentService.isPhone() && this.agentService.isPortrait()) {
|
||||||
this.agentService.isPhone(navigator.userAgent)) {
|
|
||||||
this.$scope.$emit('select-obj');
|
this.$scope.$emit('select-obj');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
TreeNodeController.prototype.checkMobile = function () {
|
TreeNodeController.prototype.checkMobile = function () {
|
||||||
return this.agentService.isMobile(navigator.userAgent);
|
return this.agentService.isMobile();
|
||||||
};
|
};
|
||||||
|
|
||||||
return TreeNodeController;
|
return TreeNodeController;
|
||||||
|
@ -92,7 +92,7 @@ define(
|
|||||||
// mobile (agentService.isMobile() = true), then
|
// mobile (agentService.isMobile() = true), then
|
||||||
// the a click on something (info button) brings up
|
// the a click on something (info button) brings up
|
||||||
// the bubble
|
// the bubble
|
||||||
if (agentService.isMobile(navigator.userAgent)) {
|
if (agentService.isMobile()) {
|
||||||
element.on('click', showBubble);
|
element.on('click', showBubble);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ define(
|
|||||||
// Checks if you are on a mobile device, if the device is
|
// Checks if you are on a mobile device, if the device is
|
||||||
// not mobile (agentService.isMobile() = false), then
|
// not mobile (agentService.isMobile() = false), then
|
||||||
// the pendingBubble and therefore hovering is allowed
|
// the pendingBubble and therefore hovering is allowed
|
||||||
if (!agentService.isMobile(navigator.userAgent)) {
|
if (!agentService.isMobile()) {
|
||||||
// Show bubble (on a timeout) on mouse over
|
// Show bubble (on a timeout) on mouse over
|
||||||
element.on('mouseenter', this.showBubbleCallback);
|
element.on('mouseenter', this.showBubbleCallback);
|
||||||
}
|
}
|
||||||
|
@ -31,17 +31,20 @@ define(
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
function MobileBrowseTreeController($scope, navigationService, agentService) {
|
function MobileBrowseTreeController($scope, navigationService, agentService) {
|
||||||
var object = navigationService.getNavigation();
|
var object = navigationService.getNavigation(),
|
||||||
|
self = this;
|
||||||
|
|
||||||
// Collapse tree when navigation changes
|
// Collapse tree when navigation changes
|
||||||
function changeObject(newObject) {
|
function changeObject(newObject) {
|
||||||
if (newObject !== object) {
|
if (newObject !== object && agentService.isPortrait()) {
|
||||||
object = newObject;
|
object = newObject;
|
||||||
this.state = false;
|
self.state = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (agentService.isMobile()) {
|
||||||
navigationService.listen(changeObject);
|
navigationService.listen(changeObject);
|
||||||
|
}
|
||||||
|
|
||||||
this.state = true;
|
this.state = true;
|
||||||
}
|
}
|
||||||
|
@ -71,6 +71,7 @@ define(
|
|||||||
scope = $rootScope.$new(),
|
scope = $rootScope.$new(),
|
||||||
goLeft = eventCoors[0] + menuDim[0] > winDim[0],
|
goLeft = eventCoors[0] + menuDim[0] > winDim[0],
|
||||||
goUp = eventCoors[1] + menuDim[1] > winDim[1],
|
goUp = eventCoors[1] + menuDim[1] > winDim[1],
|
||||||
|
initiatingEvent = this.agentService.isMobile() ? 'touchstart' : 'mousedown',
|
||||||
menu;
|
menu;
|
||||||
|
|
||||||
// Remove the context menu
|
// Remove the context menu
|
||||||
@ -107,27 +108,16 @@ define(
|
|||||||
body.append(menu);
|
body.append(menu);
|
||||||
|
|
||||||
// Stop propagation so that clicks or touches on the menu do not close the menu
|
// Stop propagation so that clicks or touches on the menu do not close the menu
|
||||||
if (!(this.agentService.isMobile(navigator.userAgent))) {
|
menu.on(initiatingEvent, function (event) {
|
||||||
menu.on('mousedown', function (event) {
|
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
});
|
});
|
||||||
} else if ((this.agentService.isMobile(navigator.userAgent))) {
|
|
||||||
menu.on('touchstart', function (event) {
|
|
||||||
event.stopPropagation();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dismiss the menu when body is clicked/touched elsewhere
|
// Dismiss the menu when body is clicked/touched elsewhere
|
||||||
// ('mousedown' because 'click' breaks left-click context menus)
|
// ('mousedown' because 'click' breaks left-click context menus)
|
||||||
// ('touchstart' because 'touch' breaks context menus up)
|
// ('touchstart' because 'touch' breaks context menus up)
|
||||||
if (!(this.agentService.isMobile(navigator.userAgent))) {
|
body.on(initiatingEvent, dismiss);
|
||||||
body.on('mousedown', dismiss);
|
|
||||||
// NOTE: Apply to mobile?
|
// NOTE: Apply to mobile?
|
||||||
menu.on('click', dismiss);
|
menu.on('click', dismiss);
|
||||||
} else if (this.agentService.isMobile(navigator.userAgent)) {
|
|
||||||
body.on('touchstart', dismiss);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Don't launch browser's context menu
|
// Don't launch browser's context menu
|
||||||
actionContext.event.preventDefault();
|
actionContext.event.preventDefault();
|
||||||
|
@ -54,11 +54,11 @@ define(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// When context menu event occurs, show object actions instead
|
// When context menu event occurs, show object actions instead
|
||||||
if (!agentService.isMobile(navigator.userAgent)) {
|
if (!agentService.isMobile()) {
|
||||||
|
|
||||||
// When context menu event occurs, show object actions instead
|
// When context menu event occurs, show object actions instead
|
||||||
element.on('contextmenu', showMenu);
|
element.on('contextmenu', showMenu);
|
||||||
} else if (agentService.isMobile(navigator.userAgent)) {
|
} else if (agentService.isMobile()) {
|
||||||
|
|
||||||
// If on mobile device, then start timeout for the single touch event
|
// If on mobile device, then start timeout for the single touch event
|
||||||
// during the timeout 'isPressing' is true.
|
// during the timeout 'isPressing' is true.
|
||||||
|
Reference in New Issue
Block a user