merge - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

merge.js

		/*!
		* @name JavaScript/NodeJS Merge v1.1.1
		* @name JavaScript/NodeJS Merge v1.1.2
		* @author yeikos
		@@ -4,0 +4,0 @@ * @repository https://github.com/yeikos/js.merge

merge.min.js

		@@ -1,3 +0,3 @@
		/! JavaScript/NodeJS Merge v1.1.1 \| Copyright 2013 yeikos - MIT license \| https://github.com/yeikos/js.merge /
		/! JavaScript/NodeJS Merge v1.1.2 \| Copyright 2013 yeikos - MIT license \| https://github.com/yeikos/js.merge /

		;(function(e){function t(){var e=Array.prototype.slice.call(arguments),t=e.shift(),i=t===true,s=e.length,o,u,a;if(i\|\|r(t)!=="object")t={};for(u=0;u<s;++u)if(r(o=e[u])==="object")for(a in o)t[a]=i?n(o[a]):o[a];return t}function n(e){var t=e,i=r(e),s,o;if(i==="array"){t=[];o=e.length;for(s=0;s<o;++s)t[s]=n(e[s])}else if(i==="object"){t={};for(s in e)t[s]=n(e[s])}return t}function r(e){return{}.toString.call(e).match(/\s([\w]+)/)[1].toLowerCase()}if(e){module.exports=t}else{window.merge=t}})(typeof module==="object"&&module&&typeof module.exports==="object"&&module.exports);

package.json

		{

		"name": "merge",
		"version": "1.1.1",
		"version": "1.1.2",
		"author": "yeikos (http://www.yeikos.com)",
		@@ -6,0 +6,0 @@ "description": "JavaScript/NodeJS Merge is a tool to merge multiple objects into one object, with the possibility of create a new object cloned. His operation is very similar to the jQuery.extend function but more flexible.",

README.md

		@@ -1,2 +0,2 @@
		JavaScript/NodeJS Merge v1.1.1
		JavaScript/NodeJS Merge v1.1.2
		==================================================
		@@ -32,3 +32,3 @@

		<script src="http://yeikos.googlecode.com/files/merge.js"></script>
		<script src="http://files.yeikos.com/merge.js"></script>

		@@ -35,0 +35,0 @@ <script>

tests/index.html

Sorry, the diff of this file is not supported yet

		@@ -1,3 +0,3 @@
		/! JavaScript/NodeJS Merge v1.1.1 \| Copyright 2013 yeikos - MIT license \| https://github.com/yeikos/js.merge /
		/! JavaScript/NodeJS Merge v1.1.2 \| Copyright 2013 yeikos - MIT license \| https://github.com/yeikos/js.merge /

		;(function(e){function t(){var e=Array.prototype.slice.call(arguments),t=e.shift(),i=t===true,s=e.length,o,u,a;if(i\|\|r(t)!=="object")t={};for(u=0;u<s;++u)if(r(o=e[u])==="object")for(a in o)t[a]=i?n(o[a]):o[a];return t}function n(e){var t=e,i=r(e),s,o;if(i==="array"){t=[];o=e.length;for(s=0;s<o;++s)t[s]=n(e[s])}else if(i==="object"){t={};for(s in e)t[s]=n(e[s])}return t}function r(e){return{}.toString.call(e).match(/\s([\w]+)/)[1].toLowerCase()}if(e){module.exports=t}else{window.merge=t}})(typeof module==="object"&&module&&typeof module.exports==="object"&&module.exports);

New alerts