* Many fixes as found in many issues.

[#565736]
  [#412500]
  [#421732]
  [#766466]
* Passed through coder (fixed tabs, missing spaces)
* Added missing hook_uninstall() function to delete variables
* Fixed some formatting in code (.module, .inc, .css, .js)
This commit is contained in:
Alexis Wilke
2010-04-13 01:19:04 +00:00
parent b21bbdb14f
commit 18f4b720a8
6 changed files with 272 additions and 194 deletions

View File

@@ -3,9 +3,13 @@
Drupal.behaviors.simplemenuAttach = function(context) {
// If detect pop-ups setting is enabled and we are in a pop-up window
if (Drupal.settings.simplemenu.detectPopup && window.opener) {
return;
}
return;
}
if ($('body').hasClass('simplemenu-enabled')) {
return;
}
// get the element to add the menu to
var element = Drupal.settings.simplemenu.element;
var menu = $(simplemenu).attr("id", "simplemenu").addClass('clear-block');
@@ -29,25 +33,26 @@ Drupal.behaviors.simplemenuAttach = function(context) {
// Build menu
$(menu)
.superfish( {
.superfish({
pathClass: 'current',
animation: animation,
delay: Drupal.settings.simplemenu.hideDelay,
speed: Drupal.settings.simplemenu.effectSpeed
} )
.find(">li:has(ul)")
.mouseover(function(){
$("ul", this).bgIframe();
})
.find("a")
.focus(function(){
$("ul", $(".nav>li:has(ul)")).bgIframe();
})
.end()
.end()
.find("a")
.removeAttr('title');
})
.find(">li:has(ul)")
.mouseover(function(){
$("ul", this).bgIframe();
})
.find("a")
.focus(function(){
$("ul", $(".nav>li:has(ul)")).bgIframe();
})
.end()
.end()
.find("a")
.removeAttr('title');
$('#simplemenu').children('li.expanded').addClass('root');
$('#simplemenu').children('li.expanded').addClass('root');
};
@@ -60,4 +65,4 @@ Drupal.behaviors.simplemenuAttach = function(context) {
*
* Version 2.1.1
*/
(function($){$.fn.bgIframe=$.fn.bgiframe=function(s){if($.browser.msie&&/6.0/.test(navigator.userAgent)){s=$.extend({top:'auto',left:'auto',width:'auto',height:'auto',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).length==0)this.insertBefore(document.createElement(html),this.firstChild);});}return this;};})(jQuery);
(function($){$.fn.bgIframe=$.fn.bgiframe=function(s){if($.browser.msie&&/6.0/.test(navigator.userAgent)){s=$.extend({top:'auto',left:'auto',width:'auto',height:'auto',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).length==0)this.insertBefore(document.createElement(html),this.firstChild);});}return this;};})(jQuery);