Ignore:
Timestamp:
Jun 21, 2011, 10:00:39 AM (13 years ago)
Author:
cljosse
Message:

[extensions] Autosize fix compatibility with gmaps

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/Autosize/js/conflit.js

    r11429 r11461  
    6565nbpa = 0;
    6666var Fn;
     67if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
     68
     69} else {
     70  $mootools = $;
     71}
     72//====================================================
    6773function conflit(element, nc) {
    68   if(typeof DEBUG != "boolean") DEBUG = false ;
    6974    //--- cl_conflit
    7075    if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
     
    530535        jQuery('#browser').val(browser.browser);
    531536  }
    532 
    533   if (typeof (Parent) == "undefined") return;
    534 
     537    if (typeof (Parent) == "undefined")
     538        Parent = "#theImage";
    535539  info_image = jQuery(Parent).infos();
    536540  p0 = jQuery(Parent);
     
    573577//--------------------------------------------------------------
    574578$_0 = $;
    575 
     579    function $(element, nc0) {
     580        if (typeof jQuery.fn.infos != "function")
     581            if (typeof myjQuery != "undefined")
     582                jQuery = myjQuery;
     583        a = conflit(element, nc0);
     584        return a;
     585    }
    576586//=== ajout des fonctions jQuery ===
    577 $ = jQuery.fn.$;
    578 
    579 if (typeof $mootools != "undefined")
    580   jQuery.extend($, $mootools);
    581 
    582 jQuery.extend($, $_0);
     587    jQuery.extend($, jQuery);
Note: See TracChangeset for help on using the changeset viewer.