1518. Araxis Merge File Comparison Report

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

1518.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\uploadwidget	plugin.js	Tue Dec 20 19:50:43 2016 UTC
2			Wed Feb 1 19:57:55 2017 UTC

1518.2 Comparison summary

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

1518.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

1518.4 Active regular expressions

No regular expressions were active.

1518.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( ){CKEDITOR .plugins.a dd("upload widget",{l ang:"cs,da ,de,en,eo, fr,gl,hu,i t,ko,ku,nb ,nl,pl,pt- br,ru,sv,t r,zh,zh-cn ",requires :"widget,c lipboard,f iletools,n otificatio naggregato r",init:fu nction(b){ b.filter.a llow("*[!d ata-widget ,!data-cke -upload-id ]")}});CKE DITOR.file Tools\|\|(CK EDITOR.fil eTools={}) ;CKEDITOR. tools.exte nd(CKEDITO R.fileTool s,{addUplo adWidget:f unction(b, c,a){var f =CKEDITOR. fileTools, m=b.upload Repository ,p=a.suppo rtedTypes? 10:20;if(a .fileToEle ment)b.on( "paste",fu nction(k){ k=k.data;v ar n=
6		k.dataTran sfer,e=n.g etFilesCou nt(),l=a.l oadMethod\| \|"loadAndU pload",d,g ;if(!k.dat aValue&&e) for(g=0;g< e;g++)if(d =n.getFile (g),!a.sup portedType s\|\|f.isTyp eSupported (d,a.suppo rtedTypes) ){var h=a. fileToElem ent(d);d=m .create(d) ;h&&(d[l]( a.uploadUr l),CKEDITO R.fileTool s.markElem ent(h,c,d. id),"loadA ndUpload"! =l&&"uploa d"!=l\|\|CKE DITOR.file Tools.bind Notificati ons(b,d),k .dataValue +=h.getOut erHtml())} },null,nul l,p);CKEDI TOR.tools. extend(a,{ downcast:f unction(){ return new CKEDITOR. htmlParser .text("")} ,init:func tion(){var a=
7		this,c=thi s.wrapper. findOne("[ data-cke-u pload-id]" ).data("ck e-upload-i d"),e=m.lo aders[c],f =CKEDITOR. tools.capi talize,d,g ;e.on("upd ate",funct ion(h){if( a.wrapper& &a.wrapper .getParent ()){b.fire ("lockSnap shot");h=" on"+f(e.st atus);if(" function"! ==typeof a [h]\|\|!1!== a[h](e))g= "cke_uploa d_"+e.stat us,a.wrapp er&&g!=d&& (d&&a.wrap per.remove Class(d),a .wrapper.a ddClass(g) ,d=g),"err or"!=e.sta tus&&"abor t"!=e.stat us\|\|b.widg ets.del(a) ;b.fire("u nlockSnaps hot")}else b.editabl e().find(' [data-cke- upload-id\ x3d"'+c+'" ]').count( )\|\|
8		e.abort(), h.removeLi stener()}) ;e.update( )},replace With:funct ion(a,c){i f(""===a.t rim())b.wi dgets.del( this);else {var e=thi s==b.widge ts.focused ,f=b.edita ble(),d=b. createRang e(),g,h;e\| \|(h=b.getS election() .createBoo kmarks()); d.setStart Before(thi s.wrapper) ;d.setEndA fter(this. wrapper);e &&(g=d.cre ateBookmar k());f.ins ertHtmlInt oRange(a,d ,c);b.widg ets.checkW idgets({in itOnlyNew: !0});b.wid gets.destr oy(this,!0 );e?(d.mov eToBookmar k(g),d.sel ect()):b.g etSelectio n().select Bookmarks( h)}}});b.w idgets.add (c,a)},mar kElement:f unction(b,
9		c,a){b.set Attributes ({"data-ck e-upload-i d":a,"data -widget":c })},bindNo tification s:function (b,c){var a=b._.uplo adWidgetNo tificaionA ggregator; if(!a\|\|a.i sFinished( ))a=b._.up loadWidget Notificaio nAggregato r=new CKED ITOR.plugi ns.notific ationAggre gator(b,b. lang.uploa dwidget.up loadMany,b .lang.uplo adwidget.u ploadOne), a.once("fi nished",fu nction(){v ar c=a.get TaskCount( );0===c?a. notificati on.hide(): a.notifica tion.updat e({message :1==c?b.la ng.uploadw idget.done One:b.lang .uploadwid get.doneMa ny.replace ("%1",c),t ype:"succe ss",
10		important: 1})});var f=a.create Task({weig ht:c.total });c.on("u pdate",fun ction(){f& &"uploadin g"==c.stat us&&f.upda te(c.uploa ded)});c.o n("uploade d",functio n(){f&&f.d one()});c. on("error" ,function( ){f&&f.can cel();b.sh owNotifica tion(c.mes sage,"warn ing")});c. on("abort" ,function( ){f&&f.can cel();b.sh owNotifica tion(b.lan g.uploadwi dget.abort ,"info")}) }})})();