Produced by Araxis Merge on 2/1/2017 2:57:43 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\adapters | jquery.js | Tue Dec 20 19:50:50 2016 UTC |
| 2 | Wed Feb 1 19:57:43 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( a){if("und efined"==t ypeof a)th row Error( "jQuery sh ould be lo aded befor e CKEditor jQuery ad apter.");i f("undefin ed"==typeo f CKEDITOR )throw Err or("CKEdit or should be loaded before CKE ditor jQue ry adapter .");CKEDIT OR.config. jqueryOver rideVal="u ndefined"= =typeof CK EDITOR.con fig.jquery OverrideVa l?!0:CKEDI TOR.config .jqueryOve rrideVal;a .extend(a. fn,{ckedit orGet:func tion(){var a=this.eq (0).data(" ckeditorIn stance");i f(!a)throw "CKEditor is not ini tialized y et, use ck editor() w ith a call back.";ret urn a}, | |||||
| 6 | ckeditor:f unction(g, d){if(!CKE DITOR.env. isCompatib le)throw E rror("The environmen t is incom patible.") ;if(!a.isF unction(g) ){var m=d; d=g;g=m}va r k=[];d=d ||{};this. each(funct ion(){var b=a(this), c=b.data(" ckeditorIn stance"),f =b.data("_ ckeditorIn stanceLock "),h=this, l=new a.De ferred;k.p ush(l.prom ise());if( c&&!f)g&&g .apply(c,[ this]),l.r esolve();e lse if(f)c .once("ins tanceReady ",function (){setTime out(functi on(){c.ele ment?(c.el ement.$==h &&g&&g.app ly(c,[h]), l.resolve( )):setTime out(argume nts.callee ,100)},0)} , | |||||
| 7 | null,null, 9999);else {if(d.auto UpdateElem ent||"unde fined"==ty peof d.aut oUpdateEle ment&&CKED ITOR.confi g.autoUpda teElement) d.autoUpda teElementJ query=!0;d .autoUpdat eElement=! 1;b.data(" _ckeditorI nstanceLoc k",!0);c=a (this).is( "textarea" )?CKEDITOR .replace(h ,d):CKEDIT OR.inline( h,d);b.dat a("ckedito rInstance" ,c);c.on(" instanceRe ady",funct ion(d){var e=d.edito r;setTimeo ut(functio n(){if(e.e lement){d. removeList ener();e.o n("dataRea dy",functi on(){b.tri gger("data Ready.cked itor",[e]) });e.on("s etData",fu nction(a){ b.trigger( "setData.c keditor", | |||||
| 8 | [e,a.data] )});e.on(" getData",f unction(a) {b.trigger ("getData. ckeditor", [e,a.data] )},999);e. on("destro y",functio n(){b.trig ger("destr oy.ckedito r",[e])}); e.on("save ",function (){a(h.for m).submit( );return!1 },null,nul l,20);if(e .config.au toUpdateEl ementJquer y&&b.is("t extarea")& &a(h.form) .length){v ar c=funct ion(){b.ck editor(fun ction(){e. updateElem ent()})};a (h.form).s ubmit(c);a (h.form).b ind("form- pre-serial ize",c);b. bind("dest roy.ckedit or",functi on(){a(h.f orm).unbin d("submit" ,c);a(h.fo rm).unbind ("form-pre -serialize ", | |||||
| 9 | c)})}e.on( "destroy", function() {b.removeD ata("ckedi torInstanc e")});b.re moveData(" _ckeditorI nstanceLoc k");b.trig ger("insta nceReady.c keditor",[ e]);g&&g.a pply(e,[h] );l.resolv e()}else s etTimeout( arguments. callee,100 )},0)},nul l,null,999 9)}});var f=new a.De ferred;thi s.promise= f.promise( );a.when.a pply(this, k).then(fu nction(){f .resolve() });this.ed itor=this. eq(0).data ("ckeditor Instance") ;return th is}});CKED ITOR.confi g.jqueryOv errideVal& &(a.fn.val =CKEDITOR. tools.over ride(a.fn. val,functi on(g){retu rn functio n(d){if(ar guments.le ngth){var m= | |||||
| 10 | this,k=[], f=this.eac h(function (){var b=a (this),c=b .data("cke ditorInsta nce");if(b .is("texta rea")&&c){ var f=new a.Deferred ;c.setData (d,functio n(){f.reso lve()});k. push(f.pro mise());re turn!0}ret urn g.call (b,d)});if (k.length) {var b=new a.Deferre d;a.when.a pply(this, k).done(fu nction(){b .resolveWi th(m)});re turn b.pro mise()}ret urn f}var f=a(this). eq(0),c=f. data("cked itorInstan ce");retur n f.is("te xtarea")&& c?c.getDat a():g.call (f)}}))})( window.jQu ery); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.