1273. Araxis Merge File Comparison Report

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

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

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

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

1273.4 Active regular expressions

No regular expressions were active.

1273.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 c(b){var c=this ins tanceof CK EDITOR.ui. dialog.che ckbox;b.ha sAttribute (this.id)& &(b=b.getA ttribute(t his.id),c? this.setVa lue(e[this .id]["true "]==b.toLo werCase()) :this.setV alue(b))}f unction d( b){var c=" "===this.g etValue(), a=this ins tanceof CK EDITOR.ui. dialog.che ckbox,d=th is.getValu e();c?b.re moveAttrib ute(this.a tt\|\|this.i d):a?b.set Attribute( this.id,e[ this.id][d ]):b.setAt tribute(th is.att\|\|th is.id,d)}v ar e={scro lling:{"tr ue":"yes", "false":"n o"},frameb order:{"tr ue":"1","f alse":"0"} };
6		CKEDITOR.d ialog.add( "iframe",f unction(b) {var f=b.l ang.iframe ,a=b.lang. common,e=b .plugins.d ialogadvta b;return{t itle:f.tit le,minWidt h:350,minH eight:260, onShow:fun ction(){th is.fakeIma ge=this.if rameNode=n ull;var a= this.getSe lectedElem ent();a&&a .data("cke -real-elem ent-type") &&"iframe" ==a.data(" cke-real-e lement-typ e")&&(this .fakeImage =a,this.if rameNode=a =b.restore RealElemen t(a),this. setupConte nt(a))},on Ok:functio n(){var a; a=this.fak eImage?thi s.iframeNo de:new CKE DITOR.dom. element("i frame");va r c={},d={ };
7		this.commi tContent(a ,c,d);a=b. createFake Element(a, "cke_ifram e","iframe ",!0);a.se tAttribute s(d);a.set Styles(c); this.fakeI mage?(a.re place(this .fakeImage ),b.getSel ection().s electEleme nt(a)):b.i nsertEleme nt(a)},con tents:[{id :"info",la bel:a.gene ralTab,acc essKey:"I" ,elements: [{type:"vb ox",paddin g:0,childr en:[{id:"s rc",type:" text",labe l:a.url,re quired:!0, validate:C KEDITOR.di alog.valid ate.notEmp ty(f.noUrl ),setup:c, commit:d}] },{type:"h box",child ren:[{id:" width",typ e:"text",r equiredCon tent:"ifra me[width]" ,
8		style:"wid th:100%",l abelLayout :"vertical ",label:a. width,vali date:CKEDI TOR.dialog .validate. htmlLength (a.invalid HtmlLength .replace(" %1",a.widt h)),setup: c,commit:d },{id:"hei ght",type: "text",req uiredConte nt:"iframe [height]", style:"wid th:100%",l abelLayout :"vertical ",label:a. height,val idate:CKED ITOR.dialo g.validate .htmlLengt h(a.invali dHtmlLengt h.replace( "%1",a.hei ght)),setu p:c,commit :d},{id:"a lign",type :"select", requiredCo ntent:"ifr ame[align] ","default ":"",items :[[a.notSe t,""],[a.a lignLeft," left"],[a. alignRight ,
9		"right"],[ a.alignTop ,"top"],[a .alignMidd le,"middle "],[a.alig nBottom,"b ottom"]],s tyle:"widt h:100%",la belLayout: "vertical" ,label:a.a lign,setup :function( a,b){c.app ly(this,ar guments);i f(b){var d =b.getAttr ibute("ali gn");this. setValue(d &&d.toLowe rCase()\|\|" ")}},commi t:function (a,b,c){d. apply(this ,arguments );this.get Value()&&( c.align=th is.getValu e())}}]},{ type:"hbox ",widths:[ "50%","50% "],childre n:[{id:"sc rolling",t ype:"check box",requi redContent :"iframe[s crolling]" ,label:f.s crolling,s etup:c,com mit:d},{id :"framebor der",
10		type:"chec kbox",requ iredConten t:"iframe[ frameborde r]",label: f.border,s etup:c,com mit:d}]},{ type:"hbox ",widths:[ "50%","50% "],childre n:[{id:"na me",type:" text",requ iredConten t:"iframe[ name]",lab el:a.name, setup:c,co mmit:d},{i d:"title", type:"text ",required Content:"i frame[titl e]",label: a.advisory Title,setu p:c,commit :d}]},{id: "longdesc" ,type:"tex t",require dContent:" iframe[lon gdesc]",la bel:a.long Descr,setu p:c,commit :d}]},e&&e .createAdv ancedTab(b ,{id:1,cla sses:1,sty les:1},"if rame")]}}) })();