From 1e71c229395d005b78257de07099d5f3d5c9aadc Mon Sep 17 00:00:00 2001 From: adrianiainlam <adrianiainlam@gmail.com> Date: Mon, 9 May 2016 02:01:11 +0100 Subject: [PATCH] fix issue zzyss86/LunarCalendar#4 author of this fix: cllu (<https://github.com/zzyss86/LunarCalendar/pull/5>) --- lib/LunarCalendar.js | 4 ++-- lib/LunarCalendar.min.js | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 lib/LunarCalendar.min.js diff --git a/lib/LunarCalendar.js b/lib/LunarCalendar.js index f7f06a3..5f38c95 100644 --- a/lib/LunarCalendar.js +++ b/lib/LunarCalendar.js @@ -282,8 +282,8 @@ * å ©åå ¬ææ¥æä¹éçå¤©æ¸ */ function getDaysBetweenSolar(year, month, day, year1, month1, day1){ - var date = new Date(year,month,day).getTime(); - var date1 = new Date(year1,month1,day1).getTime(); + var date = Date.UTC(year,month,day); + var date1 = Date.UTC(year1,month1,day1); return (date1-date) / 86400000; }; diff --git a/lib/LunarCalendar.min.js b/lib/LunarCalendar.min.js deleted file mode 100644 index fbda02f..0000000 --- a/lib/LunarCalendar.min.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * ååï¼é´åï¼ä¸å¹´å - * LunarCalendarï¼NPM NAME:lunar-calendar - * vervison : v0.1.4 - * Github : https://github.com/zzyss86/LunarCalendar - * HomePage : http://www.tuijs.com/ - * Author : JasonZhou - * Email : zzyss86@qq.com - */ -!function(){function a(a){var b=H[a-B];return b[0]}function b(a){for(var b=H[a-B],c=b[0],d=b[3].toString(2),e=d.split(""),f=0;f<16-e.length;f++)e.unshift(0);for(var g=c?13:12,h=0,i=[],f=0;g>f;f++)0==e[f]?(h+=29,i.push(29)):(h+=30,i.push(30));return{yearDays:h,monthDays:i}}function c(a,c){for(var d=b(a),e=c>0?c:d.yearDays-Math.abs(c),f=d.monthDays,g=0,h=0,i=0;i<f.length;i++)if(g+=f[i],g>e){h=i,g-=f[i];break}return[a,h,e-g+1]}function d(a,b,d){var f=H[a-B],g=f[1],h=f[2],i=e(a,g-1,h,a,b,d);if(0==i)return[a,0,1];var j=i>0?a:a-1;return c(j,i)}function e(a,b,c,d,e,f){var g=new Date(a,b,c).getTime(),h=new Date(d,e,f).getTime();return(h-g)/864e5}function f(a,c,d){for(var e=b(a),f=e.monthDays,g=0,h=0;h<f.length&&c>h;h++)g+=f[h];return g+d-1}function g(a,b){var c=new Date(31556925974.7*(a-1890)+6e4*I[b]+Date.UTC(1890,0,5,16,2,31));return c.getUTCDate()}function h(a){for(var b={},c=0,d=0;24>d;d++){var e=g(a,d);d%2==0&&c++,b[A(c-1,e)]=D.solarTerm[d]}return b}function i(a){var b=a-1890+25;return D.zodiac[b%12]}function j(a){return D.heavenlyStems[a%10]+D.earthlyBranches[a%12]}function k(a,b){return b=b||0,j(a-1890+25+b)}function l(a,b,c){return c=c||0,j(12*(a-1890)+b+12+c)}function m(a,b,c){var d=Date.UTC(a,b,c)/864e5+29219+18;return j(d)}function n(a,b){var c=[31,o(a)?29:28,31,30,31,30,31,31,30,31,30,31];return c[b]}function o(a){return a%4==0&&a%100!=0||a%400==0}function p(a,b,c,d){var e=arguments.length,f=new Date;return a=e?parseInt(a,10):f.getFullYear(),b=e?parseInt(b-1,10):f.getMonth(),c=e?parseInt(c,10)||f.getDate():f.getDate(),(d?d:B+1)>a||a>C?{error:100,msg:x[100]}:{year:a,month:b,day:c}}function q(a,b,c){var d=p(a,b,c);if(d.error)return d;var e=d.year,g=d.month,h=d.day,i=f(e,g,h),j=H[e-B],k=j[1],l=j[2],m=new Date(e,k-1,l).getTime()+864e5*i;return m=new Date(m),{year:m.getFullYear(),month:m.getMonth()+1,day:m.getDate()}}function r(c,e,f){var j=p(c,e,f,B);if(j.error)return j;var n=j.year,o=j.month,q=j.day;z.setCurrent(n);var r=z.get("term2")?z.get("term2"):z.set("term2",g(n,2)),s=z.get("termList")?z.get("termList"):z.set("termList",h(n)),t=g(n,2*o),u=o>1||1==o&&q>=r?n+1:n,v=q>=t?o+1:o,w=d(n,o,q),x=a(w[0]),y="";y=x>0&&x==w[1]?"é"+D.monthCn[w[1]-1]+"æ":x>0&&w[1]>x?D.monthCn[w[1]-1]+"æ":D.monthCn[w[1]]+"æ";var C="",H=b(w[0]).monthDays;C=w[1]==H.length-1&&w[2]==H[H.length-1]?G.d0100:x>0&&w[1]>x?G[A(w[1]-1,w[2])]:G[A(w[1],w[2])];var I={zodiac:i(u),GanZhiYear:k(u),GanZhiMonth:l(n,v),GanZhiDay:m(n,o,q),worktime:E["y"+n]&&E["y"+n][A(o,q)]?E["y"+n][A(o,q)]:0,term:s[A(o,q)],lunarYear:w[0],lunarMonth:w[1]+1,lunarDay:w[2],lunarMonthName:y,lunarDayName:D.dateCn[w[2]-1],lunarLeapMonth:x,solarFestival:F[A(o,q)],lunarFestival:C};return I}function s(a,b,c){var d=p(a,b);if(d.error)return d;for(var e=d.year,f=d.month,g=t(e,f+1,c),h=0;h<g.monthData.length;h++){var i=g.monthData[h],j=r(i.year,i.month,i.day);v(g.monthData[h],j)}return g}function t(a,b,c){var d=p(a,b);if(d.error)return d;var e,f,g,h=d.year,i=d.month,j=new Date(h,i,1),k={firstDay:j.getDay(),monthDays:n(h,i),monthData:[]};if(k.monthData=w(h,i+1,k.monthDays,1),c){if(k.firstDay>0){var l=0>i-1?h-1:h,m=0>i-1?11:i-1;e=n(l,m),f=w(l,m+1,k.firstDay,e-k.firstDay+1),k.monthData=f.concat(k.monthData)}if(42-k.monthData.length!=0){var o=i+1>11?h+1:h,q=i+1>11?0:i+1,r=42-k.monthData.length;g=w(o,q+1,r,1),k.monthData=k.monthData.concat(g)}}return k}function u(a){v(E,a)}var v=function(a,b){if(a&&b&&"object"==typeof b)for(var c in b)a[c]=b[c];return a},w=function(a,b,c,d){var e=[];if(d=d||0,1>c)return e;for(var f=d,g=0;c>g;g++)e.push({year:a,month:b,day:f}),f++;return e},x={100:"è¼¸å ¥çå¹´ä»½è¶ éäºå¯æ¥è©¢ç¯åï¼å æ¯æ1891è³2100å¹´",101:"åæ¸è¼¸å ¥é¯èª¤ï¼è«æ¥é±ææª"},y=null,z={current:"",setCurrent:function(a){this.current!=a&&(this.current=a,this.clear())},set:function(a,b){return y||(y={}),y[a]=b,y[a]},get:function(a){return y||(y={}),y[a]},clear:function(){y=null}},A=function(a,b){return a+=1,a=10>a?"0"+a:a,b=10>b?"0"+b:b,"d"+a+b},B=1890,C=2100,D={heavenlyStems:["ç²","ä¹","ä¸","ä¸","æ","å·±","åº","è¾","壬","ç¸"],earthlyBranches:["å","ä¸","å¯ ","å¯","è¾°","å·³","å","æª","ç³","é ","æ","亥"],zodiac:["é¼ ","ç","è","å ","é¾","è","馬","ç¾","ç´","é","ç","豬"],solarTerm:["å°å¯","大å¯","ç«æ¥","鍿°´","é©è","æ¥å","æ¸ æ","ç©é¨","ç«å¤","å°æ»¿","è種","å¤è³","å°æ","大æ","ç«ç§","èæ","ç½é²","ç§å","å¯é²","éé","ç«å¬","å°éª","大éª","å¬è³"],monthCn:["æ£","äº","ä¸","å","äº","å ","ä¸","å «","ä¹","å","åä¸","åäº"],dateCn:["åä¸","åäº","åä¸","åå","åäº","åå ","åä¸","åå «","åä¹","åå","åä¸","åäº","åä¸","åå","åäº","åå ","åä¸","åå «","åä¹","äºå","廿ä¸","廿äº","廿ä¸","廿å","廿äº","廿å ","廿ä¸","å»¿å «","廿ä¹","ä¸å","å ä¸"]},E={};E.y2013={d0101:2,d0102:2,d0103:2,d0105:1,d0106:1,d0209:2,d0210:2,d0211:2,d0212:2,d0213:2,d0214:2,d0215:2,d0216:1,d0217:1,d0404:2,d0405:2,d0406:2,d0407:1,d0427:1,d0428:1,d0429:2,d0430:2,d0501:2,d0608:1," d0609":1,d0610:2,d0611:2,d0612:2,d0919:2,d0920:2,d0921:2,d0922:1,d0929:1,d1001:2,d1002:2,d1003:2,d1004:2,d1005:2,d1006:2,d1007:2,d1012:1},E.y2014={d0101:2,d0126:1,d0131:2,d0201:2,d0202:2,d0203:2,d0204:2,d0205:2,d0206:2,d0208:1,d0405:2,d0407:2,d0501:2,d0502:2,d0503:2,d0504:1,d0602:2,d0908:2,d0928:1,d1001:2,d1002:2,d1003:2,d1004:2,d1005:2," d1006":2,d1007:2,d1011:1};var F={d0101:"å æ¦ç¯",d0202:"ä¸çæ¿å°æ¥",d0210:"åéæ°£è±¡ç¯",d0214:"æ 人ç¯",d0228:"228åå¹³ç´å¿µæ¥",d0301:"åéæµ·è±¹æ¥",d0308:"婦女ç¯",d0312:"æ¤æ¨¹ç¯å«ä¸å±±éä¸ç´å¿µæ¥",d0314:"åéè¦å¯æ¥",d0315:"æ¶è²»è æ¬çæ¥",d0321:"ä¸çæ£®ææ¥ æ¶é¤ç¨®ææ§è¦å鿥 ä¸çå ææ¥",d0322:"ä¸çæ°´æ¥",d0323:"ä¸ç氣象æ¥",d0324:"ä¸ç鲿²»çµæ ¸ç æ¥",d0329:"éå¹´ç¯",d0330:"巴忝å¦å忥",d0401:"æäººç¯",d0404:"å ç«¥ç¯",d0407:"ä¸çè¡çæ¥",d0422:"ä¸çå°çæ¥",d0423:"ä¸ç忏åçæ¬æ¥",d0424:"äºéæ°èå·¥ä½è æ¥",d0501:"ååç¯",d0504:"éå¹´ç¯",d0508:"ä¸çç´ å忥",d0512:"åéè·å£«ç¯",d0515:"åéå®¶åºæ¥",d0517:"ä¸çé»ä¿¡æ¥",d0518:"åéåç©é¤¨æ¥",d0520:"å ¨åå¸çç餿¥",d0522:"åéçç©å¤æ¨£æ§æ¥",d0523:"åéç奶æ¥",d0531:"ä¸çç¡è¸æ¥",d0601:"åéå ç«¥ç¯",d0605:"ä¸çç°å¢æ¥",d0625:"å ¨ååå°æ¥",d0626:"åéç¦æ¯æ¥",d0702:"åéé«è²è¨è æ¥",d0707:"ææ¥æ°çç´å¿µæ¥",d0711:"ä¸çäººå£æ¥",d0730:"éæ´²å©¦å¥³æ¥",d0808:"ç¶è¦ªç¯",d0909:"è»äººç¯",d0908:"åéæç²æ¥åéæ°èå·¥ä½è æ¥",d0914:"ä¸çæ¸ æ½å°çæ¥",d0916:"åéèæ°§å±¤ä¿è·æ¥",d0920:"åéæçæ¥",d0927:"ä¸çæ 鿥",d0928:"æå¸«ç¯ ååèªè¾°",d1001:"åæ ¶ç¯ä¸ç鳿¨æ¥åéè人ç¯",d1002:"åéåå¹³èæ°ä¸»èªç±é¬¥çæ¥",d1004:"ä¸çåç©æ¥",d1008:"å ¨åé«è¡å£æ¥ä¸çè¦è¦ºæ¥",d1009:"ä¸ç鵿¿æ¥è¬åéµè¯æ¥",d1010:"åæ ¶æ¥ ä¸çç²¾ç¥è¡çæ¥",d1013:"ä¸çä¿å¥æ¥åéæå¸«ç¯",d1014:"ä¸çæ¨æºæ¥",d1015:"åéç²äººç¯(ç½ææç¯)",d1016:"ä¸çç³§é£æ¥",d1017:"ä¸çæ¶é¤è²§å°æ¥",d1022:"ä¸çå³çµ±é«è¥æ¥",d1024:"è¯å忥ä¸çç¼å±ä¿¡æ¯æ¥",d1025:"å 復ç¯",d1031:"è¬èç¯",d1110:"ä¸çéå¹´ç¯",d1111:"åéç§å¸èåå¹³å¨(æ¬æ¥æå±¬çä¸é±)",d1112:"å«ä¸å±±èªè¾°ç´å¿µæ¥",d1114:"ä¸çç³å°¿ç æ¥",d1117:"åé大å¸çç¯ä¸çå¸çç¯",d1121:"ä¸çå忥ä¸çé»è¦æ¥",d1129:"åéè²æ´å·´åæ¯å¦äººæ°å鿥",d1201:"ä¸çææ»ç æ¥",d1203:"ä¸çæ®ç¾äººæ¥",d1205:"åéç¶æ¿å社æç¼å±å¿é¡äººå¡æ¥",d1208:"åéå ç«¥é»è¦æ¥",d1209:"ä¸çè¶³çæ¥",d1210:"ä¸çäººæ¬æ¥",d1221:"åéç±çæ¥",d1224:"å¹³å®å¤",d1225:"è¡æ²ç´å¿µæ¥ èèªç¯"},G={d0101:"æ¥ç¯",d0115:"å 宵ç¯",d0323:"媽ç¥çè¾°",d0505:"端åç¯",d0707:"ä¸å¤æ 人ç¯",d0715:"ä¸å ç¯",d0815:"ä¸ç§ç¯",d0909:"éé½ç¯",d1015:"ä¸å ç¯",d1208:"èå «ç¯",d1223:"å°å¹´",d0100:"é¤å¤"},H=[[2,1,21,22184],[0,2,9,21936],[6,1,30,9656],[0,2,17,9584],[0,2,6,21168],[5,1,26,43344],[0,2,13,59728],[0,2,2,27296],[3,1,22,44368],[0,2,10,43856],[8,1,30,19304],[0,2,19,19168],[0,2,8,42352],[5,1,29,21096],[0,2,16,53856],[0,2,4,55632],[4,1,25,27304],[0,2,13,22176],[0,2,2,39632],[2,1,22,19176],[0,2,10,19168],[6,1,30,42200],[0,2,18,42192],[0,2,6,53840],[5,1,26,54568],[0,2,14,46400],[0,2,3,54944],[2,1,23,38608],[0,2,11,38320],[7,2,1,18872],[0,2,20,18800],[0,2,8,42160],[5,1,28,45656],[0,2,16,27216],[0,2,5,27968],[4,1,24,44456],[0,2,13,11104],[0,2,2,38256],[2,1,23,18808],[0,2,10,18800],[6,1,30,25776],[0,2,17,54432],[0,2,6,59984],[5,1,26,27976],[0,2,14,23248],[0,2,4,11104],[3,1,24,37744],[0,2,11,37600],[7,1,31,51560],[0,2,19,51536],[0,2,8,54432],[6,1,27,55888],[0,2,15,46416],[0,2,5,22176],[4,1,25,43736],[0,2,13,9680],[0,2,2,37584],[2,1,22,51544],[0,2,10,43344],[7,1,29,46248],[0,2,17,27808],[0,2,6,46416],[5,1,27,21928],[0,2,14,19872],[0,2,3,42416],[3,1,24,21176],[0,2,12,21168],[8,1,31,43344],[0,2,18,59728],[0,2,8,27296],[6,1,28,44368],[0,2,15,43856],[0,2,5,19296],[4,1,25,42352],[0,2,13,42352],[0,2,2,21088],[3,1,21,59696],[0,2,9,55632],[7,1,30,23208],[0,2,17,22176],[0,2,6,38608],[5,1,27,19176],[0,2,15,19152],[0,2,3,42192],[4,1,23,53864],[0,2,11,53840],[8,1,31,54568],[0,2,18,46400],[0,2,7,46752],[6,1,28,38608],[0,2,16,38320],[0,2,5,18864],[4,1,25,42168],[0,2,13,42160],[10,2,2,45656],[0,2,20,27216],[0,2,9,27968],[6,1,29,44448],[0,2,17,43872],[0,2,6,38256],[5,1,27,18808],[0,2,15,18800],[0,2,4,25776],[3,1,23,27216],[0,2,10,59984],[8,1,31,27432],[0,2,19,23232],[0,2,7,43872],[5,1,28,37736],[0,2,16,37600],[0,2,5,51552],[4,1,24,54440],[0,2,12,54432],[0,2,1,55888],[2,1,22,23208],[0,2,9,22176],[7,1,29,43736],[0,2,18,9680],[0,2,7,37584],[5,1,26,51544],[0,2,14,43344],[0,2,3,46240],[4,1,23,46416],[0,2,10,44368],[9,1,31,21928],[0,2,19,19360],[0,2,8,42416],[6,1,28,21176],[0,2,16,21168],[0,2,5,43312],[4,1,25,29864],[0,2,12,27296],[0,2,1,44368],[2,1,22,19880],[0,2,10,19296],[6,1,29,42352],[0,2,17,42208],[0,2,6,53856],[5,1,26,59696],[0,2,13,54576],[0,2,3,23200],[3,1,23,27472],[0,2,11,38608],[11,1,31,19176],[0,2,19,19152],[0,2,8,42192],[6,1,28,53848],[0,2,15,53840],[0,2,4,54560],[5,1,24,55968],[0,2,12,46496],[0,2,1,22224],[2,1,22,19160],[0,2,10,18864],[7,1,30,42168],[0,2,17,42160],[0,2,6,43600],[5,1,26,46376],[0,2,14,27936],[0,2,2,44448],[3,1,23,21936],[0,2,11,37744],[8,2,1,18808],[0,2,19,18800],[0,2,8,25776],[6,1,28,27216],[0,2,15,59984],[0,2,4,27424],[4,1,24,43872],[0,2,12,43744],[0,2,2,37600],[3,1,21,51568],[0,2,9,51552],[7,1,29,54440],[0,2,17,54432],[0,2,5,55888],[5,1,26,23208],[0,2,14,22176],[0,2,3,42704],[4,1,23,21224],[0,2,11,21200],[8,1,31,43352],[0,2,19,43344],[0,2,7,46240],[6,1,27,46416],[0,2,15,44368],[0,2,5,21920],[4,1,24,42448],[0,2,12,42416],[0,2,2,21168],[3,1,22,43320],[0,2,9,26928],[7,1,29,29336],[0,2,17,27296],[0,2,6,44368],[5,1,26,19880],[0,2,14,19296],[0,2,3,42352],[4,1,24,21104],[0,2,10,53856],[8,1,30,59696],[0,2,18,54560],[0,2,7,55968],[6,1,27,27472],[0,2,15,22224],[0,2,5,19168],[4,1,25,42216],[0,2,12,42192],[0,2,1,53584],[2,1,21,55592],[0,2,9,54560]],I=[0,21208,42467,63836,85337,107014,128867,150921,173149,195551,218072,240693,263343,285989,308563,331033,353350,375494,397447,419210,440795,462224,483532,504758],J={solarToLunar:r,lunarToSolar:q,calendar:s,solarCalendar:t,setWorktime:u,getSolarMonthDays:n};"function"==typeof define?define(function(){return J}):"object"==typeof exports?module.exports=J:window.LunarCalendar=J}(); \ No newline at end of file -- 2.7.4