ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-10 11:21:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mobile] Move mobile-specific behavior to template

Browse Source
This commit is contained in:
Victor Woeltjen 2015-09-18 11:01:54 -07:00
parent fa186a1556
commit 4c5808c8c9
3 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/bundle.json
View File

@ -60,7 +60,7 @@
{ {
"key": "TreeNodeController", "key": "TreeNodeController",
"implementation": "controllers/TreeNodeController.js", "implementation": "controllers/TreeNodeController.js",
"depends": [ "$scope", "$timeout", "agentService" ] "depends": [ "$scope", "$timeout" ]
}, },
{ {
"key": "ActionGroupController", "key": "ActionGroupController",

33
platform/commonUI/general/res/templates/tree-node.html
View File

@ -25,24 +25,35 @@
class="tree-item menus-to-left" class="tree-item menus-to-left"
ng-class="{selected: treeNode.isSelected()}" ng-class="{selected: treeNode.isSelected()}"
> >
<span
class='ui-symbol view-control mobile-hide'
ng-click="toggle.toggle(); treeNode.trackExpansion()"
ng-if="model.composition !== undefined"
>
{{toggle.isActive() ? "v" : ">"}}
</span>
<mct-representation <mct-representation
class="mobile-hide"
key="'label'" key="'label'"
mct-object="domainObject" mct-object="domainObject"
ng-model="ngModel" ng-click="ngModel.selectedObject = domainObject"
ng-click="!treeNode.checkMobile() || model.composition == undefined ||
model.composition.length == 0 ? treeNode.setObject(ngModel, domainObject) : toggle.toggle();
treeNode.trackExpansion()"
> >
</mct-representation> </mct-representation>
<span <mct-representation
class='ui-symbol view-control' class="desktop-hide"
key="'label'"
mct-object="domainObject" mct-object="domainObject"
ng-model="ngModel" ng-click="toggle.toggle(); treeNode.trackExpansion()"
ng-click="treeNode.checkMobile() ? treeNode.setObject(ngModel, domainObject) :
toggle.toggle(); treeNode.trackExpansion()"
ng-if="model.composition !== undefined || treeNode.checkMobile()"
> >
{{treeNode.checkMobile() ? "}" : toggle.isActive() ? "v" : ">"}} </mct-representation>
<span
class='ui-symbol view-control desktop-hide'
ng-model="ngModel"
ng-click="ngModel.selectedObject = domainObject"
>
}
</span> </span>
</span> </span>
<span <span

17
platform/commonUI/general/src/controllers/TreeNodeController.js
View File

@ -51,7 +51,7 @@ define(
* @memberof platform/commonUI/general * @memberof platform/commonUI/general
* @constructor * @constructor
*/ */
function TreeNodeController($scope, $timeout, agentService) { function TreeNodeController($scope, $timeout) {
var self = this, var self = this,
selectedObject = ($scope.ngModel || {}).selectedObject, selectedObject = ($scope.ngModel || {}).selectedObject,
isSelected = false, isSelected = false,
@ -133,7 +133,6 @@ define(
this.isSelectedFlag = false; this.isSelectedFlag = false;
this.hasBeenExpandedFlag = false; this.hasBeenExpandedFlag = false;
this.$timeout = $timeout; this.$timeout = $timeout;
this.agentService = agentService;
this.$scope = $scope; this.$scope = $scope;
// Listen for changes which will effect display parameters // Listen for changes which will effect display parameters
@ -177,20 +176,6 @@ define(
return this.isSelectedFlag; return this.isSelectedFlag;
}; };
// Sets the selected object in the tree, to be the
// currently represented object. If the user is on phone
// and in portrait mode, than, hide the tree menu
TreeNodeController.prototype.setObject = function (ngModel, domainObject) {
ngModel.selectedObject = domainObject;
if (this.agentService.isPhone() && this.agentService.isPortrait()) {
this.$scope.$emit('select-obj');
}
};
TreeNodeController.prototype.checkMobile = function () {
return this.agentService.isMobile();
};
return TreeNodeController; return TreeNodeController;
} }
); );