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

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

1264.2 Comparison summary

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

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

1264.4 Active regular expressions

No regular expressions were active.

1264.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  b(a,b,c){ var h=n[th is.id];if( h)for(var  f=this ins tanceof CK EDITOR.ui. dialog.che ckbox,e=0; e<h.length ;e++){var  d=h[e];swi tch(d.type ){case 1:i f(!a)conti nue;if(nul l!==a.getA ttribute(d .name)){a= a.getAttri bute(d.nam e);f?this. setValue(" true"==a.t oLowerCase ()):this.s etValue(a) ;return}f& &this.setV alue(!!d[" default"]) ;break;cas e 2:if(!a) continue;i f(d.name i n c){a=c[d .name];f?t his.setVal ue("true"= =a.toLower Case()):th is.setValu e(a);retur n}f&&this. setValue(! !d["defaul t"]);break ;case 4:if (!b)contin ue;        
6   if(b.getAt tribute(d. name)){a=b .getAttrib ute(d.name );f?this.s etValue("t rue"==a.to LowerCase( )):this.se tValue(a); return}f&& this.setVa lue(!!d["d efault"])} }}function  c(a,b,c){ var h=n[th is.id];if( h)for(var  f=""===thi s.getValue (),e=this  instanceof  CKEDITOR. ui.dialog. checkbox,d =0;d<h.len gth;d++){v ar g=h[d]; switch(g.t ype){case  1:if(!a||" data"==g.n ame&&b&&!a .hasAttrib ute("data" ))continue ;var m=thi s.getValue ();f||e&&m ===g["defa ult"]?a.re moveAttrib ute(g.name ):a.setAtt ribute(g.n ame,m);bre ak;case 2: if(!a)cont inue;        
7   m=this.get Value();if (f||e&&m== =g["defaul t"])g.name  in c&&c[g .name].rem ove();else  if(g.name  in c)c[g. name].setA ttribute(" value",m); else{var p =CKEDITOR. dom.elemen t.createFr omHtml("\x 3ccke:para m\x3e\x3c/ cke:param\ x3e",a.get Document() );p.setAtt ributes({n ame:g.name ,value:m}) ;1>a.getCh ildCount() ?p.appendT o(a):p.ins ertBefore( a.getFirst ())}break; case 4:if( !b)continu e;m=this.g etValue(); f||e&&m=== g["default "]?b.remov eAttribute (g.name):b .setAttrib ute(g.name ,m)}}}for( var n={id: [{type:1,n ame:"id"}] ,classid:[ {type:1,        
8   name:"clas sid"}],cod ebase:[{ty pe:1,name: "codebase" }],plugins page:[{typ e:4,name:" pluginspag e"}],src:[ {type:2,na me:"movie" },{type:4, name:"src" },{type:1, name:"data "}],name:[ {type:4,na me:"name"} ],align:[{ type:1,nam e:"align"} ],"class": [{type:1,n ame:"class "},{type:4 ,name:"cla ss"}],widt h:[{type:1 ,name:"wid th"},{type :4,name:"w idth"}],he ight:[{typ e:1,name:" height"},{ type:4,nam e:"height" }],hSpace: [{type:1,n ame:"hSpac e"},{type: 4,name:"hS pace"}],vS pace:[{typ e:1,name:" vSpace"},{ type:4,nam e:"vSpace" }],style:[ {type:1,        
9   name:"styl e"},{type: 4,name:"st yle"}],typ e:[{type:4 ,name:"typ e"}]},k="p lay loop m enu qualit y scale sa lign wmode  bgcolor b ase flashv ars allowS criptAcces s allowFul lScreen".s plit(" "), l=0;l<k.le ngth;l++)n [k[l]]=[{t ype:4,name :k[l]},{ty pe:2,name: k[l]}];k=[ "play","lo op","menu" ];for(l=0; l<k.length ;l++)n[k[l ]][0]["def ault"]=n[k [l]][1]["d efault"]=! 0;CKEDITOR .dialog.ad d("flash", function(a ){var l=!a .config.fl ashEmbedTa gOnly,k=a. config.fla shAddEmbed Tag||a.con fig.flashE mbedTagOnl y,h,f="\x3 cdiv\x3e"+ CKEDITOR.t ools.htmlE ncode(a.la ng.common. preview)+        
10   '\x3cbr\x3 e\x3cdiv i d\x3d"cke_ FlashPrevi ewLoader'+ CKEDITOR.t ools.getNe xtNumber() +'" style\ x3d"displa y:none"\x3 e\x3cdiv c lass\x3d"l oading"\x3 e\x26nbsp; \x3c/div\x 3e\x3c/div \x3e\x3cdi v id\x3d"c ke_FlashPr eviewBox'+ CKEDITOR.t ools.getNe xtNumber() +'" class\ x3d"FlashP reviewBox" \x3e\x3c/d iv\x3e\x3c /div\x3e'; return{tit le:a.lang. flash.titl e,minWidth :420,minHe ight:310,o nShow:func tion(){thi s.fakeImag e=this.obj ectNode=th is.embedNo de=null;h= new CKEDIT OR.dom.ele ment("embe d",a.docum ent);var e =this.getS electedEle ment();        
11   if(e&&e.da ta("cke-re al-element -type")&&" flash"==e. data("cke- real-eleme nt-type")) {this.fake Image=e;va r d=a.rest oreRealEle ment(e),g= null,b=nul l,c={};if( "cke:objec t"==d.getN ame()){g=d ;d=g.getEl ementsByTa g("embed", "cke");0<d .count()&& (b=d.getIt em(0));for (var d=g.g etElements ByTag("par am","cke") ,f=0,l=d.c ount();f<l ;f++){var  k=d.getIte m(f),n=k.g etAttribut e("name"), k=k.getAtt ribute("va lue");c[n] =k}}else"c ke:embed"= =d.getName ()&&(b=d); this.objec tNode=g;th is.embedNo de=b;this. setupConte nt(g,b,c,e )}},onOk:f unction(){ var e=        
12   null,d=nul l,b=null;t his.fakeIm age?(e=thi s.objectNo de,d=this. embedNode) :(l&&(e=CK EDITOR.dom .element.c reateFromH tml("\x3cc ke:object\ x3e\x3c/ck e:object\x 3e",a.docu ment),e.se tAttribute s({classid :"clsid:d2 7cdb6e-ae6 d-11cf-96b 8-44455354 0000",code base:"http ://downloa d.macromed ia.com/pub /shockwave /cabs/flas h/swflash. cab#versio n\x3d6,0,4 0,0"})),k& &(d=CKEDIT OR.dom.ele ment.creat eFromHtml( "\x3ccke:e mbed\x3e\x 3c/cke:emb ed\x3e",a. document), d.setAttri butes({typ e:"applica tion/x-sho ckwave-fla sh",plugin spage:"htt p://www.ma cromedia.c om/go/getf lashplayer "}),        
13   e&&d.appen dTo(e)));i f(e)for(va r b={},c=e .getElemen tsByTag("p aram","cke "),f=0,h=c .count();f <h;f++)b[c .getItem(f ).getAttri bute("name ")]=c.getI tem(f);c={ };f={};thi s.commitCo ntent(e,d, b,c,f);e=a .createFak eElement(e ||d,"cke_f lash","fla sh",!0);e. setAttribu tes(f);e.s etStyles(c );this.fak eImage?(e. replace(th is.fakeIma ge),a.getS election() .selectEle ment(e)):a .insertEle ment(e)},o nHide:func tion(){thi s.preview& &this.prev iew.setHtm l("")},con tents:[{id :"info",la bel:a.lang .common.ge neralTab,a ccessKey:" I",element s:[{type:" vbox",        
14   padding:0, children:[ {type:"hbo x",widths: ["280px"," 110px"],al ign:"right ",children :[{id:"src ",type:"te xt",label: a.lang.com mon.url,re quired:!0, validate:C KEDITOR.di alog.valid ate.notEmp ty(a.lang. flash.vali dateSrc),s etup:b,com mit:c,onLo ad:functio n(){var a= this.getDi alog(),b=f unction(b) {h.setAttr ibute("src ",b);a.pre view.setHt ml('\x3cem bed height \x3d"100%"  width\x3d "100%" src \x3d"'+CKE DITOR.tool s.htmlEnco de(h.getAt tribute("s rc"))+'" t ype\x3d"ap plication/ x-shockwav e-flash"\x 3e\x3c/emb ed\x3e')}; a.preview= a.getConte ntElement( "info",        
15   "preview") .getElemen t().getChi ld(3);this .on("chang e",functio n(a){a.dat a&&a.data. value&&b(a .data.valu e)});this. getInputEl ement().on ("change", function() {b(this.ge tValue())} ,this)}},{ type:"butt on",id:"br owse",file browser:"i nfo:src",h idden:!0,s tyle:"disp lay:inline -block;mar gin-top:14 px;",label :a.lang.co mmon.brows eServer}]} ]},{type:" hbox",widt hs:["25%", "25%","25% ","25%","2 5%"],child ren:[{type :"text",id :"width",r equiredCon tent:"embe d[width]", style:"wid th:95px",l abel:a.lan g.common.w idth,valid ate:CKEDIT OR.dialog. validate.h tmlLength( a.lang.com mon.invali dHtmlLengt h.replace( "%1",        
16   a.lang.com mon.width) ),setup:b, commit:c}, {type:"tex t",id:"hei ght",requi redContent :"embed[he ight]",sty le:"width: 95px",labe l:a.lang.c ommon.heig ht,validat e:CKEDITOR .dialog.va lidate.htm lLength(a. lang.commo n.invalidH tmlLength. replace("% 1",a.lang. common.hei ght)),setu p:b,commit :c},{type: "text",id: "hSpace",r equiredCon tent:"embe d[hspace]" ,style:"wi dth:95px", label:a.la ng.flash.h Space,vali date:CKEDI TOR.dialog .validate. integer(a. lang.flash .validateH Space),set up:b,commi t:c},{type :"text",id :"vSpace", requiredCo ntent:"emb ed[vspace] ",        
17   style:"wid th:95px",l abel:a.lan g.flash.vS pace,valid ate:CKEDIT OR.dialog. validate.i nteger(a.l ang.flash. validateVS pace),setu p:b,commit :c}]},{typ e:"vbox",c hildren:[{ type:"html ",id:"prev iew",style :"width:95 %;",html:f }]}]},{id: "Upload",h idden:!0,f ilebrowser :"uploadBu tton",labe l:a.lang.c ommon.uplo ad,element s:[{type:" file",id:" upload",la bel:a.lang .common.up load,size: 38},{type: "fileButto n",id:"upl oadButton" ,label:a.l ang.common .uploadSub mit,filebr owser:"inf o:src","fo r":["Uploa d","upload "]}]},{id: "propertie s",        
18   label:a.la ng.flash.p ropertiesT ab,element s:[{type:" hbox",widt hs:["50%", "50%"],chi ldren:[{id :"scale",t ype:"selec t",require dContent:" embed[scal e]",label: a.lang.fla sh.scale," default":" ",style:"w idth : 100 %;",items: [[a.lang.c ommon.notS et,""],[a. lang.flash .scaleAll, "showall"] ,[a.lang.f lash.scale NoBorder," noborder"] ,[a.lang.f lash.scale Fit,"exact fit"]],set up:b,commi t:c},{id:" allowScrip tAccess",t ype:"selec t",require dContent:" embed[allo wscriptacc ess]",labe l:a.lang.f lash.acces s,"default ":"",style :"width :  100%;",        
19   items:[[a. lang.commo n.notSet," "],[a.lang .flash.acc essAlways, "always"], [a.lang.fl ash.access SameDomain ,"samedoma in"],[a.la ng.flash.a ccessNever ,"never"]] ,setup:b,c ommit:c}]} ,{type:"hb ox",widths :["50%","5 0%"],child ren:[{id:" wmode",typ e:"select" ,requiredC ontent:"em bed[wmode] ",label:a. lang.flash .windowMod e,"default ":"",style :"width :  100%;",ite ms:[[a.lan g.common.n otSet,""], [a.lang.fl ash.window ModeWindow ,"window"] ,[a.lang.f lash.windo wModeOpaqu e,"opaque" ],[a.lang. flash.wind owModeTran sparent,"t ransparent "]],        
20   setup:b,co mmit:c},{i d:"quality ",type:"se lect",requ iredConten t:"embed[q uality]",l abel:a.lan g.flash.qu ality,"def ault":"hig h",style:" width : 10 0%;",items :[[a.lang. common.not Set,""],[a .lang.flas h.qualityB est,"best" ],[a.lang. flash.qual ityHigh,"h igh"],[a.l ang.flash. qualityAut oHigh,"aut ohigh"],[a .lang.flas h.qualityM edium,"med ium"],[a.l ang.flash. qualityAut oLow,"auto low"],[a.l ang.flash. qualityLow ,"low"]],s etup:b,com mit:c}]},{ type:"hbox ",widths:[ "50%","50% "],childre n:[{id:"al ign",type: "select",r equiredCon tent:"obje ct[align]" ,        
21   label:a.la ng.common. align,"def ault":"",s tyle:"widt h : 100%;" ,items:[[a .lang.comm on.notSet, ""],[a.lan g.common.a lignLeft," left"],[a. lang.flash .alignAbsB ottom,"abs Bottom"],[ a.lang.fla sh.alignAb sMiddle,"a bsMiddle"] ,[a.lang.f lash.align Baseline," baseline"] ,[a.lang.c ommon.alig nBottom,"b ottom"],[a .lang.comm on.alignMi ddle,"midd le"],[a.la ng.common. alignRight ,"right"], [a.lang.fl ash.alignT extTop,"te xtTop"],[a .lang.comm on.alignTo p,"top"]], setup:b,co mmit:funct ion(a,b,f, k,l){var h =this.getV alue();c.a pply(this, arguments) ;        
22   h&&(l.alig n=h)}},{ty pe:"html", html:"\x3c div\x3e\x3 c/div\x3e" }]},{type: "fieldset" ,label:CKE DITOR.tool s.htmlEnco de(a.lang. flash.flas hvars),chi ldren:[{ty pe:"vbox", padding:0, children:[ {type:"che ckbox",id: "menu",lab el:a.lang. flash.chkM enu,"defau lt":!0,set up:b,commi t:c},{type :"checkbox ",id:"play ",label:a. lang.flash .chkPlay," default":! 0,setup:b, commit:c}, {type:"che ckbox",id: "loop",lab el:a.lang. flash.chkL oop,"defau lt":!0,set up:b,commi t:c},{type :"checkbox ",id:"allo wFullScree n",label:a .lang.flas h.chkFull, "default": !0,        
23   setup:b,co mmit:c}]}] }]},{id:"a dvanced",l abel:a.lan g.common.a dvancedTab ,elements: [{type:"hb ox",childr en:[{type: "text",id: "id",requi redContent :"object[i d]",label: a.lang.com mon.id,set up:b,commi t:c}]},{ty pe:"hbox", widths:["4 5%","55%"] ,children: [{type:"te xt",id:"bg color",req uiredConte nt:"embed[ bgcolor]", label:a.la ng.flash.b gcolor,set up:b,commi t:c},{type :"text",id :"class",r equiredCon tent:"embe d(cke-xyz) ",label:a. lang.commo n.cssClass ,setup:b,c ommit:c}]} ,{type:"te xt",id:"st yle",requi redContent :"embed{ck e-xyz}",        
24   validate:C KEDITOR.di alog.valid ate.inline Style(a.la ng.common. invalidInl ineStyle), label:a.la ng.common. cssStyle,s etup:b,com mit:c}]}]} })})();