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

1265.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\forms\dialogs	button.js	Tue Dec 20 19:50:43 2016 UTC
2			Wed Feb 1 19:57:49 2017 UTC

1265.2 Comparison summary

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

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

1265.4 Active regular expressions

No regular expressions were active.

1265.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		CKEDITOR.d ialog.add( "button",f unction(b) {function d(a){var b =this.getV alue();b?( a.attribut es[this.id ]=b,"name" ==this.id& &(a.attrib utes["data -cke-saved -name"]=b) ):(delete a.attribut es[this.id ],"name"== this.id&&d elete a.at tributes[" data-cke-s aved-name" ])}return{ title:b.la ng.forms.b utton.titl e,minWidth :350,minHe ight:150,o nShow:func tion(){del ete this.b utton;var a=this.get ParentEdit or().getSe lection(). getSelecte dElement() ;a&&a.is(" input")&&a .getAttrib ute("type" )in{button :1,reset:1 ,submit:1} &&(this.bu tton=
6		a,this.set upContent( a))},onOk: function() {var a=thi s.getParen tEditor(), b=this.but ton,d=!b,c =b?CKEDITO R.htmlPars er.fragmen t.fromHtml (b.getOute rHtml()).c hildren[0] :new CKEDI TOR.htmlPa rser.eleme nt("input" );this.com mitContent (c);var e= new CKEDIT OR.htmlPar ser.basicW riter;c.wr iteHtml(e) ;c=CKEDITO R.dom.elem ent.create FromHtml(e .getHtml() ,a.documen t);d?a.ins ertElement (c):(c.rep lace(b),a. getSelecti on().selec tElement(c ))},conten ts:[{id:"i nfo",label :b.lang.fo rms.button .title,tit le:b.lang. forms.butt on.title,e lements:[{ id:"name",
7		type:"text ",bidi:!0, label:b.la ng.common. name,"defa ult":"",se tup:functi on(a){this .setValue( a.data("ck e-saved-na me")\|\|a.ge tAttribute ("name")\|\| "")},commi t:d},{id:" value",typ e:"text",l abel:b.lan g.forms.bu tton.text, accessKey: "V","defau lt":"",set up:functio n(a){this. setValue(a .getAttrib ute("value ")\|\|"")},c ommit:d},{ id:"type", type:"sele ct",label: b.lang.for ms.button. type,"defa ult":"butt on",access Key:"T",it ems:[[b.la ng.forms.b utton.type Btn,"butto n"],[b.lan g.forms.bu tton.typeS bm,"submit "],[b.lang .forms.but ton.typeRs t,
8		"reset"]], setup:func tion(a){th is.setValu e(a.getAtt ribute("ty pe")\|\|"")} ,commit:d} ]}]}});