From 41ae67d209e0d238d1ceb07e6025d6d9e91f6ed7 Mon Sep 17 00:00:00 2001 From: nighca Date: Fri, 6 Feb 2015 10:26:23 +0800 Subject: [PATCH] bump to 2.0.2 --- bower.json | 2 +- dist/diff.js | 2 +- dist/diff.min.js | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 43d3d91..08c9f18 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "universal-diff", "main": "dist/index.js", - "version": "2.0.1", + "version": "2.0.2", "homepage": "https://github.com/nighca/universal-diff", "authors": [ "nighca " diff --git a/dist/diff.js b/dist/diff.js index 4867e02..3eb2d71 100644 --- a/dist/diff.js +++ b/dist/diff.js @@ -1,4 +1,4 @@ -/*! universal-diff v2.0.1 | nighca(nighca@live.cn) | Apache License(2.0) */ +/*! universal-diff v2.0.2 | nighca(nighca@live.cn) | Apache License(2.0) */ (function(global, undefined){ diff --git a/dist/diff.min.js b/dist/diff.min.js index dde671f..0608e83 100644 --- a/dist/diff.min.js +++ b/dist/diff.min.js @@ -1,2 +1,2 @@ -/*! universal-diff v2.0.1 | nighca(nighca@live.cn) | Apache License(2.0) */ +/*! universal-diff v2.0.2 | nighca(nighca@live.cn) | Apache License(2.0) */ !function(t){var n=0,r=1,e=2,i=3,f=-1,o=0,u=function(t,n){return t===n},c=function(t,r,f){var o=t.length,c=r.length,l=o+c,s=Array.apply(null,{length:c+o+1}).map(function(){return[]}),a=[],h=-1;f=f||u,a[l+1]=0;for(var p=0;l>=p&&-1===h;p++)for(var g,v,d,m=-p;p>=m&&-1===h;m+=2){for(m===-p||m!==p&&a[m-1+l]g&&c>v&&f(t[g],r[v]);)g++,v++,s[g][v]=n;a[m+l]=g,g>=o&&v>=c&&(h=p)}return s},l=c,s=function(t,u,c){for(var l=t.length,s=u.length,a=[],h=[],p=l,g=s;p>0||g>0;)switch(c[p][g]){case n:a.unshift(t[p-1]),h.unshift(o),p-=1,g-=1;break;case r:a.unshift(t[p-1]),h.unshift(u[g-1]),p-=1,g-=1;break;case e:a.unshift(t[p-1]),h.unshift(f),p-=1,g-=0;break;case i:a.unshift(f),h.unshift(u[g-1]),p-=0,g-=1}return{src:a,target:h}},a=function(t,n,r){var e,i,u,c,a,h=l(t,n,r),p=s(t,n,h),g=p.src,v=p.target,d=v.length,m=function(t){return t!==f},y=[];for(c=d-1;c>=0;){for(a=c;v[a]!==o&&a>=0;a--);c>a&&(e=g.slice(0,a+1).filter(m).length,i=g.slice(a+1,c+1).filter(m).length,u=v.slice(a+1,c+1).filter(m),y.unshift(u.length?[e,i,u]:[e,i])),c=a-1}return y},h=function(t,n){for(var r,e=t.slice(),i=n.length-1;i>=0;i--){r=n[i];var f=r[2];f&&(r=r.slice(0,2).concat(f)),e.splice.apply(e,r)}return e},p=function(t,n,r){r="string"==typeof r?r:"";var e=t.split(r),i=n.split(r),f=a(e,i);return f.forEach(function(t){t[2]&&(t[2]=t[2].join(r))}),{splitter:r,diff:f}},g=function(t,n){for(var r,e=n.splitter,i=n.diff,f=t.split(e),o=i.length-1;o>=0;o--)r=i[o],f.splice.apply(f,r);return f.join(e)},v={coreCompare:l,compare:a,merge:h,compareStr:p,mergeStr:g};"function"==typeof define?define(function(){return v}):"undefined"!=typeof exports?module.exports=v:t.diff=v}(this); \ No newline at end of file diff --git a/package.json b/package.json index b014616..fb6acbb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "universal-diff", - "version": "2.0.1", + "version": "2.0.2", "description": "universal diff & merge algorithm realized with Javascript (between arbitrary scequences)", "main": "dist/diff.js", "directories": {