From 05ebf93fccec90d9d5373c992de139cffe324aaa Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 10 Nov 2014 14:49:43 -0500
Subject: [PATCH] Fixes #885, default animation does not support multiple,
 multiple now always does not push canvas

---
 src/definitions/modules/sidebar.js   | 19 +++++++++++++------
 src/definitions/modules/sidebar.less | 28 +++-------------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index b74170c5d..d93a8b127 100644
--- a/src/definitions/modules/sidebar.js
+++ b/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'
     }
diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less
index cd1cb75f7..8b2f75791 100755
--- a/src/definitions/modules/sidebar.less
+++ b/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