diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js index e6e66574d8..e7d72c9095 100644 --- a/platform/features/fixed/bundle.js +++ b/platform/features/fixed/bundle.js @@ -152,57 +152,65 @@ define([ "text": "X", "name": "X", "cssClass": "l-input-sm", - "control": "textfield" + "control": "numberfield", + "min": "0" }, { "property": "editY", "text": "Y", "name": "Y", "cssClass": "l-input-sm", - "control": "textfield" + "control": "numberfield", + "min": "0" }, { "property": "editX1", "text": "X1", "name": "X1", "cssClass": "l-input-sm", - "control" : "textfield" + "control" : "numberfield", + "min": "0" }, { "property": "editY1", "text": "Y1", "name": "Y1", "cssClass": "l-input-sm", - "control" : "textfield" + "control" : "numberfield", + "min": 0 }, { "property": "editX2", "text": "X2", "name": "X2", "cssClass": "l-input-sm", - "control" : "textfield" + "control" : "numberfield", + "min": "0" }, { "property": "editY2", "text": "Y2", "name": "Y2", "cssClass": "l-input-sm", - "control" : "textfield" + "control" : "numberfield", + "min": "0" }, { "property": "editHeight", "text": "H", "name": "H", - "cssClass": "l-input-sm numerical", - "control": "textfield", - "description": "Resize change object height" + "cssClass": "l-input-sm", + "control": "numberfield", + "description": "Resize change object height", + "min": "1" }, { "property": "editWidth", "text": "W", "name": "W", - "cssClass": "l-input-sm numerical", - "control": "textfield" + "cssClass": "l-input-sm", + "control": "numberfield", + "min": "1" } ] }, diff --git a/platform/features/layout/src/elements/BoxProxy.js b/platform/features/layout/src/elements/BoxProxy.js index 1429605710..6d80d8c1f9 100644 --- a/platform/features/layout/src/elements/BoxProxy.js +++ b/platform/features/layout/src/elements/BoxProxy.js @@ -53,10 +53,10 @@ define( proxy.fill = new AccessorMutator(element, 'fill'); //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); + proxy.editWidth = new AccessorMutator(element, 'width'); + proxy.editHeight = new AccessorMutator(element, 'height'); + proxy.editX = new AccessorMutator(element, 'x'); + proxy.editY = new AccessorMutator(element, 'y'); return proxy; } diff --git a/platform/features/layout/src/elements/ElementProxy.js b/platform/features/layout/src/elements/ElementProxy.js index a6d3c16aed..7d75219adb 100644 --- a/platform/features/layout/src/elements/ElementProxy.js +++ b/platform/features/layout/src/elements/ElementProxy.js @@ -156,28 +156,6 @@ define( return this.resizeHandles; }; - /** - * Ensure and input type is numeric: intended to be passed as the - * updater argument to an AccessorMutator object in order to restrict - * input to integer values only. - * @return Either the string '' (for no input), the new value passed in, - * or the current value of the new value is invalid. - */ - ElementProxy.prototype.checkNumeric = function (value, current) { - 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 - if (isNaN(intValue)) { - return current; - } else { - return intValue; - } - }; - return ElementProxy; } ); diff --git a/platform/features/layout/src/elements/ImageProxy.js b/platform/features/layout/src/elements/ImageProxy.js index 7664919187..3c589b8fe4 100644 --- a/platform/features/layout/src/elements/ImageProxy.js +++ b/platform/features/layout/src/elements/ImageProxy.js @@ -50,10 +50,10 @@ define( proxy.url = new AccessorMutator(element, 'url'); //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); + proxy.editWidth = new AccessorMutator(element, 'width'); + proxy.editHeight = new AccessorMutator(element, 'height'); + proxy.editX = new AccessorMutator(element, 'x'); + proxy.editY = new AccessorMutator(element, 'y'); return proxy; } diff --git a/platform/features/layout/src/elements/LineProxy.js b/platform/features/layout/src/elements/LineProxy.js index a85ee3266f..e121561061 100644 --- a/platform/features/layout/src/elements/LineProxy.js +++ b/platform/features/layout/src/elements/LineProxy.js @@ -149,10 +149,10 @@ define( }; // Expose endpoint coordinates for editing - proxy.editX1 = new AccessorMutator(element, 'x', proxy.checkNumeric); - proxy.editY1 = new AccessorMutator(element, 'y', proxy.checkNumeric); - proxy.editX2 = new AccessorMutator(element, 'x2', proxy.checkNumeric); - proxy.editY2 = new AccessorMutator(element, 'y2', proxy.checkNumeric); + proxy.editX1 = new AccessorMutator(element, 'x'); + proxy.editY1 = new AccessorMutator(element, 'y'); + proxy.editX2 = new AccessorMutator(element, 'x2'); + proxy.editY2 = new AccessorMutator(element, 'y2'); return proxy; }