aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 16:31:15 -0800
committerValerio Virgillito2012-02-09 16:31:15 -0800
commitc8720030e315d8c440354f54cf48f0c1464d72cb (patch)
treee168407720757717eafddf61590202670234dbbf /js
parent0ba8308fbeddd7a672ed50ddea4dcf47f10df6b9 (diff)
downloadninja-c8720030e315d8c440354f54cf48f0c1464d72cb.tar.gz
deleted old utils file and move single method into NJUtils
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/helper-classes/Utils.js33
-rw-r--r--js/lib/NJUtils.js21
2 files changed, 21 insertions, 33 deletions
diff --git a/js/helper-classes/Utils.js b/js/helper-classes/Utils.js
deleted file mode 100644
index 1cfc390e..00000000
--- a/js/helper-classes/Utils.js
+++ /dev/null
@@ -1,33 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7// Adding to the String Prototype little utility function to capitalize the first Char of a String.
8String.prototype.capitalizeFirstChar = function() {
9 return this.charAt(0).toUpperCase() + this.slice(1);
10};
11
12exports.utils = Object.create(Object.prototype, {
13
14 getValueAndUnits: {
15 value: function(str)
16 {
17 var numberValue = parseFloat(str);
18 // Ignore all whitespace, digits, negative sign and "." when looking for units label
19 // The units must come after one or more digits
20 var objRegExp = /(\-*\d+\.*\d*)(\s*)(\w*\%*)/;
21 var unitsString = str.replace(objRegExp, "$3");
22 if(unitsString)
23 {
24 var noSpaces = /(\s*)(\S*)(\s*)/;
25 // strip out spaces and convert to lower case
26 var match = (unitsString.replace(noSpaces, "$2")).toLowerCase();
27 }
28
29 return [numberValue, match];
30 }
31 }
32
33}); \ No newline at end of file
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index d6548871..0e886ae7 100644
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -183,6 +183,27 @@ exports.NJUtils = Object.create(Object.prototype, {
183 183
184 }, 184 },
185 185
186 // Returns the numerical value and unit string from a string.
187 // Useful for element properties.
188 // 100px will return the following array: [100, px]
189 getValueAndUnits: {
190 value: function(input) {
191 var numberValue = parseFloat(input);
192
193 // Ignore all whitespace, digits, negative sign and "." when looking for units label
194 // The units must come after one or more digits
195 var objRegExp = /(\-*\d+\.*\d*)(\s*)(\w*\%*)/;
196 var unitsString = input.replace(objRegExp, "$3");
197 if(unitsString) {
198 var noSpaces = /(\s*)(\S*)(\s*)/;
199 // strip out spaces and convert to lower case
200 var match = (unitsString.replace(noSpaces, "$2")).toLowerCase();
201 }
202
203 return [numberValue, match];
204 }
205 },
206
186 /* ================= Style methods ================= */ 207 /* ================= Style methods ================= */
187 208
188 ///// Get computed height of element 209 ///// Get computed height of element