Browse Source

Adds #707 pop hideOnScroll setting

pull/1243/head
jlukic 10 years ago
parent
commit
73b60bcc3b
6 changed files with 43 additions and 12 deletions
  1. 4
      dist/components/card.css
  2. 2
      dist/components/card.min.css
  3. 10
      dist/components/dropdown.min.js
  4. 4
      dist/semantic.css
  5. 2
      dist/semantic.min.css
  6. 33
      src/definitions/modules/popup.js

4
dist/components/card.css

@ -139,7 +139,7 @@
.ui.cards > .card > .content > .header,
.ui.card > .content > .header {
display: block;
margin: 1em 0em 1rem;
margin: 0em;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
color: rgba(0, 0, 0, 0.85);
}
@ -742,7 +742,7 @@ a.ui.card:hover,
---------------*/
.ui.cards > .card {
font-size: 1rem;
font-size: 1em;
}

2
dist/components/card.min.css
File diff suppressed because it is too large
View File

10
dist/components/dropdown.min.js
File diff suppressed because it is too large
View File

4
dist/semantic.css

@ -3229,7 +3229,7 @@
.ui.cards > .card > .content > .header,
.ui.card > .content > .header {
display: block;
margin: 1em 0em 1rem;
margin: 0em;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
color: rgba(0, 0, 0, 0.85);
}
@ -3913,7 +3913,7 @@ a.ui.card:hover,
---------------*/
.ui.cards > .card {
font-size: 1rem;
font-size: 1em;
}
/*******************************

2
dist/semantic.min.css
File diff suppressed because it is too large
View File

33
src/definitions/modules/popup.js

@ -236,7 +236,7 @@ $.fn.popup = function(parameters) {
},
show: function(callback) {
callback = callback || function(){};
callback = $.isFunction(callback) ? callback : function(){};
module.debug('Showing pop-up', settings.transition);
if(!settings.preserve && !settings.popup) {
module.refresh();
@ -252,7 +252,7 @@ $.fn.popup = function(parameters) {
hide: function(callback) {
callback = callback || function(){};
callback = $.isFunction(callback) ? callback : function(){};
$module
.removeClass(className.visible)
;
@ -313,6 +313,7 @@ $.fn.popup = function(parameters) {
},
restore: {
conditions: function() {
element.blur();
if(module.cache && module.cache.title) {
$module.attr('title', module.cache.title);
module.verbose('Restoring original attributes', module.cache.title);
@ -322,7 +323,7 @@ $.fn.popup = function(parameters) {
},
animate: {
show: function(callback) {
callback = callback || function(){};
callback = $.isFunction(callback) ? callback : function(){};
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
$popup
.transition({
@ -356,7 +357,7 @@ $.fn.popup = function(parameters) {
$.proxy(settings.onShow, element)();
},
hide: function(callback) {
callback = callback || function(){};
callback = $.isFunction(callback) ? callback : function(){};
module.debug('Hiding pop-up');
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
$popup
@ -366,6 +367,7 @@ $.fn.popup = function(parameters) {
duration : settings.duration,
onComplete : function() {
module.reset();
console.log(callback, $.isFunction(callback), typeof callback);
callback();
}
})
@ -634,11 +636,21 @@ $.fn.popup = function(parameters) {
popup: function() {
module.verbose('Allowing hover events on popup to prevent closing');
$popup
.on('mouseenter', module.event.start)
.on('mouseleave', module.event.end)
.on('mouseenter' + eventNamespace, module.event.start)
.on('mouseleave' + eventNamespace, module.event.end)
;
},
close:function() {
if(settings.hideOnScroll) {
$document
.on('touchmove' + eventNamespace, module.hideGracefully)
.on('scroll' + eventNamespace, module.hideGracefully)
;
$context
.on('touchmove' + eventNamespace, module.hideGracefully)
.on('scroll' + eventNamespace, module.hideGracefully)
;
}
if(settings.on == 'click' && settings.closable) {
module.verbose('Binding popup close event to document');
$document
@ -653,6 +665,14 @@ $.fn.popup = function(parameters) {
unbind: {
close: function() {
if(settings.hideOnScroll) {
$document
.off('scroll' + eventNamespace, module.hide)
;
$context
.off('scroll' + eventNamespace, module.hide)
;
}
if(settings.on == 'click' && settings.closable) {
module.verbose('Removing close event from document');
$document
@ -892,6 +912,7 @@ $.fn.popup.settings = {
on : 'hover',
closable : true,
hideOnScroll : true,
context : 'body',
position : 'top left',

Loading…
Cancel
Save