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

[Fixed position] Incorporate numberfield control

Browse Source
This commit is contained in:
Aaron Doubek-Kraft
2017-06-26 11:07:20 -07:00
parent 542b7a6f20
commit a6079936e8
4 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,17 +53,10 @@ define(
proxy.fill = new AccessorMutator(element, 'fill');
//Expose x,y, width and height for editing
<<<<<<< HEAD
proxy.editWidth = new AccessorMutator(element, 'width');
proxy.editHeight = new AccessorMutator(element, 'height');
proxy.editX = new AccessorMutator(element, 'x');
proxy.editY = new AccessorMutator(element, 'y');
=======
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);
>>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
return proxy;
}

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

@@ -49,18 +49,11 @@ define(
*/
proxy.url = new AccessorMutator(element, 'url');
//Expose width and height properties for editing
<<<<<<< HEAD
//Expose x,y, width and height properties for editing
proxy.editWidth = new AccessorMutator(element, 'width');
proxy.editHeight = new AccessorMutator(element, 'height');
proxy.editX = new AccessorMutator(element, 'x');
proxy.editY = new AccessorMutator(element, 'y');
=======
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);
>>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
return proxy;
}

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

@@ -149,17 +149,11 @@ define(
};
// Expose endpoint coordinates for editing
<<<<<<< HEAD
proxy.editX1 = new AccessorMutator(element, 'x');
proxy.editY1 = new AccessorMutator(element, 'y');
proxy.editX2 = new AccessorMutator(element, 'x2');
proxy.editY2 = new AccessorMutator(element, 'y2');
=======
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);
>>>>>>> 39fe2fd7b6f0fd79e7f75ae9d04ba20d74d8e2c5
return proxy;
}