aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-10 16:04:19 -0800
committerJohn Mayhew2012-02-10 16:04:19 -0800
commit730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch)
treec86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/lib
parentcde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/lib')
-rw-r--r--js/lib/NJUtils.js21
1 files changed, 21 insertions, 0 deletions
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