Comparing version 0.2.1 to 0.2.2
@@ -222,5 +222,16 @@ var n = require('natives'), | ||
obj2 = n.url.parse(url2, true), | ||
obj = $.extend(true, {}, obj1, obj2); | ||
obj = {}; | ||
$.each(obj1, function(val, key) { | ||
if (val) { | ||
obj[key] = val; | ||
} | ||
}); | ||
$.each(obj2, function(val, key) { | ||
if (val) { | ||
obj[key] = val; | ||
} | ||
}); | ||
if (obj1.pathname.substr(-1) == '/' && obj2.pathname[0] == '/') { | ||
@@ -236,3 +247,2 @@ obj1.pathname = obj1.pathname.substr(0, obj1.pathname.length - 1); | ||
} | ||
/** | ||
@@ -239,0 +249,0 @@ * Resolve url considering a root dir, paths array and optionally host. |
{ | ||
"name": "ams", | ||
"description": "ams - asset management system - plugin enabled build tool with jquery like API", | ||
"version": "0.2.1", | ||
"version": "0.2.2", | ||
"author": "Oleg Slobodskoi <oleg008@gmail.com>", | ||
@@ -12,4 +12,5 @@ "repository": "git://github.com/kof/node-ams.git", | ||
"engines": { | ||
"node": "0.6.x" | ||
"node": ">=0.6.0 < 0.11.0" | ||
}, | ||
"engineStrict": true, | ||
"bin": {}, | ||
@@ -16,0 +17,0 @@ "dependencies": { |
262927
3511