Produced by Araxis Merge on 2/1/2017 2:57:47 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\colordialog\dialogs | colordialog.js | Tue Dec 20 19:50:49 2016 UTC |
| 2 | Wed Feb 1 19:57:47 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 13 |
| 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( "colordial og",functi on(x){func tion q(){d .getById(r ).removeSt yle("backg round-colo r");t.getC ontentElem ent("picke r","select edColor"). setValue(" ");l&&l.re moveAttrib ute("aria- selected") ;l=null}fu nction y(a ){a=a.data .getTarget ();var c;" td"==a.get Name()&&(c =a.getChil d(0).getHt ml())&&(l= a,l.setAtt ribute("ar ia-selecte d",!0),t.g etContentE lement("pi cker","sel ectedColor ").setValu e(c))}func tion C(a){ a=a.replac e(/^#/,"") ;for(var c =0,b=[];2> =c;c++)b[c ]=parseInt (a.substr( 2*c,2),16) ;return"#" + | |||||
| 6 | (165<=.212 6*b[0]+.71 52*b[1]+.0 722*b[2]?" 000":"fff" )}function z(a){!a.n ame&&(a=ne w CKEDITOR .event(a)) ;var c=!/m ouse/.test (a.name),b =a.data.ge tTarget(), g;"td"==b. getName()& &(g=b.getC hild(0).ge tHtml())&& (u(a),c?e= b:A=b,c&&( b.setStyle ("border-c olor",C(g) ),b.setSty le("border -style","d otted")),d .getById(m ).setStyle ("backgrou nd-color", g),d.getBy Id(n).setH tml(g))}fu nction u(a ){if(a=!/m ouse/.test (a.name)&& e){var c=a .getChild( 0).getHtml ();a.setSt yle("borde r-color",c );a.setSty le("border -style","s olid")}e|| A|| | |||||
| 7 | (d.getById (m).remove Style("bac kground-co lor"),d.ge tById(n).s etHtml("\x 26nbsp;")) }function D(a){var c =a.data,b= c.getTarge t(),g=c.ge tKeystroke (),d="rtl" ==x.lang.d ir;switch( g){case 38 :if(a=b.ge tParent(). getPreviou s())a=a.ge tChild([b. getIndex() ]),a.focus ();c.preve ntDefault( );break;ca se 40:(a=b .getParent ().getNext ())&&(a=a. getChild([ b.getIndex ()]))&&1== a.type&&a. focus();c. preventDef ault();bre ak;case 32 :case 13:y (a);c.prev entDefault ();break;c ase d?37:3 9:(a=b.get Next())?1= =a.type&&( a.focus(), c.preventD efault(!0) ): | |||||
| 8 | (a=b.getPa rent().get Next())&&( a=a.getChi ld([0]))&& 1==a.type& &(a.focus( ),c.preven tDefault(! 0));break; case d?39: 37:if(a=b. getPreviou s())a.focu s(),c.prev entDefault (!0);else if(a=b.get Parent().g etPrevious ())a=a.get Last(),a.f ocus(),c.p reventDefa ult(!0)}}v ar v=CKEDI TOR.dom.el ement,d=CK EDITOR.doc ument,f=x. lang.color dialog,t,B ={type:"ht ml",html:" \x26nbsp;" },l,e,A,p= function(a ){return C KEDITOR.to ols.getNex tId()+"_"+ a},m=p("hi color"),n= p("hicolor text"),r=p ("selhicol or"),h;(fu nction(){f unction a( a,d){for(v ar w= | |||||
| 9 | a;w<a+3;w+ +){var e=n ew v(h.$.i nsertRow(- 1));e.setA ttribute(" role","row ");for(var f=d;f<d+3 ;f++)for(v ar g=0;6>g ;g++)c(e.$ ,"#"+b[f]+ b[g]+b[w]) }}function c(a,c){va r b=new v( a.insertCe ll(-1));b. setAttribu te("class" ,"ColorCel l");b.setA ttribute(" tabIndex", -1);b.setA ttribute(" role","gri dcell");b. on("keydow n",D);b.on ("click",y );b.on("fo cus",z);b. on("blur", u);b.setSt yle("backg round-colo r",c);b.se tStyle("bo rder","1px solid "+c );b.setSty le("width" ,"14px");b .setStyle( "height"," 14px");var d=p("colo r_table_ce ll"); | |||||
| 10 | b.setAttri bute("aria -labelledb y",d);b.ap pend(CKEDI TOR.dom.el ement.crea teFromHtml ('\x3cspan id\x3d"'+ d+'" class \x3d"cke_v oice_label "\x3e'+c+" \x3c/span\ x3e",CKEDI TOR.docume nt))}h=CKE DITOR.dom. element.cr eateFromHt ml('\x3cta ble tabInd ex\x3d"-1" aria-labe l\x3d"'+f. options+'" role\x3d" grid" styl e\x3d"bord er-collaps e:separate ;" cellspa cing\x3d"0 "\x3e\x3cc aption cla ss\x3d"cke _voice_lab el"\x3e'+f .options+' \x3c/capti on\x3e\x3c tbody role \x3d"prese ntation"\x 3e\x3c/tbo dy\x3e\x3c /table\x3e ');h.on("m ouseover", z); | |||||
| 11 | h.on("mous eout",u);v ar b="00 3 3 66 99 cc ff".split (" ");a(0, 0);a(3,0); a(0,3);a(3 ,3);var d= new v(h.$. insertRow( -1));d.set Attribute( "role","ro w");c(d.$, "#000000") ;for(var e =0;16>e;e+ +){var k=e .toString( 16);c(d.$, "#"+k+k+k+ k+k+k)}c(d .$,"#fffff f")})();re turn{title :f.title,m inWidth:36 0,minHeigh t:220,onLo ad:functio n(){t=this },onHide:f unction(){ q();var a= e.getChild (0).getHtm l();e.setS tyle("bord er-color", a);e.setSt yle("borde r-style"," solid");d. getById(m) .removeSty le("backgr ound-color ");d.getBy Id(n).setH tml("\x26n bsp;"); | |||||
| 12 | e=null},co ntents:[{i d:"picker" ,label:f.t itle,acces sKey:"I",e lements:[{ type:"hbox ",padding: 0,widths:[ "70%","10% ","30%"],c hildren:[{ type:"html ",html:"\x 3cdiv\x3e\ x3c/div\x3 e",onLoad: function() {CKEDITOR. document.g etById(thi s.domId).a ppend(h)}, focus:func tion(){(e| |this.getE lement().g etElements ByTag("td" ).getItem( 0)).focus( )}},B,{typ e:"vbox",p adding:0,w idths:["70 %","5%","2 5%"],child ren:[{type :"html",ht ml:"\x3csp an\x3e"+f. highlight+ '\x3c/span \x3e\x3cdi v id\x3d"' +m+'" styl e\x3d"bord er: 1px so lid; heigh t: 74px; w idth: 74px ;"\x3e\x3c /div\x3e\x 3cdiv id\x 3d"'+ | |||||
| 13 | n+'"\x3e\x 26nbsp;\x3 c/div\x3e\ x3cspan\x3 e'+f.selec ted+'\x3c/ span\x3e\x 3cdiv id\x 3d"'+r+'" style\x3d" border: 1p x solid; h eight: 20p x; width: 74px;"\x3e \x3c/div\x 3e'},{type :"text",la bel:f.sele cted,label Style:"dis play:none" ,id:"selec tedColor", style:"wid th: 76px;m argin-top: 4px",onCha nge:functi on(){try{d .getById(r ).setStyle ("backgrou nd-color", this.getVa lue())}cat ch(a){q()} }},B,{type :"button", id:"clear" ,label:f.c lear,onCli ck:q}]}]}] }]}}); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.