moutify

Author: n3o77

lib/browser.js

@@ -12,23 +12,27 @@ var cancelFrame = frame.cancel,
 
 var prime  = require("prime")
 
-var camelize        = require("prime/string/camelize"),
-    clean           = require("prime/string/clean"),
-    capitalize      = require("prime/string/capitalize"),
-    hyphenateString = require("prime/string/hyphenate")
+var camelCase       = require("mout/string/camelCase"),
+    trim            = require("mout/string/trim"),
+    properCase      = require("mout/string/properCase"),
+    hyphenateString = require("mout/string/hyphenate")
 
-var map     = require("prime/array/map"),
-    forEach = require("prime/array/forEach"),
-    indexOf = require("prime/array/indexOf")
+var map     = require("mout/array/map"),
+    forEach = require("mout/array/forEach"),
+    indexOf = require("mout/array/indexOf")
 
 var elements = require("elements")
 
 var fx = require("./fx")
 
 // util
 
+var clean = function(str) {
+    return trim(str).replace(/\s+/g, " ")
+}
+
 var matchString = function(s, r){
-    return String.prototype.match.call(s, r);
+    return String.prototype.match.call(s, r)
 }
 
 var hyphenated = {}
@@ -50,7 +54,7 @@ var compute = global.getComputedStyle ? function(node){
 } : /*(css3)?*/function(node){
     var cts = node.currentStyle
     return function(property){
-        return cts ? cts[camelize(property)] : ""
+        return cts ? cts[camelCase(property)] : ""
     }
 }/*:null*/
 
@@ -366,7 +370,7 @@ forEach(['Webkit', "Moz", "ms", "O", null], function(prefix){
     forEach([
         "transition", "transform", "transformOrigin", "transformStyle", "perspective", "perspectiveOrigin", "backfaceVisibility"
     ], function(style){
-        var cc = prefix ? prefix + capitalize(style) : style
+        var cc = prefix ? prefix + properCase(style) : style
         if (prefix === "ms") hyphenated[cc] = "-ms-" + hyphenate(style)
         if (test.style[cc] != null) aliases[style] = cc
     })
@@ -865,7 +869,7 @@ elements.implement({
         for (var property in styles){
 
             var value    = styles[property],
-                property = camelize(property)
+                property = camelCase(property)
 
             this.forEach(function(node){
                 length++
@@ -892,7 +896,7 @@ elements.implement({
 
         for (var property in styles){
             var value = styles[property],
-                set   = setter(property = camelize(property))
+                set   = setter(property = camelCase(property))
 
             this.forEach(function(node){
                 var self = elements(node), anims = self._animations, anim
@@ -907,7 +911,7 @@ elements.implement({
 
     compute: function(property){
 
-        property = camelize(property)
+        property = camelCase(property)
         var node = this[0]
 
         // return default matrix for transform, instead of parsed (for consistency)
@@ -927,7 +931,7 @@ elements.implement({
 })
 
 moofx.parse = function(property, value, normalize){
-    return (parsers[camelize(property)] || parse)(value, normalize)
+    return (parsers[camelCase(property)] || parse)(value, normalize)
 }
 
 module.exports = moofx

lib/frame.js

@@ -2,7 +2,7 @@
 requestFrame / cancelFrame
 */"use strict"
 
-var indexOf = require("prime/array/indexOf")
+var indexOf = require("mout/array/indexOf")
 
 var requestFrame = global.requestAnimationFrame ||
                    global.webkitRequestAnimationFrame ||

lib/fx.js

@@ -6,7 +6,7 @@ var prime        = require("prime"),
     requestFrame = require("./frame").request,
     bezier       = require("cubic-bezier")
 
-var map = require("prime/array/map")
+var map = require("mout/array/map")
 
 var sDuration    = "([\\d.]+)(s|ms)?",
     sCubicBezier = "cubic-bezier\\(([-.\\d]+),([-.\\d]+),([-.\\d]+),([-.\\d]+)\\)"

package.json

@@ -23,7 +23,8 @@
   "dependencies": {
     "cubic-bezier": "0.1",
     "prime": "0.3",
-    "elements": "0.2"
+    "elements": "0.2",
+    "mout": "~0.7.1"
   },
   "sources": [
     "./moofx.js"