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

[Common UI] Remove obsolete checks

Browse Source 
Remove obsolete minimum/maximum checks, WTD-1363.
This commit is contained in:
Victor Woeltjen
2015-06-27 10:40:05 -07:00
parent a1eb15db77
commit c79b018c84
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
platform/commonUI/general/src/directives/MCTSplitPane.js
View File

@ -79,8 +79,6 @@ define(
* edge. * edge.
* * `anchor`: Plain string, one of "left", "right", "top", * * `anchor`: Plain string, one of "left", "right", "top",
* or "bottom". * or "bottom".
* * `maximum`: Maximum pixel width, as a literal numeric value
* * `minimum`: Minimum pixel width, as a literal numeric value
* *
* When used, an `mct-split-pane` element should contain exactly * When used, an `mct-split-pane` element should contain exactly
* three child elements, where the middle is an `mct-splitter` * three child elements, where the middle is an `mct-splitter`
@ -89,6 +87,12 @@ define(
* do not match this form, `mct-split-pane` will issue a warning * do not match this form, `mct-split-pane` will issue a warning
* and its behavior will be undefined. * and its behavior will be undefined.
* *
* This directive works by setting the width of the element
* nearest the anchor edge, and then positioning the other elements
* based on its observed width. As such, `min-width`, `max-width`,
* etc. can be set on that element to control the splitter's
* allowable positions.
*
* @constructor * @constructor
*/ */
function MCTSplitPane($parse, $log) { function MCTSplitPane($parse, $log) {
@ -101,8 +105,6 @@ define(
function controller($scope, $element, $attrs) { function controller($scope, $element, $attrs) {
var anchorKey = $attrs.anchor || DEFAULT_ANCHOR, var anchorKey = $attrs.anchor || DEFAULT_ANCHOR,
maximum = parseInt($attrs.maximum, 10),
minimum = parseInt($attrs.minimum, 10),
anchor, anchor,
styleValue = $attrs.initial, styleValue = $attrs.initial,
positionParsed = $parse($attrs.position), positionParsed = $parse($attrs.position),
@ -133,7 +135,7 @@ define(
first.css(anchor.edge, "0px"); first.css(anchor.edge, "0px");
first.css(anchor.dimension, styleValue); first.css(anchor.dimension, styleValue);
// Get actual size (to obey min-width) // Get actual size (to obey min-width etc.)
firstSize = getSize(first[0]); firstSize = getSize(first[0]);
splitter.css(anchor.edge, firstSize); splitter.css(anchor.edge, firstSize);
@ -158,15 +160,8 @@ define(
// Enforce minimum/maximum positions // Enforce minimum/maximum positions
function enforceExtrema() { function enforceExtrema() {
// Pick default min/max position = Math.max(position, 0);
var min = isNaN(minimum) ? 0 : minimum, position = Math.min(position, $element[0].offsetWidth);
max = isNaN(maximum) ?
Number.POSITIVE_INFINITY : maximum;
// Disallow a max greater than the element's size
max = Math.min($element[0].offsetWidth, max);
// Finally, restrict position to allowed min/max
position = Math.max(position, min);
position = Math.min(position, max);
} }
// Getter-setter for the pixel offset of the splitter, // Getter-setter for the pixel offset of the splitter,