alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Layout] Consistent input behavior

Browse Source 
Inputs now handle invalid input consistently for all fields
This commit is contained in:
Doubek-Kraft
2017-06-23 11:42:52 -07:00
parent 64bf63c18a
commit 537656303a
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/layout/src/elements/BoxProxy.js
View File

@@ -52,9 +52,11 @@ define(
*/
proxy.fill = new AccessorMutator(element, 'fill');
//Expose width and height for editing
//Expose x,y, width and height for editing
proxy.editWidth = new AccessorMutator(element,'width', proxy.checkNumeric);
proxy.editHeight = new AccessorMutator(element,'height', proxy.checkNumeric);
proxy.editX = new AccessorMutator(element,'x',proxy.checkNumeric);
proxy.editY = new AccessorMutator(element,'y', proxy.checkNumeric);
return proxy;
}

8
platform/features/layout/src/elements/ElementProxy.js
View File

@@ -164,17 +164,17 @@ define(
* or the current value of the new value is invalid.
*/
ElementProxy.prototype.checkNumeric = function(value, current) {
// Allow field to be empty
var intValue = parseInt(value);
// Handle case of empty field by swapping in 0
if (value === ''){
return 0;
}
// Else, check if the input is integral, and not, return current value
// of the field
value = parseInt(value);
if ( isNaN(value) ){
if ( isNaN(intValue) ){
return current;
} else {
return value;
return intValue;
}
};

2
platform/features/layout/src/elements/ImageProxy.js
View File

@@ -52,6 +52,8 @@ define(
//Expose width and height properties for editing
proxy.editWidth = new AccessorMutator(element, 'width', proxy.checkNumeric);
proxy.editHeight = new AccessorMutator(element, 'height', proxy.checkNumeric);
proxy.editX = new AccessorMutator(element,'x',proxy.checkNumeric);
proxy.editY = new AccessorMutator(element,'y', proxy.checkNumeric);
return proxy;
}