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\uicolor\dialogs | uicolor.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 | 9 |
| 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( "uicolor", function(b ){function f(a){/^#/ .test(a)&& (a=window. YAHOO.util .Color.hex 2rgb(a.sub str(1)));c .setValue( a,!0);c.re fresh(e)}f unction g( a){b.setUi Color(a);d ._.content s.tab1.con figBox.set Value('con fig.uiColo r \x3d "#' +c.get("he x")+'"')}v ar d,c,h=b .getUiColo r(),e="cke _uicolor_p icker"+CKE DITOR.tool s.getNextN umber();re turn{title :b.lang.ui color.titl e,minWidth :360,minHe ight:320,o nLoad:func tion(){d=t his;this.s etupConten t();CKEDIT OR.env.ie7 Compat&&d. parts.cont ents.setSt yle("overf low", | |||||
| 6 | "hidden")} ,contents: [{id:"tab1 ",label:"" ,title:"", expand:!0, padding:0, elements:[ {id:"yuiCo lorPicker" ,type:"htm l",html:"\ x3cdiv id\ x3d'"+e+"' class\x3d 'cke_uicol or_picker' style\x3d 'width: 36 0px; heigh t: 200px; position: relative;' \x3e\x3c/d iv\x3e",on Load:funct ion(){var a=CKEDITOR .getUrl("p lugins/uic olor/yui/" );this.pic ker=c=new window.YAH OO.widget. ColorPicke r(e,{showh svcontrols :!0,showhe xcontrols: !0,images: {PICKER_TH UMB:a+"ass ets/picker _thumb.png ",HUE_THUM B:a+"asset s/hue_thum b.png"}}); h&&f(h);c. on("rgbCha nge", | |||||
| 7 | function() {d._.conte nts.tab1.p redefined. setValue(" ");g("#"+c .get("hex" ))});for(v ar a=new C KEDITOR.do m.nodeList (c.getElem entsByTagN ame("input ")),b=0;b< a.count(); b++)a.getI tem(b).add Class("cke _dialog_ui _input_tex t")}},{id: "tab1",typ e:"vbox",c hildren:[{ type:"hbox ",children :[{id:"pre defined",t ype:"selec t","defaul t":"",labe l:b.lang.u icolor.pre defined,it ems:[[""], ["Light bl ue","#9AB8 F3"],["San d","#D2B48 C"],["Meta llic","#94 9AAA"],["P urple","#C 2A3C7"],[" Olive","#A 2C980"],[" Happy gree n","#9BD44 6"],["Jeze bel Blue", | |||||
| 8 | "#14B8C4"] ,["Burn"," #FF893A"], ["Easy red ","#FF6969 "],["Pisce s 3","#48B 4F2"],["Aq uarius 5", "#487ED4"] ,["Absinth e","#A8CF7 6"],["Scra mbled Egg" ,"#C7A622" ],["Hello monday","# 8E8D80"],[ "Lovely su nshine","# F1E8B1"],[ "Recycled air","#B3C 593"],["Do wn","#BCBC A4"],["Mar k Twain"," #CFE91D"], ["Specks o f dust","# D1B596"],[ "Lollipop" ,"#F6CE23" ]],onChang e:function (){var a=t his.getVal ue();a?(f( a),g(a),CK EDITOR.doc ument.getB yId("prede finedPrevi ew").setSt yle("backg round",a)) :CKEDITOR. document.g etById("pr edefinedPr eview").se tStyle("ba ckground", | |||||
| 9 | "")},onSho w:function (){var a=b .getUiColo r();a&&thi s.setValue (a)}},{id: "predefine dPreview", type:"html ",html:'\x 3cdiv id\x 3d"cke_uic olor_previ ew" style\ x3d"border : 1px soli d black; p adding: 3p x; width: 30px;"\x3e \x3cdiv id \x3d"prede finedPrevi ew" style\ x3d"width: 30px; hei ght: 30px; "\x3e\x26n bsp;\x3c/d iv\x3e\x3c /div\x3e'} ]},{id:"co nfigBox",t ype:"text" ,label:b.l ang.uicolo r.config,o nShow:func tion(){var a=b.getUi Color();a& &this.setV alue('conf ig.uiColor \x3d "'+a +'"')}}]}] }],buttons :[CKEDITOR .dialog.ok Button]}}) ; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.