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.
| # | 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\docprops\dialogs | docprops.js | Tue Dec 20 19:50:43 2016 UTC |
| 2 | Wed Feb 1 19:57:49 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 25 |
| 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( "docProps" ,function( g){functio n t(a,d){v ar e=funct ion(){b(th is);d(this ,this._.pa rentDialog )},b=funct ion(a){a.r emoveListe ner("ok",e );a.remove Listener(" cancel",b) },f=functi on(a){a.on ("ok",e);a .on("cance l",b)};g.e xecCommand (a);if(g._ .storedDia logs.color dialog)f(g ._.storedD ialogs.col ordialog); else CKEDI TOR.on("di alogDefini tion",func tion(b){if (b.data.na me==a){var d=b.data. definition ;b.removeL istener(); d.onLoad=C KEDITOR.to ols.overri de(d.onLoa d,function (a){return function( ){f(this); d.onLoad= | |||||
| 6 | a;"functio n"==typeof a&&a.call (this)}})} })}functio n n(){var a=this.get Dialog().g etContentE lement("ge neral",thi s.id+"Othe r");a&&("o ther"==thi s.getValue ()?(a.getI nputElemen t().remove Attribute( "readOnly" ),a.focus( ),a.getEle ment().rem oveClass(" cke_disabl ed")):(a.g etInputEle ment().set Attribute( "readOnly" ,!0),a.get Element(). addClass(" cke_disabl ed")))}fun ction k(a, d,e){retur n function (b,f,c){f= m;b="undef ined"!=typ eof e?e:th is.getValu e();!b&&a in f?f[a]. remove():b &&a in f?f [a].setAtt ribute("co ntent",b): b&& | |||||
| 7 | (f=new CKE DITOR.dom. element("m eta",g.doc ument),f.s etAttribut e(d?"http- equiv":"na me",a),f.s etAttribut e("content ",b),c.app end(f))}}f unction l( a,d){retur n function (){var e=m ,e=a in e? e[a].getAt tribute("c ontent")|| "":"";if(d )return e; this.setVa lue(e);ret urn null}} function p (a){return function( d,e,b,f){f .removeAtt ribute("ma rgin"+a);d =this.getV alue();""! ==d?f.setS tyle("marg in-"+a,CKE DITOR.tool s.cssLengt h(d)):f.re moveStyle( "margin-"+ a)}}functi on q(a,d,e ){a.remove Style(d);a .getComput edStyle(d) !=e&&a.set Style(d, | |||||
| 8 | e)}var c=g .lang.docp rops,h=g.l ang.common ,m={},r=fu nction(a,d ,e){return {type:"hbo x",padding :0,widths: ["60%","40 %"],childr en:[CKEDIT OR.tools.e xtend({typ e:"text",i d:a,label: c[d]},e||{ },1),{type :"button", id:a+"Choo se",label: c.chooseCo lor,classN ame:"color Chooser",o nClick:fun ction(){va r b=this;t ("colordia log",funct ion(d){var e=b.getDi alog();e.g etContentE lement(e._ .currentTa bId,a).set Value(d.ge tContentEl ement("pic ker","sele ctedColor" ).getValue ())})}}]}} ,u="javasc ript:void( (function( ){"+encode URICompone nt("docume nt.open(); "+ | |||||
| 9 | (CKEDITOR. env.ie?"(" +CKEDITOR. tools.fixD omain+")() ;":"")+'do cument.wri te( \'\x3c html style \x3d"backg round-colo r: #ffffff ; height: 100%"\x3e\ x3chead\x3 e\x3c/head \x3e\x3cbo dy style\x 3d"width: 100%; heig ht: 100%; margin: 0p x"\x3e'+c. previewHtm l+"\x3c/bo dy\x3e\x3c /html\x3e' );documen t.close(); ")+"})())" ;return{ti tle:c.titl e,minHeigh t:330,minW idth:500,o nShow:func tion(){for (var a=g.d ocument,d= a.getEleme ntsByTag(" html").get Item(0),e= a.getHead( ),b=a.getB ody(),f={} ,c=a.getEl ementsByTa g("meta"), h=c.count( ), | |||||
| 10 | k=0;k<h;k+ +){var l=c .getItem(k );f[l.getA ttribute(l .hasAttrib ute("http- equiv")?"h ttp-equiv" :"name").t oLowerCase ()]=l}m=f; this.setup Content(a, d,e,b)},on Hide:funct ion(){m={} },onOk:fun ction(){va r a=g.docu ment,d=a.g etElements ByTag("htm l").getIte m(0),e=a.g etHead(),b =a.getBody ();this.co mmitConten t(a,d,e,b) },contents :[{id:"gen eral",labe l:h.genera lTab,eleme nts:[{type :"text",id :"title",l abel:c.doc Title,setu p:function (a){this.s etValue(a. getElement sByTag("ti tle").getI tem(0).dat a("cke-tit le"))},com mit:functi on(a, | |||||
| 11 | d,e,b,c){c ||a.getEle mentsByTag ("title"). getItem(0) .data("cke -title",th is.getValu e())}},{ty pe:"hbox", children:[ {type:"sel ect",id:"d ir",label: h.langDir, style:"wid th: 100%", items:[[h. notSet,""] ,[h.langDi rLtr,"ltr" ],[h.langD irRtl,"rtl "]],setup: function(a ,d,e,b){th is.setValu e(b.getDir ection()|| "")},commi t:function (a,d,e,b){ (a=this.ge tValue())? b.setAttri bute("dir" ,a):b.remo veAttribut e("dir");b .removeSty le("direct ion")}},{t ype:"text" ,id:"langC ode",label :h.langCod e,setup:fu nction(a,d ){this.set Value(d.ge tAttribute ("xml:lang ")|| | |||||
| 12 | d.getAttri bute("lang ")||"")},c ommit:func tion(a,d,e ,b,c){c||( (a=this.ge tValue())? d.setAttri butes({"xm l:lang":a, lang:a}):d .removeAtt ributes({" xml:lang": 1,lang:1}) )}}]},{typ e:"hbox",c hildren:[{ type:"sele ct",id:"ch arset",lab el:c.chars et,style:" width: 100 %",items:[ [h.notSet, ""],[c.cha rsetASCII, "us-ascii" ],[c.chars etCE,"iso- 8859-2"],[ c.charsetC T,"big5"], [c.charset CR,"iso-88 59-5"],[c. charsetGR, "iso-8859- 7"],[c.cha rsetJP,"is o-2022-jp" ],[c.chars etKR,"iso- 2022-kr"], [c.charset TR,"iso-88 59-9"],[c. charsetUN, "utf-8"], | |||||
| 13 | [c.charset WE,"iso-88 59-1"],[c. other,"oth er"]],"def ault":"",o nChange:fu nction(){t his.getDia log().sele ctedCharse t="other"! =this.getV alue()?thi s.getValue ():"";n.ca ll(this)}, setup:func tion(){thi s.metaChar set="chars et"in m;va r a=l(this .metaChars et?"charse t":"conten t-type",1, 1).call(th is);!this. metaCharse t&&a.match (/charset= [^=]+$/)&& (a=a.subst ring(a.ind exOf("\x3d ")+1));if( a){this.se tValue(a.t oLowerCase ());if(!th is.getValu e()){this. setValue(" other");va r d=this.g etDialog() .getConten tElement(" general"," charsetOth er"); | |||||
| 14 | d&&d.setVa lue(a)}thi s.getDialo g().select edCharset= a}n.call(t his)},comm it:functio n(a,d,e,b, c){c||(b=t his.getVal ue(),c=thi s.getDialo g().getCon tentElemen t("general ","charset Other"),"o ther"==b&& (b=c?c.get Value():"" ),b&&!this .metaChars et&&(b=(m[ "content-t ype"]?m["c ontent-typ e"].getAtt ribute("co ntent").sp lit(";")[0 ]:"text/ht ml")+"; ch arset\x3d" +b),k(this .metaChars et?"charse t":"conten t-type",1, b).call(th is,a,d,e)) }},{type:" text",id:" charsetOth er",label: c.charsetO ther,onCha nge:functi on(){this. getDialog( ).selected Charset= | |||||
| 15 | this.getVa lue()}}]}, {type:"hbo x",childre n:[{type:" select",id :"docType" ,label:c.d ocType,sty le:"width: 100%",ite ms:[[h.not Set,""],[" XHTML 1.1" ,'\x3c!DOC TYPE html PUBLIC "-/ /W3C//DTD XHTML 1.1/ /EN" "http ://www.w3. org/TR/xht ml11/DTD/x html11.dtd "\x3e'],[" XHTML 1.0 Transition al",'\x3c! DOCTYPE ht ml PUBLIC "-//W3C//D TD XHTML 1 .0 Transit ional//EN" "http://w ww.w3.org/ TR/xhtml1/ DTD/xhtml1 -transitio nal.dtd"\x 3e'],["XHT ML 1.0 Str ict",'\x3c !DOCTYPE h tml PUBLIC "-//W3C// DTD XHTML 1.0 Strict //EN" "htt p://www.w3 .org/TR/xh tml1/DTD/x html1-stri ct.dtd"\x3 e'], | |||||
| 16 | ["XHTML 1. 0 Frameset ",'\x3c!DO CTYPE html PUBLIC "- //W3C//DTD XHTML 1.0 Frameset/ /EN" "http ://www.w3. org/TR/xht ml1/DTD/xh tml1-frame set.dtd"\x 3e'],["HTM L 5","\x3c !DOCTYPE h tml\x3e"], ["HTML 4.0 1 Transiti onal",'\x3 c!DOCTYPE HTML PUBLI C "-//W3C/ /DTD HTML 4.01 Trans itional//E N"\x3e'],[ "HTML 4.01 Strict",' \x3c!DOCTY PE HTML PU BLIC "-//W 3C//DTD HT ML 4.01//E N" "http:/ /www.w3.or g/TR/html4 /strict.dt d"\x3e'],[ "HTML 4.01 Frameset" ,'\x3c!DOC TYPE HTML PUBLIC "-/ /W3C//DTD HTML 4.01 Frameset// EN" "http: //www.w3.o rg/TR/html 4/frameset .dtd"\x3e' ], | |||||
| 17 | ["HTML 3.2 ",'\x3c!DO CTYPE HTML PUBLIC "- //W3C//DTD HTML 3.2 Final//EN" \x3e'],["H TML 2.0",' \x3c!DOCTY PE HTML PU BLIC "-//I ETF//DTD H TML//EN"\x 3e'],[c.ot her,"other "]],onChan ge:n,setup :function( ){if(g.doc Type&&(thi s.setValue (g.docType ),!this.ge tValue())) {this.setV alue("othe r");var a= this.getDi alog().get ContentEle ment("gene ral","docT ypeOther") ;a&&a.setV alue(g.doc Type)}n.ca ll(this)}, commit:fun ction(a,d, c,b,f){f|| (a=this.ge tValue(),d =this.getD ialog().ge tContentEl ement("gen eral","doc TypeOther" ),g.docTyp e= | |||||
| 18 | "other"==a ?d?d.getVa lue():"":a )}},{type: "text",id: "docTypeOt her",label :c.docType Other}]},{ type:"chec kbox",id:" xhtmlDec", label:c.xh tmlDec,set up:functio n(){this.s etValue(!! g.xmlDecla ration)},c ommit:func tion(a,d,c ,b,f){f||( this.getVa lue()?(g.x mlDeclarat ion='\x3c? xml versio n\x3d"1.0" encoding\ x3d"'+(thi s.getDialo g().select edCharset| |"utf-8")+ '"?\x3e',d .setAttrib ute("xmlns ","http:// www.w3.org /1999/xhtm l")):(g.xm lDeclarati on="",d.re moveAttrib ute("xmlns ")))}}]},{ id:"design ",label:c. design,ele ments:[{ty pe:"hbox", | |||||
| 19 | widths:["6 0%","40%"] ,children: [{type:"vb ox",childr en:[r("txt Color","tx tColor",{s etup:funct ion(a,d,c, b){this.se tValue(b.g etComputed Style("col or"))},com mit:functi on(a,d,c,b ,f){if(thi s.isChange d()||f)b.r emoveAttri bute("text "),(a=this .getValue( ))?b.setSt yle("color ",a):b.rem oveStyle(" color")}}) ,r("bgColo r","bgColo r",{setup: function(a ,d,c,b){a= b.getCompu tedStyle(" background -color")|| "";this.se tValue("tr ansparent" ==a?"":a)} ,commit:fu nction(a,d ,c,b,f){if (this.isCh anged()||f )b.removeA ttribute(" bgcolor"), (a= | |||||
| 20 | this.getVa lue())?b.s etStyle("b ackground- color",a): q(b,"backg round-colo r","transp arent")}}) ,{type:"hb ox",widths :["60%","4 0%"],paddi ng:1,child ren:[{type :"text",id :"bgImage" ,label:c.b gImage,set up:functio n(a,d,c,b) {a=b.getCo mputedStyl e("backgro und-image" )||"";a="n one"==a?"" :a.replace (/url\(\s* (["']?)\s* ([^\)]*)\s *\1\s*\)/i ,function( a,b,d){ret urn d});th is.setValu e(a)},comm it:functio n(a,d,c,b) {b.removeA ttribute(" background ");(a=this .getValue( ))?b.setSt yle("backg round-imag e","url("+ a+")"):q(b ,"backgrou nd-image", | |||||
| 21 | "none")}}, {type:"but ton",id:"b gImageChoo se",label: h.browseSe rver,style :"display: inline-blo ck;margin- top:10px;" ,hidden:!0 ,filebrows er:"design :bgImage"} ]},{type:" checkbox", id:"bgFixe d",label:c .bgFixed,s etup:funct ion(a,d,c, b){this.se tValue("fi xed"==b.ge tComputedS tyle("back ground-att achment")) },commit:f unction(a, d,c,b){thi s.getValue ()?b.setSt yle("backg round-atta chment","f ixed"):q(b ,"backgrou nd-attachm ent","scro ll")}}]},{ type:"vbox ",children :[{type:"h tml",id:"m arginTitle ",html:'\x 3cdiv styl e\x3d"text -align: ce nter; marg in: 0px au to; font-w eight: bol d"\x3e'+ | |||||
| 22 | c.margin+" \x3c/div\x 3e"},{type :"text",id :"marginTo p",label:c .marginTop ,style:"wi dth: 80px; text-alig n: center" ,align:"ce nter",inpu tStyle:"te xt-align: center",se tup:functi on(a,d,c,b ){this.set Value(b.ge tStyle("ma rgin-top") ||b.getAtt ribute("ma rgintop")| |"")},comm it:p("top" )},{type:" hbox",chil dren:[{typ e:"text",i d:"marginL eft",label :c.marginL eft,style: "width: 80 px; text-a lign: cent er",align: "center",i nputStyle: "text-alig n: center" ,setup:fun ction(a,d, c,b){this. setValue(b .getStyle( "margin-le ft")||b.ge tAttribute ("marginle ft")|| | |||||
| 23 | "")},commi t:p("left" )},{type:" text",id:" marginRigh t",label:c .marginRig ht,style:" width: 80p x; text-al ign: cente r",align:" center",in putStyle:" text-align : center", setup:func tion(a,d,c ,b){this.s etValue(b. getStyle(" margin-rig ht")||b.ge tAttribute ("marginri ght")||"") },commit:p ("right")} ]},{type:" text",id:" marginBott om",label: c.marginBo ttom,style :"width: 8 0px; text- align: cen ter",align :"center", inputStyle :"text-ali gn: center ",setup:fu nction(a,c ,e,b){this .setValue( b.getStyle ("margin-b ottom")||b .getAttrib ute("margi nbottom")| | | |||||
| 24 | "")},commi t:p("botto m")}]}]}]} ,{id:"meta ",label:c. meta,eleme nts:[{type :"textarea ",id:"meta Keywords", label:c.me taKeywords ,setup:l(" keywords") ,commit:k( "keywords" )},{type:" textarea", id:"metaDe scription" ,label:c.m etaDescrip tion,setup :l("descri ption"),co mmit:k("de scription" )},{type:" text",id:" metaAuthor ",label:c. metaAuthor ,setup:l(" author"),c ommit:k("a uthor")},{ type:"text ",id:"meta Copyright" ,label:c.m etaCopyrig ht,setup:l ("copyrigh t"),commit :k("copyri ght")}]},{ id:"previe w",label:h .preview,e lements:[{ type:"html ", | |||||
| 25 | id:"previe wHtml",htm l:'\x3cifr ame src\x3 d"'+u+'" s tyle\x3d"w idth: 100% ; height: 310px" hid efocus\x3d "true" fra meborder\x 3d"0"\x3e\ x3c/iframe \x3e',onLo ad:functio n(){var a= this.getEl ement();th is.getDial og().on("s electPage" ,function( c){if("pre view"==c.d ata.page){ var e=this ;setTimeou t(function (){var b=a .getFrameD ocument(), c=b.getEle mentsByTag ("html").g etItem(0), d=b.getHea d(),g=b.ge tBody();e. commitCont ent(b,c,d, g,1)},50)} });a.getAs cendant("t able").set Style("hei ght","100% ")}}]}]}}) ; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.