Index: /extensions/Autosize/js/Affiche_script.js =================================================================== --- /extensions/Autosize/js/Affiche_script.js (revision 7726) +++ /extensions/Autosize/js/Affiche_script.js (revision 7736) @@ -18,4 +18,10 @@ } //================================================================================================= + +function wait_Timer() { + + jQuery(window).resize(); + +} jQuery(document).ready( @@ -49,9 +55,4 @@ - function wait_Timer() { - - Resize(); - - } //============================================================= function cl_Timer() { @@ -347,14 +348,14 @@ myevent.type = namespaces.shift(); if (typeof (init_resize) == "undefined") init_resize = false; - - new_window = jQuery(window).infos(); - init_resize = (new_window.width == old_window.width); - if (init_resize == false) { - init_resize = Resize(); - } - init_resize = (new_window.height == old_window.height) - if ( init_resize == false ) + + new_window = jQuery(window).infos(); + init_resize = (new_window.width == old_window.width); + if (init_resize == false) { + init_resize = Resize(); + } + init_resize = (new_window.height == old_window.height) + if (init_resize == false) init_resize = Resize(); ; - + @@ -364,10 +365,6 @@ function Resize(Force) { - if (!cl_visible == true) return; - if (Force) - old_window = { width: 0, height: 0 }; - - - if (chk == "") return; + if (!cl_visible == true) return true; + if (chk == "") return true; //================================================================= //var retour = (getStackTrace()); @@ -584,7 +581,10 @@ case "pamoorama": //========================================================= - if (typeof (myPamoorama) == "undefined") return - if (typeof (myPamoorama.skipInit) == "undefined") return - if (myPamoorama.skipInit == false) return + if (typeof (myPamoorama) == "undefined") return false; + if (typeof (myPamoorama.skipInit) == "undefined") return false; + if (myPamoorama.skipInit == false) { + setTimeout("wait_Timer()",300); + return false; + } //========================================================= img_reelle.height = myPamoorama.imageHeight; @@ -927,17 +927,15 @@ new_width = Zone_Affichage.width - marge_right - marge_left; new_width -= 4; - jQuery("#pamoorama").css({ marginLeft: "auto", + myPamoorama.options.width = new_width; + info_theImage.height = img_reelle.height + info_pamoorama_footer.height + //==================================================== + jQuery("#pamoorama").css({ + marginLeft: "auto", marginRight: "auto", - - height: Image_height + info_pamoorama_footer.height + "px", + height: info_theImage.height + "px", width: new_width + "px" }); - - myPamoorama.options.width = new_width; jQuery("#pamoorama").width(new_width); - jQuery(Cadre).height(img_height); - jQuery("#pamoorama").height(img_height); - - + //==================================================== jQuery("#pamoorama_outter").css({ left: marge_left + "px", @@ -946,9 +944,11 @@ }); jQuery("#pamoorama_outter").width(new_width); - h = info_theImage.height; - jQuery("#pamoorama").css({ height: h + "px" }); - + //==================================================== jQuery("#pamoorama_footer").width(new_width); jQuery("#pamoorama_footer").css('width', new_width + "px"); + //==================================================== + + //myPamoorama.continueInit(); + //myPamoorama.skipInit = false; jQuery("#linkNext").css({ width: "200px", overflow: "hidden" }); @@ -975,29 +975,31 @@ } - /* - jQuery("#Debug1").css({ - position: "absolute", - top: Bandeau + "px", - textAlign: align_auto, - margin: "0px auto", - - - border: "solid 1px red", - - width: Image_width + "px", - height: Image_height + "px" - - }); - //=================================================== - jQuery("#Debug2").css({ position: "absolute", - left: Zone_Affichage.left + 'px', - border: "solid 1px green", - top: Zone_Affichage.top + "px", - width: Zone_Affichage.width / 2 + "px", - height: Zone_Affichage.height + "px" - - }); - jQuery("#Debug2").text(info_Cadre.bottom); - */ + if (DEBUG == "true") { + + jQuery("#Debug1").css({ + position: "absolute", + top: Bandeau + "px", + textAlign: align_auto, + margin: "0px auto", + + + border: "solid 1px red", + + width: Image_width + "px", + height: Image_height + "px" + + }); + jQuery("#Debug1").text("info_theImage.height : " + info_theImage.height); + //=================================================== + jQuery("#Debug2").css({ position: "absolute", + left: Zone_Affichage.left + 'px', + border: "solid 1px green", + top: Zone_Affichage.top + "px", + width: Zone_Affichage.width / 2 + "px", + height: Zone_Affichage.height + "px" + + }); + jQuery("#Debug2").text("info_Cadre.height : " + info_Cadre.height); + } jQuery("#navThumbPrev").css({ overflow: "hidden" }); @@ -1126,5 +1128,5 @@ } // function -); // ready +); // ready /* * Index: /extensions/Autosize/js/conflit.js =================================================================== --- /extensions/Autosize/js/conflit.js (revision 7726) +++ /extensions/Autosize/js/conflit.js (revision 7736) @@ -21,4 +21,6 @@ if (retour.match(RegExp("jQuery", "gi"))) { ret_element = jQuery(element); + } else if (retour.match(RegExp("GMaps", "gi"))) { + ret_element = jQuery(element); } else if (retour.match(RegExp("pamooramics", "gi"))) { ret_element = jQuery().$Pamoorama(element); @@ -27,6 +29,4 @@ } else if (retour.match(RegExp("rv_gmaps", "gi"))) { ret_element = jQuery().$Prototype(element); -}else if (retour.match(RegExp("GMaps", "gi"))) { - ret_element = jQuery(element); }else if (retour.match(RegExp("jQuery", "gi"))) { ret_element = jQuery(element); @@ -36,5 +36,5 @@ return ret_element; -if (DEBUG==true) +if (DEBUG=="true") alert(retour); return jQuery(element); @@ -91,56 +91,61 @@ jQuery.fn.extend({ -//---------------- luciano ------------------------------- -$Luciano: function (el, nc) { -return document.id(el, nc, this.document); -}, -//=============== PaMOOramics =========================== - -$Pamoorama: function (B) { -if (!B) { -if (typeof (B) == "boolean") return null; -return jQuery(); -} -if (B.htmlElement) { -return Garbage.collect(B); - -} -if ([window, document].contains(B)) { return B; } -var A = $type(B); -if (A == "string") { B = document.getElementById(B); A = (B) ? "element" : false; } -if (A != "element") { -return null; -} -if (B.htmlElement) { return Garbage.collect(B); } -if (["object", "embed"].contains(B.tagName.toLowerCase())) { return B; } -$extend(B, Element.prototype); -B.htmlElement = function () { }; -try{ return Garbage.collect(B);}catch(e){ -return ; -} - -}, -//=================================================== -$Prototype: function (element) { -//======== prototype.js ===================== -if (arguments.length > 1) { -for (var i = 0, elements = [], length = arguments.length; i < length; i++) -elements.push($(arguments[i])); -return elements; -} -if (typeof element == "string") -element = document.getElementById(element); - -return Element.extend(element); - -try { -new_element = Element.extend(element); -} catch (e) { -return new_element; -} -return new_element; -} -//========================================================= -}); // fin extend + //---------------- luciano ------------------------------- + $Luciano: function (el, nc) { + return document.id(el, nc, this.document); + }, + //=============== PaMOOramics =========================== + + $Pamoorama: function (B) { + if (!B) { + if (typeof (B) == "boolean") return null; + + } + + try { + if (B.htmlElement) { + return Garbage.collect(B); + } + } catch (e) { + + } + + if ([window, document].contains(B)) { return B; } + var A = $type(B); + if (A == "string") { B = document.getElementById(B); A = (B) ? "element" : false; } + if (A != "element") { + return null; + } + if (B.htmlElement) { return Garbage.collect(B); } + if (["object", "embed"].contains(B.tagName.toLowerCase())) { return B; } + $extend(B, Element.prototype); + B.htmlElement = function () { }; + try { return Garbage.collect(B); } catch (e) { + return; + } + + }, + //=================================================== + $Prototype: function (element) { + //======== prototype.js ===================== + if (arguments.length > 1) { + for (var i = 0, elements = [], length = arguments.length; i < length; i++) + elements.push($(arguments[i])); + return elements; + } + if (typeof element == "string") + element = document.getElementById(element); + + return Element.extend(element); + + try { + new_element = Element.extend(element); + } catch (e) { + return new_element; + } + return new_element; + } + //========================================================= +}); // fin extend @@ -177,4 +182,9 @@ callstack.push(Src_Match); } +if (Src_Match.match("GMaps|applyMap|markupMaps|applyMarkers")) { +callstack.push("GMaps"); +isCallstackPopulated = true; +break; +} if (Src_Match.match("rv_gmaps", "gi")) { callstack.push("rv_gmaps"); @@ -198,9 +208,5 @@ break; } -if (Src_Match.match("GMaps|applyMap")) { -callstack.push("GMaps"); -isCallstackPopulated = true; -break; -} + if (Src_Match.match("jQuery")) { callstack.push("jQuery"); @@ -251,10 +257,14 @@ callstack.push(fn); // if (fname != " $") callstack.push(fn); - if (fn.match(RegExp("jquery|switchmenu|gmaps|switchTabs|switchInterface|gally|initializeImageMode", "gi"))) { + if (fn.match(RegExp("jquery|switchmenu|switchTabs|switchInterface|gally|initializeImageMode", "gi"))) { callstack = []; callstack.push('jQuery'); break; } - + if (fn.match(RegExp("GMaps|applyMap|markupMaps|applyMarkers", "gi"))) { + callstack = []; + callstack.push('GMaps'); + break; + } //====================== if (fn.match(RegExp("_footer|ie_ready|makeDraggable", "gi"))) {