Produced by Araxis Merge on 2/1/2017 2:57:51 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\liststyle\dialogs | liststyle.js | Tue Dec 20 19:50:49 2016 UTC |
| 2 | Wed Feb 1 19:57:51 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 10 |
| 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 | (function( ){function d(c,d){va r b;try{b= c.getSelec tion().get Ranges()[0 ]}catch(f) {return nu ll}b.shrin k(CKEDITOR .SHRINK_TE XT);return c.element Path(b.get CommonAnce stor()).co ntains(d,1 )}function e(c,e){va r b=c.lang .liststyle ;if("bulle tedListSty le"==e)ret urn{title: b.bulleted Title,minW idth:300,m inHeight:5 0,contents :[{id:"inf o",accessK ey:"I",ele ments:[{ty pe:"select ",label:b. type,id:"t ype",align :"center", style:"wid th:150px", items:[[b. notset,""] ,[b.circle ,"circle"] ,[b.disc," disc"],[b. square,"sq uare"]],se tup:functi on(a){a= | |||||
| 6 | a.getStyle ("list-sty le-type")| |h[a.getAt tribute("t ype")]||a. getAttribu te("type") ||"";this. setValue(a )},commit: function(a ){var b=th is.getValu e();b?a.se tStyle("li st-style-t ype",b):a. removeStyl e("list-st yle-type") }}]}],onSh ow:functio n(){var a= this.getPa rentEditor ();(a=d(a, "ul"))&&th is.setupCo ntent(a)}, onOk:funct ion(){var a=this.get ParentEdit or();(a=d( a,"ul"))&& this.commi tContent(a )}};if("nu mberedList Style"==e) {var g=[[b .notset,"" ],[b.lower Roman,"low er-roman"] ,[b.upperR oman,"uppe r-roman"], [b.lowerAl pha, | |||||
| 7 | "lower-alp ha"],[b.up perAlpha," upper-alph a"],[b.dec imal,"deci mal"]];(!C KEDITOR.en v.ie||7<CK EDITOR.env .version)& &g.concat( [[b.armeni an,"armeni an"],[b.de cimalLeadi ngZero,"de cimal-lead ing-zero"] ,[b.georgi an,"georgi an"],[b.lo werGreek," lower-gree k"]]);retu rn{title:b .numberedT itle,minWi dth:300,mi nHeight:50 ,contents: [{id:"info ",accessKe y:"I",elem ents:[{typ e:"hbox",w idths:["25 %","75%"], children:[ {label:b.s tart,type: "text",id: "start",va lidate:CKE DITOR.dial og.validat e.integer( b.validate StartNumbe r),setup:f unction(a) {a= | |||||
| 8 | a.getFirst (f).getAtt ribute("va lue")||a.g etAttribut e("start") ||1;this.s etValue(a) },commit:f unction(a) {var b=a.g etFirst(f) ,c=b.getAt tribute("v alue")||a. getAttribu te("start" )||1;a.get First(f).r emoveAttri bute("valu e");var d= parseInt(t his.getVal ue(),10);i sNaN(d)?a. removeAttr ibute("sta rt"):a.set Attribute( "start",d) ;a=b;b=c;f or(d=isNaN (d)?1:d;(a =a.getNext (f))&&b++; )a.getAttr ibute("val ue")==b&&a .setAttrib ute("value ",d+b-c)}} ,{type:"se lect",labe l:b.type,i d:"type",s tyle:"widt h: 100%;", items:g,se tup:functi on(a){a= | |||||
| 9 | a.getStyle ("list-sty le-type")| |h[a.getAt tribute("t ype")]||a. getAttribu te("type") ||"";this. setValue(a )},commit: function(a ){var b=th is.getValu e();b?a.se tStyle("li st-style-t ype",b):a. removeStyl e("list-st yle-type") }}]}]}],on Show:funct ion(){var a=this.get ParentEdit or();(a=d( a,"ol"))&& this.setup Content(a) },onOk:fun ction(){va r a=this.g etParentEd itor();(a= d(a,"ol")) &&this.com mitContent (a)}}}}var f=functio n(c){retur n c.type== CKEDITOR.N ODE_ELEMEN T&&c.is("l i")},h={a: "lower-alp ha",A:"upp er-alpha", i:"lower-r oman", | |||||
| 10 | I:"upper-r oman",1:"d ecimal",di sc:"disc", circle:"ci rcle",squa re:"square "};CKEDITO R.dialog.a dd("number edListStyl e",functio n(c){retur n e(c,"num beredListS tyle")});C KEDITOR.di alog.add(" bulletedLi stStyle",f unction(c) {return e( c,"bullete dListStyle ")})})(); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.