1262. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:49 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.

1262.1 Files compared

#	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\js\ckeditor\plugins\filetools	plugin.js	Tue Dec 20 19:50:44 2016 UTC
2			Wed Feb 1 19:57:49 2017 UTC

1262.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	13

1262.3 Comparison options

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

1262.4 Active regular expressions

No regular expressions were active.

1262.5 Comparison detail

1		/*
2		Copyright (c) 2003- 2015, CKSo urce - Fre derico Kna bben. All rights res erved.
3		This soft ware is co vered by C KEditor Co mmercial L icense. Us age withou t proper l icense is prohibited .
4		*/
5		(function( ){function h(a){this .editor=a; this.loade rs=[]}func tion k(a,b ,c){var d= a.config.f ileTools_d efaultFile Name;this. editor=a;t his.lang=a .lang;"str ing"===typ eof b?(thi s.data=b,t his.file=m (this.data ),this.loa ded=this.t otal=this. file.size) :(this.dat a=null,thi s.file=b,t his.total= this.file. size,this. loaded=0); c?this.fil eName=c:th is.file.na me?this.fi leName=thi s.file.nam e:(a=this. file.type. split("/") ,d&&(a[0]= d),this.fi leName=a.j oin(".")); this.uploa ded=0;this .status="c reated";th is.abort=f unction(){ this.chang eStatus("a bort")}}
6		function m (a){var b= a.match(l) [1];a=a.re place(l,"" );a=atob(a );var c=[] ,d,f,e,g;f or(d=0;d<a .length;d+ =512){f=a. slice(d,d+ 512);e=Arr ay(f.lengt h);for(g=0 ;g<f.lengt h;g++)e[g] =f.charCod eAt(g);f=n ew Uint8Ar ray(e);c.p ush(f)}ret urn new Bl ob(c,{type :b})}CKEDI TOR.plugin s.add("fil etools",{l ang:"cs,da ,de,en,eo, fr,gl,it,k o,ku,nb,nl ,pl,pt-br, ru,sv,tr,z h,zh-cn",b eforeInit: function(a ){a.upload Repository =new h(a); a.on("file UploadRequ est",funct ion(a){a=a .data.file Loader;a.x hr.open("P OST",a.upl oadUrl,!0) },null,nul l,
7		5);a.on("f ileUploadR equest",fu nction(a){ a=a.data.f ileLoader; var c=new FormData;c .append("u pload",a.f ile,a.file Name);a.xh r.send(c)} ,null,null ,999);a.on ("fileUplo adResponse ",function (a){var c= a.data.fil eLoader,d= c.xhr,f=a. data;try{v ar e=JSON. parse(d.re sponseText );e.error& &e.error.m essage&&(f .message=e .error.mes sage);e.up loaded?(f. fileName=e .fileName, f.url=e.ur l):a.cance l()}catch( g){f.messa ge=c.lang. filetools. responseEr ror,window .console&& window.con sole.log(d .responseT ext),a.can cel()}},nu ll,null,99 9)}});
8		h.prototyp e={create: function(a ,b){var c= this.loade rs.length, d=new k(th is.editor, a,b);d.id= c;this.loa ders[c]=d; this.fire( "instanceC reated",d) ;return d} ,isFinishe d:function (){for(var a=0;a<thi s.loaders. length;++a )if(!this. loaders[a] .isFinishe d())return !1;return! 0}};k.prot otype={loa dAndUpload :function( a){var b=t his;this.o nce("loade d",functio n(c){c.can cel();b.on ce("update ",function (a){a.canc el()},null ,null,0);b .upload(a) },null,nul l,0);this. load()},lo ad:functio n(){var a= this,b=thi s.reader=n ew FileRea der;
9		a.changeSt atus("load ing");this .abort=fun ction(){a. reader.abo rt()};b.on abort=func tion(){a.c hangeStatu s("abort") };b.onerro r=function (){a.messa ge=a.lang. filetools. loadError; a.changeSt atus("erro r")};b.onp rogress=fu nction(b){ a.loaded=b .loaded;a. update()}; b.onload=f unction(){ a.loaded=a .total;a.d ata=b.resu lt;a.chang eStatus("l oaded")};b .readAsDat aURL(this. file)},upl oad:functi on(a){a?(t his.upload Url=a,this .xhr=new X MLHttpRequ est,this.a ttachReque stListener s(),this.e ditor.fire ("fileUplo adRequest" ,{fileLoad er:this})& &
10		this.chang eStatus("u ploading") ):(this.me ssage=this .lang.file tools.noUr lError,thi s.changeSt atus("erro r"))},atta chRequestL isteners:f unction(){ var a=this ,b=this.xh r;a.abort= function() {b.abort() };b.onabor t=function (){a.chang eStatus("a bort")};b. onerror=fu nction(){a .message=a .lang.file tools.netw orkError;a .changeSta tus("error ")};b.onpr ogress=fun ction(b){a .uploaded= b.loaded;a .update()} ;b.onload= function() {a.uploade d=a.total; if(200>b.s tatus\|\|299 <b.status) a.message= a.lang.fil etools["ht tpError"+b .status],a .message\|\|
11		(a.message =a.lang.fi letools.ht tpError.re place("%1" ,b.status) ),a.change Status("er ror");else {for(var c ={fileLoad er:a},d=[" message"," fileName", "url"],f=a .editor.fi re("fileUp loadRespon se",c),e=0 ;e<d.lengt h;e++){var g=d[e];"s tring"===t ypeof c[g] &&(a[g]=c[ g])}!1===f ?a.changeS tatus("err or"):a.cha ngeStatus( "uploaded" )}}},chang eStatus:fu nction(a){ this.statu s=a;if("er ror"==a\|\|" abort"==a\| \|"loaded"= =a\|\|"uploa ded"==a)th is.abort=f unction(){ };this.fir e(a);this. update()}, update:fun ction(){th is.fire("u pdate")},i sFinished: function() {return!!t his.status .match(/^( ?:loaded\|u ploaded\|er ror\|abort) $/)}};
12		CKEDITOR.e vent.imple mentOn(h.p rototype); CKEDITOR.e vent.imple mentOn(k.p rototype); var l=/^da ta:(\S*?); base64,/;C KEDITOR.fi leTools\|\|( CKEDITOR.f ileTools={ });CKEDITO R.tools.ex tend(CKEDI TOR.fileTo ols,{uploa dRepositor y:h,fileLo ader:k,get UploadUrl: function(a ,b){var c= CKEDITOR.t ools.capit alize;retu rn b&&a[b+ "UploadUrl "]?a[b+"Up loadUrl"]: a.uploadUr l?a.upload Url:b&&a[" filebrowse r"+c(b,1)+ "UploadUrl "]?a["file browser"+c (b,1)+"Upl oadUrl"]+" \x26respon seType\x3d json":a.fi lebrowserU ploadUrl?a .filebrows erUploadUr l+
13		"\x26respo nseType\x3 djson":nul l},isTypeS upported:f unction(a, b){return! !a.type.ma tch(b)}})} )();