1179. Araxis Merge File Comparison Report

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.

1179.1 Files compared

# 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\codesnippet plugin.js Tue Dec 20 19:50:46 2016 UTC
2 Wed Feb 1 19:57:47 2017 UTC

1179.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 0 0
Removed 1 12

1179.3 Comparison options

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

1179.4 Active regular expressions

No regular expressions were active.

1179.5 Comparison detail

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  m(a){CKED ITOR.tools .extend(th is,a);this .queue=[]; this.init? this.init( CKEDITOR.t ools.bind( function() {for(var a ;a=this.qu eue.pop(); )a.call(th is);this.r eady=!0},t his)):this .ready=!0} function p (a){var b= a.config.c odeSnippet _codeClass ,e=/\r?\n/ g,h=new CK EDITOR.dom .element(" textarea") ;a.widgets .add("code Snippet",{ allowedCon tent:"pre;  code(lang uage-*)",r equiredCon tent:"pre" ,styleable Elements:" pre",templ ate:'\x3cp re\x3e\x3c code class \x3d"'+b+' "\x3e\x3c/ code\x3e\x 3c/pre\x3e ',dialog:" codeSnippe t",        
6   pathName:a .lang.code snippet.pa thName,mas k:!0,parts :{pre:"pre ",code:"co de"},highl ight:funct ion(){var  d=this,c=t his.data,b =function( a){d.parts .code.setH tml(n?a:a. replace(e, "\x3cbr\x3 e"))};b(CK EDITOR.too ls.htmlEnc ode(c.code ));a._.cod esnippet.h ighlighter .highlight (c.code,c. lang,funct ion(d){a.f ire("lockS napshot"); b(d);a.fir e("unlockS napshot")} )},data:fu nction(){v ar a=this. data,b=thi s.oldData; a.code&&th is.parts.c ode.setHtm l(CKEDITOR .tools.htm lEncode(a. code));b&& a.lang!=b. lang&&this .parts.cod e.removeCl ass("langu age-"+        
7   b.lang);a. lang&&(thi s.parts.co de.addClas s("languag e-"+a.lang ),this.hig hlight()); this.oldDa ta=CKEDITO R.tools.co py(a)},upc ast:functi on(d,c){if ("pre"==d. name){for( var g=[],e =d.childre n,k,l=e.le ngth-1;0<= l;l--)k=e[ l],k.type= =CKEDITOR. NODE_TEXT& &k.value.m atch(q)||g .push(k);v ar f;if(1= =g.length& &"code"==( f=g[0]).na me&&1==f.c hildren.le ngth&&f.ch ildren[0]. type==CKED ITOR.NODE_ TEXT){if(g =a._.codes nippet.lan gsRegex.ex ec(f.attri butes["cla ss"]))c.la ng=g[1];h. setHtml(f. getHtml()) ;c.code=h. getValue() ;f.addClas s(b);        
8   return d}} },downcast :function( a){var c=a .getFirst( "code");c. children.l ength=0;c. removeClas s(b);c.add (new CKEDI TOR.htmlPa rser.text( CKEDITOR.t ools.htmlE ncode(this .data.code )));return  a}});var  q=/^[\s\n\ r]*$/}var  n=!CKEDITO R.env.ie|| 8<CKEDITOR .env.versi on;CKEDITO R.plugins. add("codes nippet",{r equires:"w idget,dial og",lang:" ar,bg,ca,c s,da,de,el ,en,en-gb, eo,es,et,f a,fi,fr,fr -ca,gl,he, hr,hu,it,j a,km,ko,ku ,lt,lv,nb, nl,no,pl,p t,pt-br,ro ,ru,sk,sl, sq,sv,th,t r,tt,ug,uk ,vi,zh,zh- cn",icons: "codesnipp et",hidpi: !0,        
9   beforeInit :function( a){a._.cod esnippet={ };this.set Highlighte r=function (b){a._.co desnippet. highlighte r=b;b=a._. codesnippe t.langs=a. config.cod eSnippet_l anguages|| b.language s;a._.code snippet.la ngsRegex=n ew RegExp( "(?:^|\\s) language-( "+CKEDITOR .tools.obj ectKeys(b) .join("|") +")(?:\\s| $)")}},onL oad:functi on(){CKEDI TOR.dialog .add("code Snippet",t his.path+" dialogs/co desnippet. js")},init :function( a){a.ui.ad dButton&&a .ui.addBut ton("CodeS nippet",{l abel:a.lan g.codesnip pet.button ,command:" codeSnippe t",toolbar :"insert,1 0"})},        
10   afterInit: function(a ){var b=th is.path;p( a);if(!a._ .codesnipp et.highlig hter){var  e=new CKED ITOR.plugi ns.codesni ppet.highl ighter({la nguages:{a pache:"Apa che",bash: "Bash",cof feescript: "CoffeeScr ipt",cpp:" C++",cs:"C #",css:"CS S",diff:"D iff",html: "HTML",htt p:"HTTP",i ni:"INI",j ava:"Java" ,javascrip t:"JavaScr ipt",json: "JSON",mak efile:"Mak efile",mar kdown:"Mar kdown",ngi nx:"Nginx" ,objective c:"Objecti ve-C",perl :"Perl",ph p:"PHP",py thon:"Pyth on",ruby:" Ruby",sql: "SQL",vbsc ript:"VBSc ript",xhtm l:"XHTML", xml:"XML"} ,        
11   init:funct ion(h){var  e=this;n& &CKEDITOR. scriptLoad er.load(b+ "lib/highl ight/highl ight.pack. js",functi on(){e.hlj s=window.h ljs;h()}); a.addConte ntsCss&&a. addContent sCss(b+"li b/highligh t/styles/" +a.config. codeSnippe t_theme+". css")},hig hlighter:f unction(a, b,d){(a=th is.hljs.hi ghlightAut o(a,this.h ljs.getLan guage(b)?[ b]:void 0) )&&d(a.val ue)}});thi s.setHighl ighter(e)} }});CKEDIT OR.plugins .codesnipp et={highli ghter:m};m .prototype .highlight =function( ){var a=ar guments;th is.ready?t his.highli ghter.appl y(this,a): this.queue .push(func tion(){thi s.highligh ter.apply( this,        
12   a)})}})(); CKEDITOR.c onfig.code Snippet_co deClass="h ljs";CKEDI TOR.config .codeSnipp et_theme=" default";