Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/ninja.reel/ninja.html
	js/stage/stage.reel/stage.html

1 files changed, 21 insertions, 0 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 74039e64..8daafa42 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -183,6 +183,27 @@ exports.NJUtils = Object.create(Object.prototype, {
         
     },
 
+    // Returns the numerical value and unit string from a string.
+    // Useful for element properties.
+    // 100px will return the following array: [100, px]
+    getValueAndUnits: {
+        value: function(input) {
+            var numberValue = parseFloat(input);
+
+            // Ignore all whitespace, digits, negative sign and "." when looking for units label
+            // The units must come after one or more digits
+            var objRegExp = /(\-*\d+\.*\d*)(\s*)(\w*\%*)/;
+            var unitsString = input.replace(objRegExp, "$3");
+            if(unitsString) {
+                var noSpaces = /(\s*)(\S*)(\s*)/;
+                // strip out spaces and convert to lower case
+                var match = (unitsString.replace(noSpaces, "$2")).toLowerCase();
+            }
+
+            return [numberValue, match];
+        }
+    },
+
     /* ================= Style methods ================= */
     
     ///// Get computed height of element