Produced by Araxis Merge on 2/1/2017 2:57:42 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM Portal\trunk\BTSSSPortal\Areas\Service311\js | date.format.min.js | Tue Dec 20 19:50:52 2016 UTC |
| 2 | Wed Feb 1 19:57:42 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 14 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* | |||||
| 2 | Javascript Date Form at v1.2.3 | |||||
| 3 | Copyright (c) 2007-2 009 Steven Levithan | |||||
| 4 | ||||||
| 5 | Permission is hereby granted, free of ch arge, to a ny person obtaining a copy of this softw are and as sociated d ocumentati on files ( the "Softw are"), to deal in th e Software without r estriction , includin g without limitation the right s to use, copy, modi fy, merge, publish, distribute , sublicen se, and/or sell copi es of the Software, and to per mit person s to whom the Softwa re is furn ished to d o so, subj ect to the following condition s: | |||||
| 6 | ||||||
| 7 | The above copyright notice and this perm ission not ice shall be include d in all c opies or s ubstantial portions of the Sof tware. | |||||
| 8 | ||||||
| 9 | THE SOFTWA RE IS PROV IDED "AS I S", WITHOU T WARRANTY OF ANY KI ND, EXPRES S OR IMPLI ED, INCLUD ING BUT NO T LIMITED TO THE WAR RANTIES OF MERCHANTA BILITY, FI TNESS FOR A PARTICUL AR PURPOSE AND NONIN FRINGEMENT . IN NO EV ENT SHALL THE AUTHOR S OR COPYR IGHT HOLDE RS BE LIAB LE FOR ANY CLAIM, DA MAGES OR O THER LIABI LITY, WHET HER IN AN ACTION OF CONTRACT, TORT OR OT HERWISE, A RISING FRO M, OUT OF OR IN CONN ECTION WIT H THE SOFT WARE OR TH E USE OR O THER DEALI NGS IN THE SOFTWARE. | |||||
| 10 | ||||||
| 11 | http://blo g.stevenle vithan.com /archives/ date-time- format */ | |||||
| 12 | var dateFo rmat=funct ion(){var token=/d{1 ,4}|m{1,4} |yy(?:yy)? |([HhMsTt] )\1?|[LloS Z]|"[^"]*" |'[^']*'/g ,timezone= /\b(?:[PMC EA][SDP]T| (?:Pacific |Mountain| Central|Ea stern|Atla ntic) (?:S tandard|Da ylight|Pre vailing) T ime|(?:GMT |UTC)(?:[- +]\d{4})?) \b/g,timez oneClip=/[ ^-+\dA-Z]/ g,pad=func tion(val,l en){val=St ring(val); len=len||2 ;while(val .length<le n)val="0"+ val;return val;};ret urn functi on(date,ma sk,utc){va r dF=dateF ormat;if(a rguments.l ength==1&& Object.pro totype.toS tring.call (date)=="[ object Str ing]"&&!/\ d/.test(da te)){mask= date;date= undefined; } | |||||
| 13 | date=date? new Date(d ate):new D ate;if(isN aN(date))t hrow Synta xError("in valid date ");mask=St ring(dF.ma sks[mask]| |mask||dF. masks["def ault"]);if (mask.slic e(0,4)=="U TC:"){mask =mask.slic e(4);utc=t rue;} | |||||
| 14 | var _=utc? "getUTC":" get",d=dat e[_+"Date" ](),D=date [_+"Day"]( ),m=date[_ +"Month"]( ),y=date[_ +"FullYear "](),H=dat e[_+"Hours "](),M=dat e[_+"Minut es"](),s=d ate[_+"Sec onds"](),L =date[_+"M illisecond s"](),o=ut c?0:date.g etTimezone Offset(),f lags={d:d, dd:pad(d), ddd:dF.i18 n.dayNames [D],dddd:d F.i18n.day Names[D+7] ,m:m+1,mm: pad(m+1),m mm:dF.i18n .monthName s[m],mmmm: dF.i18n.mo nthNames[m +12],yy:St ring(y).sl ice(2),yyy y:y,h:H%12 ||12,hh:pa d(H%12||12 ),H:H,HH:p ad(H),M:M, MM:pad(M), s:s,ss:pad (s),l:pad( L,3),L:pad (L>99?Math .round(L/1 0):L),t:H< 12?"a":"p" ,tt:H<12?" am":"pm",T :H<12?"A": "P",TT:H<1 2?"AM":"PM ",Z:utc?"U TC":(Strin g(date).ma tch(timezo ne)||[""]) .pop().rep lace(timez oneClip,"" ),o:(o>0?" -":"+")+pa d(Math.flo or(Math.ab s(o)/60)*1 00+Math.ab s(o)%60,4) ,S:["th"," st","nd"," rd"][d%10> 3?0:(d%100 -d%10!=10) *d%10]};re turn mask. replace(to ken,functi on($0){ret urn $0 in flags?flag s[$0]:$0.s lice(1,$0. length-1); });};}();d ateFormat. masks={"de fault":"dd d mmm dd y yyy HH:MM: ss",shortD ate:"m/d/y y",mediumD ate:"mmm d , yyyy",lo ngDate:"mm mm d, yyyy ",fullDate :"dddd, mm mm d, yyyy ",shortTim e:"h:MM TT ",mediumTi me:"h:MM:s s TT",long Time:"h:MM :ss TT Z", isoDate:"y yyy-mm-dd" ,isoTime:" HH:MM:ss", isoDateTim e:"yyyy-mm -dd'T'HH:M M:ss",isoU tcDateTime :"UTC:yyyy -mm-dd'T'H H:MM:ss'Z' "};dateFor mat.i18n={ dayNames:[ "Sun","Mon ","Tue","W ed","Thu", "Fri","Sat ","Sunday" ,"Monday", "Tuesday", "Wednesday ","Thursda y","Friday ","Saturda y"],monthN ames:["Jan ","Feb","M ar","Apr", "May","Jun ","Jul","A ug","Sep", "Oct","Nov ","Dec","J anuary","F ebruary"," March","Ap ril","May" ,"June","J uly","Augu st","Septe mber","Oct ober","Nov ember","De cember"]}; Date.proto type.forma t=function (mask,utc) {return da teFormat(t his,mask,u tc);}; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.