Fixed toolbar menu scrolling on mobile.

It wasn't possible to scroll the menu if it was initiated on disabled item.
django-cms · Jul 18, 2016 · ce985ef · ce985ef
1 parent ab9e7f5
commit ce985ef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+=== 3.3.2 (unreleased) ===
+
+* Fixed a bug where it wasn't possible to scroll the toolbar menu if scroll
+  started on the disabled menu item on small screens.
+
+
 === 3.3.1 (2016-07-13) ===
 
 * Added a warning for users who are leaving the page or closing the plugin

diff --git a/cms/static/cms/css/cms.base.css b/cms/static/cms/css/cms.base.css
diff --git a/cms/static/cms/js/dist/bundle.toolbar.min.js b/cms/static/cms/js/dist/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.toolbar.js b/cms/static/cms/js/modules/cms.toolbar.js
@@ -255,7 +255,7 @@ var Toolbar = new Class({
             });
 
             // attach hover
-            lists.on(that.pointerOverOut, 'li', function () {
+            lists.on(that.pointerOverOut, 'li', function (e) {
                 var el = $(this);
                 var parent = el.closest('.cms-toolbar-item-navigation-children')
                     .add(el.parents('.cms-toolbar-item-navigation-children'));
@@ -264,7 +264,8 @@ var Toolbar = new Class({
                 // do not attach hover effect if disabled
                 // cancel event if element has already hover class
                 if (el.hasClass(disabled)) {
-                    return false;
+                    e.stopPropagation();
+                    return;
                 }
                 if (el.hasClass(hover)) {
                     return true;

diff --git a/cms/static/cms/sass/components/_toolbar.scss b/cms/static/cms/sass/components/_toolbar.scss
@@ -131,7 +131,6 @@
             border-top: none;
             border-radius: 0 0 $toolbar-dropdown-border-radius $toolbar-dropdown-border-radius;
             background-color: $toolbar-dropdown-bgcolor;
-            background: rgba($toolbar-dropdown-bgcolor, 0.97);
             box-shadow: $toolbar-dropdown-shadow;
         }
         ul li {