From 482f355a08a0912cbba8e2b171f7e08999b3cb60 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 25 Jun 2015 11:00:15 -0700 Subject: [PATCH] [Fixed Controller] Stop tracking bounds Stop tracking size of a fixed position view; no longer necessary now that background grid is handled by CSS. Change made in the context of WTD-1344. --- .../features/layout/res/templates/fixed.html | 9 ++++----- platform/features/layout/src/FixedController.js | 16 +--------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/platform/features/layout/res/templates/fixed.html b/platform/features/layout/res/templates/fixed.html index fb537d6ff9..25639c2997 100644 --- a/platform/features/layout/res/templates/fixed.html +++ b/platform/features/layout/res/templates/fixed.html @@ -20,14 +20,13 @@ at runtime from the About dialog for additional information. -->
+ ng-controller="FixedController as controller">
-
-
@@ -60,4 +59,4 @@
- \ No newline at end of file + diff --git a/platform/features/layout/src/FixedController.js b/platform/features/layout/src/FixedController.js index 09e964f42c..5ebdb4a1c6 100644 --- a/platform/features/layout/src/FixedController.js +++ b/platform/features/layout/src/FixedController.js @@ -27,8 +27,7 @@ define( "use strict"; var DEFAULT_DIMENSIONS = [ 2, 1 ], - DEFAULT_GRID_SIZE = [64, 16], - DEFAULT_GRID_EXTENT = [4, 4]; + DEFAULT_GRID_SIZE = [64, 16]; /** * The FixedController is responsible for supporting the @@ -40,7 +39,6 @@ define( */ function FixedController($scope, $q, dialogService, telemetrySubscriber, telemetryFormatter) { var gridSize = DEFAULT_GRID_SIZE, - gridExtent = DEFAULT_GRID_EXTENT, dragging, subscription, elementProxies = [], @@ -284,18 +282,6 @@ define( getGridSize: function () { return gridSize; }, - /** - * Set the size of the viewable fixed position area. - * @memberof FixedController# - * @param bounds the width/height, as reported by mct-resize - */ - setBounds: function (bounds) { - var w = Math.ceil(bounds.width / gridSize[0]), - h = Math.ceil(bounds.height / gridSize[1]); - if (w !== gridExtent[0] || h !== gridExtent[1]) { - gridExtent = [w, h]; - } - }, /** * Get an array of elements in this panel; these are * decorated proxies for both selection and display.