Produced by Araxis Merge on 2/1/2017 2:57:54 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.
| # | 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\tabletools\dialogs | tableCell.js | Tue Dec 20 19:50:49 2016 UTC |
| 2 | Wed Feb 1 19:57:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 17 |
| 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 |
No regular expressions were active.
| 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( "cellPrope rties",fun ction(g){f unction d( a){return function(b ){for(var c=a(b[0]), d=1;d<b.le ngth;d++)i f(a(b[d])! ==c){c=nul l;break}"u ndefined"! =typeof c& &(this.set Value(c),C KEDITOR.en v.gecko&&" select"==t his.type&& !c&&(this. getInputEl ement().$. selectedIn dex=-1))}} function l (a){if(a=n .exec(a.ge tStyle("wi dth")||a.g etAttribut e("width") ))return a [2]}var h= g.lang.tab le,c=h.cel l,e=g.lang .common,k= CKEDITOR.d ialog.vali date,n=/^( \d+(?:\.\d +)?)(px|%) $/,f={type :"html",ht ml:"\x26nb sp;"},p="r tl"== | |||||
| 6 | g.lang.dir ,m=g.plugi ns.colordi alog;retur n{title:c. title,minW idth:CKEDI TOR.env.ie &&CKEDITOR .env.quirk s?450:410, minHeight: CKEDITOR.e nv.ie&&(CK EDITOR.env .ie7Compat ||CKEDITOR .env.quirk s)?230:220 ,contents: [{id:"info ",label:c. title,acce ssKey:"I", elements:[ {type:"hbo x",widths: ["40%","5% ","40%"],c hildren:[{ type:"vbox ",padding: 0,children :[{type:"h box",width s:["70%"," 30%"],chil dren:[{typ e:"text",i d:"width", width:"100 px",label: e.width,va lidate:k.n umber(c.in validWidth ),onLoad:f unction(){ var a=this .getDialog ().getCont entElement ("info", | |||||
| 7 | "widthType ").getElem ent(),b=th is.getInpu tElement() ,c=b.getAt tribute("a ria-labell edby");b.s etAttribut e("aria-la belledby", [c,a.$.id] .join(" ") )},setup:d (function( a){var b=p arseInt(a. getAttribu te("width" ),10);a=pa rseInt(a.g etStyle("w idth"),10) ;return is NaN(a)?isN aN(b)?"":b :a}),commi t:function (a){var b= parseInt(t his.getVal ue(),10),c =this.getD ialog().ge tValueOf(" info","wid thType")|| l(a);isNaN (b)?a.remo veStyle("w idth"):a.s etStyle("w idth",b+c) ;a.removeA ttribute(" width")}," default":" "},{type:" select",id :"widthTyp e", | |||||
| 8 | label:g.la ng.table.w idthUnit,l abelStyle: "visibilit y:hidden", "default": "px",items :[[h.width Px,"px"],[ h.widthPc, "%"]],setu p:d(l)}]}, {type:"hbo x",widths: ["70%","30 %"],childr en:[{type: "text",id: "height",l abel:e.hei ght,width: "100px","d efault":"" ,validate: k.number(c .invalidHe ight),onLo ad:functio n(){var a= this.getDi alog().get ContentEle ment("info ","htmlHei ghtType"). getElement (),b=this. getInputEl ement(),c= b.getAttri bute("aria -labelledb y");b.setA ttribute(" aria-label ledby",[c, a.$.id].jo in(" "))}, setup:d(fu nction(a){ var b= | |||||
| 9 | parseInt(a .getAttrib ute("heigh t"),10);a= parseInt(a .getStyle( "height"), 10);return isNaN(a)? isNaN(b)?" ":b:a}),co mmit:funct ion(a){var b=parseIn t(this.get Value(),10 );isNaN(b) ?a.removeS tyle("heig ht"):a.set Style("hei ght",CKEDI TOR.tools. cssLength( b));a.remo veAttribut e("height" )}},{id:"h tmlHeightT ype",type: "html",htm l:"\x3cbr /\x3e"+h.w idthPx}]}, f,{type:"s elect",id: "wordWrap" ,label:c.w ordWrap,"d efault":"y es",items: [[c.yes,"y es"],[c.no ,"no"]],se tup:d(func tion(a){va r b=a.getA ttribute(" noWrap");i f("nowrap" == | |||||
| 10 | a.getStyle ("white-sp ace")||b)r eturn"no"} ),commit:f unction(a) {"no"==thi s.getValue ()?a.setSt yle("white -space","n owrap"):a. removeStyl e("white-s pace");a.r emoveAttri bute("noWr ap")}},f,{ type:"sele ct",id:"hA lign",labe l:c.hAlign ,"default" :"",items: [[e.notSet ,""],[e.al ignLeft,"l eft"],[e.a lignCenter ,"center"] ,[e.alignR ight,"righ t"],[e.ali gnJustify, "justify"] ],setup:d( function(a ){var b=a. getAttribu te("align" );return a .getStyle( "text-alig n")||b||"" }),commit: function(a ){var b=th is.getValu e();b?a.se tStyle("te xt-align", | |||||
| 11 | b):a.remov eStyle("te xt-align") ;a.removeA ttribute(" align")}}, {type:"sel ect",id:"v Align",lab el:c.vAlig n,"default ":"",items :[[e.notSe t,""],[e.a lignTop,"t op"],[e.al ignMiddle, "middle"], [e.alignBo ttom,"bott om"],[c.al ignBaselin e,"baselin e"]],setup :d(functio n(a){var b =a.getAttr ibute("vAl ign");a=a. getStyle(" vertical-a lign");swi tch(a){cas e "top":ca se "middle ":case "bo ttom":case "baseline ":break;de fault:a="" }return a| |b||""}),c ommit:func tion(a){va r b=this.g etValue(); b?a.setSty le("vertic al-align", b):a.remov eStyle("ve rtical-ali gn"); | |||||
| 12 | a.removeAt tribute("v Align")}}] },f,{type: "vbox",pad ding:0,chi ldren:[{ty pe:"select ",id:"cell Type",labe l:c.cellTy pe,"defaul t":"td",it ems:[[c.da ta,"td"],[ c.header," th"]],setu p:d(functi on(a){retu rn a.getNa me()}),com mit:functi on(a){a.re nameNode(t his.getVal ue())}},f, {type:"tex t",id:"row Span",labe l:c.rowSpa n,"default ":"",valid ate:k.inte ger(c.inva lidRowSpan ),setup:d( function(a ){if((a=pa rseInt(a.g etAttribut e("rowSpan "),10))&&1 !=a)return a}),commi t:function (a){var b= parseInt(t his.getVal ue(),10);b &&1!=b?a.s etAttribut e("rowSpan ", | |||||
| 13 | this.getVa lue()):a.r emoveAttri bute("rowS pan")}},{t ype:"text" ,id:"colSp an",label: c.colSpan, "default": "",validat e:k.intege r(c.invali dColSpan), setup:d(fu nction(a){ if((a=pars eInt(a.get Attribute( "colSpan") ,10))&&1!= a)return a }),commit: function(a ){var b=pa rseInt(thi s.getValue (),10);b&& 1!=b?a.set Attribute( "colSpan", this.getVa lue()):a.r emoveAttri bute("colS pan")}},f, {type:"hbo x",padding :0,widths: ["60%","40 %"],childr en:[{type: "text",id: "bgColor", label:c.bg Color,"def ault":"",s etup:d(fun ction(a){v ar b=a.get Attribute( "bgColor") ; | |||||
| 14 | return a.g etStyle("b ackground- color")||b }),commit: function(a ){this.get Value()?a. setStyle(" background -color",th is.getValu e()):a.rem oveStyle(" background -color");a .removeAtt ribute("bg Color")}}, m?{type:"b utton",id: "bgColorCh oose","cla ss":"color Chooser",l abel:c.cho oseColor,o nLoad:func tion(){thi s.getEleme nt().getPa rent().set Style("ver tical-alig n","bottom ")},onClic k:function (){g.getCo lorFromDia log(functi on(a){a&&t his.getDia log().getC ontentElem ent("info" ,"bgColor" ).setValue (a);this.f ocus()},th is)}}:f]}, f, | |||||
| 15 | {type:"hbo x",padding :0,widths: ["60%","40 %"],childr en:[{type: "text",id: "borderCol or",label: c.borderCo lor,"defau lt":"",set up:d(funct ion(a){var b=a.getAt tribute("b orderColor ");return a.getStyle ("border-c olor")||b} ),commit:f unction(a) {this.getV alue()?a.s etStyle("b order-colo r",this.ge tValue()): a.removeSt yle("borde r-color"); a.removeAt tribute("b orderColor ")}},m?{ty pe:"button ",id:"bord erColorCho ose","clas s":"colorC hooser",la bel:c.choo seColor,st yle:(p?"ma rgin-right ":"margin- left")+": 10px",onLo ad:functio n(){this.g etElement( ).getParen t().setSty le("vertic al-align", | |||||
| 16 | "bottom")} ,onClick:f unction(){ g.getColor FromDialog (function( a){a&&this .getDialog ().getCont entElement ("info","b orderColor ").setValu e(a);this. focus()},t his)}}:f]} ]}]}]}],on Show:funct ion(){this .cells=CKE DITOR.plug ins.tablet ools.getSe lectedCell s(this._.e ditor.getS election() );this.set upContent( this.cells )},onOk:fu nction(){f or(var a=t his._.edit or.getSele ction(),b= a.createBo okmarks(), c=this.cel ls,d=0;d<c .length;d+ +)this.com mitContent (c[d]);thi s._.editor .forceNext SelectionC heck();a.s electBookm arks(b);th is._.edito r.selectio nChange()} , | |||||
| 17 | onLoad:fun ction(){va r a={};thi s.foreach( function(b ){b.setup& &b.commit& &(b.setup= CKEDITOR.t ools.overr ide(b.setu p,function (c){return function( ){c.apply( this,argum ents);a[b. id]=b.getV alue()}}), b.commit=C KEDITOR.to ols.overri de(b.commi t,function (c){return function( ){a[b.id]! ==b.getVal ue()&&c.ap ply(this,a rguments)} }))})}}}); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.