Browse Source

Fixes #885, default animation does not support multiple, multiple now always does not push canvas

pull/1243/head
jlukic 10 years ago
parent
commit
05ebf93fcc
2 changed files with 16 additions and 31 deletions
  1. 19
      src/definitions/modules/sidebar.js
  2. 28
      src/definitions/modules/sidebar.less

19
src/definitions/modules/sidebar.js

@ -104,7 +104,7 @@ $.fn.sidebar = function(parameters) {
event: {
clickaway: function(event) {
if( $module.find(event.target).size() === 0 && $(event.target).filter($module).size() === 0 ) {
if( $(event.target).closest(selector.sidebar).size() === 0 ) {
module.verbose('User clicked on dimmed page');
module.hide();
}
@ -121,7 +121,7 @@ $.fn.sidebar = function(parameters) {
}
},
scroll: function(event) {
if( $module.find(event.target).size() === 0 && $(event.target).filter($module).size() === 0 ) {
if( $(event.target).closest(selector.sidebar).size() === 0 ) {
event.preventDefault();
}
}
@ -174,6 +174,13 @@ $.fn.sidebar = function(parameters) {
+ ' -webkit-transform: translate3d(-'+ width + 'px, 0, 0);'
+ ' transform: translate3d(-'+ width + 'px, 0, 0);'
+ ' }'
+ ' .ui.visible.left.sidebar ~ .ui.visible.right.sidebar ~ .fixed,'
+ ' .ui.visible.left.sidebar ~ .ui.visible.right.sidebar ~ .pusher,'
+ ' .ui.visible.right.sidebar ~ .ui.visible.left.sidebar ~ .fixed,'
+ ' .ui.visible.right.sidebar ~ .ui.visible.left.sidebar ~ .pusher {'
+ ' -webkit-transform: translate3d(0px, 0, 0);'
+ ' transform: translate3d(0px, 0, 0);'
+ ' }'
+ ' .ui.visible.top.sidebar ~ .fixed,'
+ ' .ui.visible.top.sidebar ~ .pusher {'
+ ' -webkit-transform: translate3d(0, ' + height + 'px, 0);'
@ -851,14 +858,14 @@ $.fn.sidebar.settings = {
defaultTransition : {
computer: {
left : 'uncover',
right : 'uncover',
left : 'push',
right : 'push',
top : 'overlay',
bottom : 'overlay'
},
mobile: {
left : 'uncover',
right : 'uncover',
left : 'push',
right : 'push',
top : 'overlay',
bottom : 'overlay'
}

28
src/definitions/modules/sidebar.less

@ -196,33 +196,11 @@
Variations
*******************************/
/*--------------
Sizes
---------------*/
.ui.sidebar {
width: @sidebarWidth !important;
.ui.sidebar,
.ui.vertical.sidebar.menu {
width: @sidebarWidth;
}
/* Sizes */
.ui.visible.left.sidebar ~ .fixed,
.ui.visible.left.sidebar ~ .pusher {
transform: translate3d(@sidebarWidth, 0, 0);
}
.ui.visible.right.sidebar ~ .fixed,
.ui.visible.right.sidebar ~ .pusher {
transform: translate3d(-@sidebarWidth, 0, 0);
}
.ui.visible.top.sidebar ~ .fixed,
.ui.visible.top.sidebar ~ .pusher {
transform: translate3d(0, @sidebarHeight, 0);
}
.ui.visible.bottom.sidebar ~ .pusher {
transform: translate3d(0, -@sidebarHeight, 0);
}
/*******************************
Animations

Loading…
Cancel
Save