diff --git a/.gitattributes b/.gitattributes index a7da6602c7bef2d9dde777c6a9dadd0dc43c62be..4480cc51edb76b37a860d92bef18bc7fbfab5594 100644 --- a/.gitattributes +++ b/.gitattributes @@ -231,6 +231,7 @@ dist/inc-rubriques.html -text dist/javascript/ajaxCallback.js -text dist/javascript/articles_tous_edite.js -text dist/javascript/async_upload.js -text +dist/javascript/bgiframe.js -text dist/javascript/dragdrop_interface.js -text dist/javascript/form.js -text dist/javascript/jquery.js -text diff --git a/dist/javascript/bgiframe.js b/dist/javascript/bgiframe.js new file mode 100644 index 0000000000000000000000000000000000000000..c2a180561a3f06c5093f9f8cf153661e78ac383a --- /dev/null +++ b/dist/javascript/bgiframe.js @@ -0,0 +1,96 @@ +/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net) + * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. + * + * $LastChangedDate$ + * $Rev$ + */ + +(function($){ + +/** + * The bgiframe is chainable and applies the iframe hack to get + * around zIndex issues in IE6. It will only apply itself in IE + * and adds a class to the iframe called 'bgiframe'. The iframe + * is appeneded as the first child of the matched element(s) + * with a tabIndex and zIndex of -1. + * + * By default the plugin will take borders, sized with pixel units, + * into account. If a different unit is used for the border's width, + * then you will need to use the top and left settings as explained below. + * + * NOTICE: This plugin has been reported to cause perfromance problems + * when used on elements that change properties (like width, height and + * opacity) a lot in IE6. Most of these problems have been caused by + * the expressions used to calculate the elements width, height and + * borders. Some have reported it is due to the opacity filter. All + * these settings can be changed if needed as explained below. + * + * @example $('div').bgiframe(); + * @before <div><p>Paragraph</p></div> + * @result <div><iframe class="bgiframe".../><p>Paragraph</p></div> + * + * @param Map settings Optional settings to configure the iframe. + * @option String|Number top The iframe must be offset to the top + * by the width of the top border. This should be a negative + * number representing the border-top-width. If a number is + * is used here, pixels will be assumed. Otherwise, be sure + * to specify a unit. An expression could also be used. + * By default the value is "auto" which will use an expression + * to get the border-top-width if it is in pixels. + * @option String|Number left The iframe must be offset to the left + * by the width of the left border. This should be a negative + * number representing the border-left-width. If a number is + * is used here, pixels will be assumed. Otherwise, be sure + * to specify a unit. An expression could also be used. + * By default the value is "auto" which will use an expression + * to get the border-left-width if it is in pixels. + * @option String|Number width This is the width of the iframe. If + * a number is used here, pixels will be assume. Otherwise, be sure + * to specify a unit. An experssion could also be used. + * By default the value is "auto" which will use an experssion + * to get the offsetWidth. + * @option String|Number height This is the height of the iframe. If + * a number is used here, pixels will be assume. Otherwise, be sure + * to specify a unit. An experssion could also be used. + * By default the value is "auto" which will use an experssion + * to get the offsetHeight. + * @option Boolean opacity This is a boolean representing whether or not + * to use opacity. If set to true, the opacity of 0 is applied. If + * set to false, the opacity filter is not applied. Default: true. + * @option String src This setting is provided so that one could change + * the src of the iframe to whatever they need. + * Default: "javascript:false;" + * + * @name bgiframe + * @type jQuery + * @cat Plugins/bgiframe + * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net) + */ +$.fn.bgIframe = jQuery.fn.bgiframe = function(s) { + // This is only for IE6 + if ( !($.browser.msie && typeof XMLHttpRequest == 'function') ) return this; + s = $.extend({ + top : 'auto', // auto == .currentStyle.borderTopWidth + left : 'auto', // auto == .currentStyle.borderLeftWidth + width : 'auto', // auto == offsetWidth + height : 'auto', // auto == offsetHeight + opacity : true, + src : 'javascript:false;' + }, s || {}); + var prop = function(n){return n&&n.constructor==Number?n+'px':n;}, + html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+ + 'style="display:block;position:absolute;z-index:-1;'+ + (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+ + 'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+ + 'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+ + 'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+ + 'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+ + '"/>'; + return this.each(function() { + if ( !$('iframe.bgiframe', this)[0] ) + this.insertBefore( document.createElement(html), this.firstChild ); + }); +}; + +})(jQuery); \ No newline at end of file diff --git a/dist/javascript/presentation.js b/dist/javascript/presentation.js index 23129493da0e3aa19d76f607676dba30fb04b0ff..35c985e14fbf94f781f879f2502812dfabf10b54 100644 --- a/dist/javascript/presentation.js +++ b/dist/javascript/presentation.js @@ -11,6 +11,7 @@ function getBiDiOffset(el) { function decaleSousMenu() { var sousMenu = $("div.bandeau_sec",this).css({visibility:'hidden',display:'block'}); if(!sousMenu.length) return; + sousMenu.bgIframe(); var left; if($.browser.msie) { left = getBiDiOffset(sousMenu[0].parentNode) + getBiDiOffset($("#bandeau-principal div")[0]); @@ -22,7 +23,7 @@ function decaleSousMenu() { if (gauche < 0) gauche = 0; sousMenu.css(dir_page=="rtl"?"right":"left",gauche+"px"); } - sousMenu.css({display:'',visibility:''}); + sousMenu.css({display:'',visibility:''}); } function changestyle(id_couche, element, style) { diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index d6fd4b2caebc6557972a83fdbae28056963df72e..29cad749859feea171226461f2b8d8f19019cec0 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1362,7 +1362,9 @@ function debut_javascript($admin, $stat) "\nvar confirm_changer_statut = '" . unicode_to_javascript(addslashes(html2unicode(_T("confirm_changer_statut")))) . "';\n") . - http_script('',_DIR_JAVASCRIPT . 'presentation.js'); + //plugin needed to fix the select showing through the submenus o IE6 + (($browser_name == "MSIE" && $browser_version <= 6) ? http_script('',_DIR_JAVASCRIPT . 'bgiframe.js'):'' ) . + http_script('',_DIR_JAVASCRIPT . 'presentation.js'); } // Fonctions onglets