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

[Layout] Update on composition change

Browse Source 
Update frame positions when model.composition changes,
instead of when model changes. Ensures correct display
after changes to avoid redrawing on every update,
WTD-716.
This commit is contained in:
Victor Woeltjen
2015-01-27 10:22:50 -08:00
parent 0df809741a
commit 2b4517cff6
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/features/layout/src/LayoutController.js
View File

@ -66,9 +66,8 @@ define(
} }
// Compute panel positions based on the layout's object model // Compute panel positions based on the layout's object model
function lookupPanels(model) { function lookupPanels(ids) {
var configuration = $scope.configuration || {}, var configuration = $scope.configuration || {};
ids = (model || {}).composition || [];
// Pull panel positions from configuration // Pull panel positions from configuration
rawPositions = shallowCopy(configuration.panels || {}, ids); rawPositions = shallowCopy(configuration.panels || {}, ids);
@ -77,14 +76,14 @@ define(
positions = {}; positions = {};
// Update width/height that we are tracking // Update width/height that we are tracking
gridSize = (model || {}).layoutGrid || DEFAULT_GRID_SIZE; gridSize = ($scope.model || {}).layoutGrid || DEFAULT_GRID_SIZE;
// Compute positions and add defaults where needed // Compute positions and add defaults where needed
ids.forEach(populatePosition); ids.forEach(populatePosition);
} }
// Position panes when the model field changes // Position panes when the model field changes
$scope.$watch("model", lookupPanels); $scope.$watch("model.composition", lookupPanels);
return { return {
/** /**

12
platform/features/layout/test/LayoutControllerSpec.js
View File

@ -38,15 +38,15 @@ define(
// Model changes will indicate that panel positions // Model changes will indicate that panel positions
// may have changed, for instance. // may have changed, for instance.
it("watches for changes to model", function () { it("watches for changes to composition", function () {
expect(mockScope.$watch).toHaveBeenCalledWith( expect(mockScope.$watch).toHaveBeenCalledWith(
"model", "model.composition",
jasmine.any(Function) jasmine.any(Function)
); );
}); });
it("provides styles for frames, from configuration", function () { it("provides styles for frames, from configuration", function () {
mockScope.$watch.mostRecentCall.args[1](testModel); mockScope.$watch.mostRecentCall.args[1](testModel.composition);
expect(controller.getFrameStyle("a")).toEqual({ expect(controller.getFrameStyle("a")).toEqual({
top: "320px", top: "320px",
left: "640px", left: "640px",
@ -59,7 +59,7 @@ define(
var styleB, styleC; var styleB, styleC;
// b and c do not have configured positions // b and c do not have configured positions
mockScope.$watch.mostRecentCall.args[1](testModel); mockScope.$watch.mostRecentCall.args[1](testModel.composition);
styleB = controller.getFrameStyle("b"); styleB = controller.getFrameStyle("b");
styleC = controller.getFrameStyle("c"); styleC = controller.getFrameStyle("c");
@ -76,7 +76,7 @@ define(
it("allows panels to be dragged", function () { it("allows panels to be dragged", function () {
// Populate scope // Populate scope
mockScope.$watch.mostRecentCall.args[1](testModel); mockScope.$watch.mostRecentCall.args[1](testModel.composition);
// Verify precondtion // Verify precondtion
expect(testConfiguration.panels.b).not.toBeDefined(); expect(testConfiguration.panels.b).not.toBeDefined();
@ -95,7 +95,7 @@ define(
it("invokes commit after drag", function () { it("invokes commit after drag", function () {
// Populate scope // Populate scope
mockScope.$watch.mostRecentCall.args[1](testModel); mockScope.$watch.mostRecentCall.args[1](testModel.composition);
// Add a commit method to scope // Add a commit method to scope
mockScope.commit = jasmine.createSpy("commit"); mockScope.commit = jasmine.createSpy("commit");