1327. Araxis Merge File Comparison Report

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

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

1327.2 Comparison summary

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

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

1327.4 Active regular expressions

No regular expressions were active.

1327.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 e(a,b,c){ this.edito r=a;this.n otificatio n=null;thi s._message =new CKEDI TOR.templa te(b);this ._singular Message=c? new CKEDIT OR.templat e(c):null; this._task s=[];this. _doneTasks =this._don eWeights=t his._total Weights=0} function d (a){this._ weight=a\|\| 1;this._do neWeight=0 ;this._isC anceled=!1 }CKEDITOR. plugins.ad d("notific ationaggre gator",{re quires:"no tification "});e.prot otype={cre ateTask:fu nction(a){ a=a\|\|{};va r b=!this. notificati on,c;b&&(t his.notifi cation=thi s._createN otificatio n());c=thi s._addTask (a);
6		c.on("upda ted",this. _onTaskUpd ate,this); c.on("done ",this._on TaskDone,t his);c.on( "canceled" ,function( ){this._re moveTask(c )},this);t his.update ();b&&this .notificat ion.show() ;return c} ,update:fu nction(){t his._updat eNotificat ion();this .isFinishe d()&&this. fire("fini shed")},ge tPercentag e:function (){return 0===this.g etTaskCoun t()?1:this ._doneWeig hts/this._ totalWeigh ts},isFini shed:funct ion(){retu rn this.ge tDoneTaskC ount()===t his.getTas kCount()}, getTaskCou nt:functio n(){return this._tas ks.length} ,getDoneTa skCount:fu nction(){r eturn this ._doneTask s},
7		_updateNot ification: function() {this.noti fication.u pdate({mes sage:this. _getNotifi cationMess age(),prog ress:this. getPercent age()})},_ getNotific ationMessa ge:functio n(){var a= this.getTa skCount(), b={current :this.getD oneTaskCou nt(),max:a ,percentag e:Math.rou nd(100*thi s.getPerce ntage())}; return(1== a&&this._s ingularMes sage?this. _singularM essage:thi s._message ).output(b )},_create Notificati on:functio n(){return new CKEDI TOR.plugin s.notifica tion(this. editor,{ty pe:"progre ss"})},_ad dTask:func tion(a){a= new d(a.we ight);
8		this._task s.push(a); this._tota lWeights+= a._weight; return a}, _removeTas k:function (a){var b= CKEDITOR.t ools.index Of(this._t asks,a);-1 !==b&&(a._ doneWeight &&(this._d oneWeights -=a._doneW eight),thi s._totalWe ights-=a._ weight,thi s._tasks.s plice(b,1) ,this.upda te())},_on TaskUpdate :function( a){this._d oneWeights +=a.data;t his.update ()},_onTas kDone:func tion(){thi s._doneTas ks+=1;this .update()} };CKEDITOR .event.imp lementOn(e .prototype );d.protot ype={done: function() {this.upda te(this._w eight)},up date:funct ion(a){if( !this.isDo ne()&&
9		!this.isCa nceled()){ a=Math.min (this._wei ght,a);var b=a-this. _doneWeigh t;this._do neWeight=a ;this.fire ("updated" ,b);this.i sDone()&&t his.fire(" done")}},c ancel:func tion(){thi s.isDone() \|\|this.isC anceled()\| \|(this._is Canceled=! 0,this.fir e("cancele d"))},isDo ne:functio n(){return this._wei ght===this ._doneWeig ht},isCanc eled:funct ion(){retu rn this._i sCanceled} };CKEDITOR .event.imp lementOn(d .prototype );CKEDITOR .plugins.n otificatio nAggregato r=e;CKEDIT OR.plugins .notificat ionAggrega tor.task=d })();