diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js index 29a32269d..3ec076bdd 100755 --- a/src/definitions/modules/popup.js +++ b/src/definitions/modules/popup.js @@ -826,8 +826,8 @@ $.fn.popup.settings = { context : 'body', position : 'top center', delay : { - show : 50, - hide : 150 + show : 100, + hide : 100 }, inline : false, preserve : false, diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js index 07bfafd64..f8e38216e 100755 --- a/src/definitions/modules/search.js +++ b/src/definitions/modules/search.js @@ -732,7 +732,7 @@ $.fn.search.settings = { if(result.image !== undefined) { html+= '' + '
' - + ' ' + + ' ' + '
' ; } diff --git a/src/definitions/modules/sticky.js b/src/definitions/modules/sticky.js index 4dc297b9d..936d61e86 100755 --- a/src/definitions/modules/sticky.js +++ b/src/definitions/modules/sticky.js @@ -172,6 +172,7 @@ $.fn.sticky = function(parameters) { element: { margin : element.margin, top : element.offset.top - element.margin.top, + left : element.offset.left, width : element.width, height : element.height, bottom : element.offset.top + element.height @@ -247,8 +248,8 @@ $.fn.sticky = function(parameters) { size: function() { $module .css({ - width: module.cache.element.width, - height: module.cache.element.height + width : module.cache.element.width, + height : module.cache.element.height }) ; } @@ -391,6 +392,7 @@ $.fn.sticky = function(parameters) { bindTop: function() { module.debug('Binding element to top of parent container'); $module + .css('left' , '') .removeClass(className.fixed) .removeClass(className.bottom) .addClass(className.bound) @@ -402,6 +404,7 @@ $.fn.sticky = function(parameters) { bindBottom: function() { module.debug('Binding element to bottom of parent container'); $module + .css('left' , '') .removeClass(className.fixed) .removeClass(className.top) .addClass(className.bound) @@ -414,6 +417,7 @@ $.fn.sticky = function(parameters) { stickTop: function() { module.debug('Fixing element to top of page'); $module + .css('left', module.cache.element.left) .removeClass(className.bound) .removeClass(className.bottom) .addClass(className.fixed) @@ -425,6 +429,7 @@ $.fn.sticky = function(parameters) { stickBottom: function() { module.debug('Sticking element to bottom of page'); $module + .css('left', module.cache.element.left) .removeClass(className.bound) .removeClass(className.top) .addClass(className.fixed) @@ -456,6 +461,10 @@ $.fn.sticky = function(parameters) { module.debug('Reseting elements position'); module.unbind(); module.unfix(); + module.resetCSS(); + }, + + resetCSS: function() { $module .css({ top : '',