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

Object has no children fix (#2038)

Browse Source 
* Added files for PR 1904

* Added new lines

* space fix

* Implemented changes

* Space fix

* checkstyle fix

Fixes #1826
This commit is contained in:
Aayush Arora (angularboy) 2018-06-30 00:27:45 +05:30 committed by Pete Richards
parent b8f278cabf
commit eaa9514453
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ define([
{ {
"key": "mctTree", "key": "mctTree",
"implementation": MCTTree, "implementation": MCTTree,
"depends": ['gestureService'] "depends": ['gestureService', 'openmct']
}, },
{ {
"key": "mctPreview", "key": "mctPreview",

5
platform/commonUI/general/src/directives/MCTTree.js
View File

@ -24,7 +24,7 @@ define([
'angular', 'angular',
'../ui/TreeView' '../ui/TreeView'
], function (angular, TreeView) { ], function (angular, TreeView) {
function MCTTree(gestureService) { function MCTTree(gestureService, openmct) {
function link(scope, element) { function link(scope, element) {
if (!scope.allowSelection) { if (!scope.allowSelection) {
scope.allowSelection = function () { scope.allowSelection = function () {
@ -34,8 +34,9 @@ define([
if (!scope.onSelection) { if (!scope.onSelection) {
scope.onSelection = function () {}; scope.onSelection = function () {};
} }
var currentSelection = scope.selectedObject; var currentSelection = scope.selectedObject;
var treeView = new TreeView(gestureService); var treeView = new TreeView(gestureService, openmct);
function setSelection(domainObject, event) { function setSelection(domainObject, event) {
if (currentSelection === domainObject) { if (currentSelection === domainObject) {

12
platform/commonUI/general/src/ui/TreeNodeView.js
View File

@ -27,9 +27,9 @@ define([
'./TreeLabelView' './TreeLabelView'
], function ($, nodeTemplate, ToggleView, TreeLabelView) { ], function ($, nodeTemplate, ToggleView, TreeLabelView) {
function TreeNodeView(gestureService, subtreeFactory, selectFn) { function TreeNodeView(gestureService, subtreeFactory, selectFn, openmct) {
this.li = $('<li>'); this.li = $('<li>');
this.openmct = openmct;
this.statusClasses = []; this.statusClasses = [];
this.toggleView = new ToggleView(false); this.toggleView = new ToggleView(false);
@ -81,12 +81,15 @@ define([
} }
this.activeObject = domainObject; this.activeObject = domainObject;
if (domainObject && domainObject.hasCapability('adapter')) {
if (domainObject && domainObject.hasCapability('composition')) { var obj = domainObject.useCapability('adapter');
var hasComposition = this.openmct.composition.get(obj) !== undefined;
if (hasComposition) {
$(this.toggleView.elements()).removeClass('no-children'); $(this.toggleView.elements()).removeClass('no-children');
} else { } else {
$(this.toggleView.elements()).addClass('no-children'); $(this.toggleView.elements()).addClass('no-children');
} }
}
if (domainObject && domainObject.hasCapability('status')) { if (domainObject && domainObject.hasCapability('status')) {
this.unlisten = domainObject.getCapability('status') this.unlisten = domainObject.getCapability('status')
@ -150,6 +153,5 @@ define([
return this.li; return this.li;
}; };
return TreeNodeView; return TreeNodeView;
}); });

8
platform/commonUI/general/src/ui/TreeView.js
View File

@ -26,17 +26,18 @@ define([
'text!../../res/templates/tree/wait-node.html' 'text!../../res/templates/tree/wait-node.html'
], function ($, TreeNodeView, spinnerTemplate) { ], function ($, TreeNodeView, spinnerTemplate) {
function TreeView(gestureService, selectFn) { function TreeView(gestureService, openmct, selectFn) {
this.ul = $('<ul class="tree"></ul>'); this.ul = $('<ul class="tree"></ul>');
this.nodeViews = []; this.nodeViews = [];
this.callbacks = []; this.callbacks = [];
this.selectFn = selectFn || this.value.bind(this); this.selectFn = selectFn || this.value.bind(this);
this.gestureService = gestureService; this.gestureService = gestureService;
this.pending = false; this.pending = false;
this.openmct = openmct;
} }
TreeView.prototype.newTreeView = function () { TreeView.prototype.newTreeView = function () {
return new TreeView(this.gestureService, this.selectFn); return new TreeView(this.gestureService, this.openmct, this.selectFn);
}; };
TreeView.prototype.setSize = function (sz) { TreeView.prototype.setSize = function (sz) {
@ -46,7 +47,8 @@ define([
nodeView = new TreeNodeView( nodeView = new TreeNodeView(
this.gestureService, this.gestureService,
this.newTreeView.bind(this), this.newTreeView.bind(this),
this.selectFn this.selectFn,
this.openmct
); );
this.nodeViews.push(nodeView); this.nodeViews.push(nodeView);
this.ul.append($(nodeView.elements())); this.ul.append($(nodeView.elements()));