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

Fixed objects being dropped twice in fixed layout

Browse Source
This commit is contained in:
Henry
2015-11-27 15:21:24 -08:00
parent 9a42cb4f7e
commit 6fb6f54cfa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/browse/src/BrowseObjectController.js
View File

@ -56,9 +56,11 @@ define(
} }
function updateQueryParam(viewKey) { function updateQueryParam(viewKey) {
var unlisten, priorRoute = $route.current; var unlisten,
priorRoute = $route.current,
editMode = $scope.domainObject && $scope.domainObject.hasCapability('editor');
if (viewKey) { if (viewKey && !editMode) {
$location.search('view', viewKey); $location.search('view', viewKey);
unlisten = $scope.$on('$locationChangeSuccess', function () { unlisten = $scope.$on('$locationChangeSuccess', function () {
// Checks path to make sure /browse/ is at front // Checks path to make sure /browse/ is at front

1
platform/features/layout/bundle.json
View File

@ -19,7 +19,6 @@
"type": "telemetry.panel", "type": "telemetry.panel",
"templateUrl": "templates/fixed.html", "templateUrl": "templates/fixed.html",
"uses": [ "composition" ], "uses": [ "composition" ],
"gestures": [ "drop" ],
"toolbar": { "toolbar": {
"sections": [ "sections": [
{ {