Merge pull request kamicane#24 from chielkunkels/master

Bump prime and elements to their latest versions

lib/browser.js

@@ -10,17 +10,17 @@ var color  = require("./color"),
 var cancelFrame = frame.cancel,
     requestFrame = frame.request
 
-var prime  = require("prime"),
-    array  = require("prime/es5/array"),
-    string = require("prime/shell/string")
+var prime  = require("prime")
 
-var camelize   = string.camelize,
-    clean      = string.clean,
-    capitalize = string.capitalize
+var camelize        = require("prime/string/camelize"),
+    clean           = require("prime/string/clean"),
+    capitalize      = require("prime/string/capitalize"),
+    hyphenateString = require("prime/string/hyphenate"),
+    matchString     = String.prototype.match
 
-var map     = array.map,
-    forEach = array.forEach,
-    indexOf = array.indexOf
+var map     = require("prime/array/map"),
+    forEach = require("prime/array/forEach"),
+    indexOf = require("prime/array/indexOf")
 
 var elements = require("elements")
 
@@ -30,7 +30,7 @@ var fx = require("./fx")
 
 var hyphenated = {}
 var hyphenate = function(self){
-    return hyphenated[self] || (hyphenated[self] = string.hyphenate(self))
+    return hyphenated[self] || (hyphenated[self] = hyphenateString(self))
 }
 
 var round = function(n){
@@ -119,7 +119,7 @@ var parseColor = function(value, normalize){
 
 var parseLength = function(value, normalize){
     if (value == null || value === "") return normalize ? "0px" : ""
-    var match = string.match(value, rLengthNum)
+    var match = matchString(value, rLengthNum)
     return match ? match[1] + (match[2] || "px") : value // cannot be parsed. probably "auto"
 }
 
@@ -282,7 +282,7 @@ parsers.borderStyle = function(value, normalize){
 }
 
 parsers.borderColor = function(value, normalize){
-    if (!value || !(value = string.match(value, color.x))) return normalize ? mirror4(["rgba(0,0,0,1)"]).join(" ") : ""
+    if (!value || !(value = matchString(value, color.x))) return normalize ? mirror4(["rgba(0,0,0,1)"]).join(" ") : ""
     return clean(mirror4(map(value, function(v){
         return parseColor(v, normalize)
     })).join(" "))

lib/frame.js

@@ -2,7 +2,7 @@
 requestFrame / cancelFrame
 */"use strict"
 
-var array = require("prime/es5/array")
+var indexOf = require("prime/array/indexOf")
 
 var requestFrame = global.requestAnimationFrame ||
                    global.webkitRequestAnimationFrame ||
@@ -23,7 +23,7 @@ var iterator = function(time){
 }
 
 var cancel = function(callback){
-    var io = array.indexOf(callbacks, callback)
+    var io = indexOf(callbacks, callback)
     if (io > -1) callbacks.splice(io, 1)
 }
 

lib/fx.js

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

package.json

@@ -22,8 +22,8 @@
   },
   "dependencies": {
     "cubic-bezier": "0.1",
-    "prime": "0.1",
-    "elements": "0.1"
+    "prime": "0.3",
+    "elements": "0.2"
   },
   "sources": [
     "./moofx.js"