IntenseWebs/gantry5
3
0
Fork 0
mirror of https://github.com/gantry/gantry5.git synced 2026-08-19 01:15:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dropdowns not working when Offcanvas was off (fixes #583)

Browse Source
This commit is contained in:
Djamil Legato
2015-07-16 12:28:01 -07:00
parent 832ff14859
commit 2f72df192b
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/common/application/offcanvas/index.js
+2 -2
View File
@@ -81,11 +81,11 @@ var Offcanvas = new prime({
this.panel = $('#g-page-surround'); this.panel = $('#g-page-surround');
this.offcanvas = $('#g-offcanvas'); this.offcanvas = $('#g-offcanvas');
if (!this.panel || !this.offcanvas) { return false; }
var swipe = this.offcanvas.data('g-offcanvas-swipe'); var swipe = this.offcanvas.data('g-offcanvas-swipe');
this.setOptions({ touch: !!(swipe !== null ? parseInt(swipe) : 1) }); this.setOptions({ touch: !!(swipe !== null ? parseInt(swipe) : 1) });
if (!this.panel || !this.offcanvas) { return false; }
if (!this.options.padding) { if (!this.options.padding) {
this.offcanvas[0].style.display = 'block'; this.offcanvas[0].style.display = 'block';
var width = this.offcanvas[0].getBoundingClientRect().width; var width = this.offcanvas[0].getBoundingClientRect().width;
assets/common/js/main.js
Vendored
+2 -2
View File
@@ -422,11 +422,11 @@ var Offcanvas = new prime({
this.panel = $('#g-page-surround'); this.panel = $('#g-page-surround');
this.offcanvas = $('#g-offcanvas'); this.offcanvas = $('#g-offcanvas');
if (!this.panel || !this.offcanvas) { return false; }
var swipe = this.offcanvas.data('g-offcanvas-swipe'); var swipe = this.offcanvas.data('g-offcanvas-swipe');
this.setOptions({ touch: !!(swipe !== null ? parseInt(swipe) : 1) }); this.setOptions({ touch: !!(swipe !== null ? parseInt(swipe) : 1) });
if (!this.panel || !this.offcanvas) { return false; }
if (!this.options.padding) { if (!this.options.padding) {
this.offcanvas[0].style.display = 'block'; this.offcanvas[0].style.display = 'block';
var width = this.offcanvas[0].getBoundingClientRect().width; var width = this.offcanvas[0].getBoundingClientRect().width;
platforms/common/css-compiled/admin.css
Vendored
+1 -3
View File
@@ -6024,6 +6024,4 @@ html.g5-dialog-open {
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }
/*# sourceMappingURL=admin.css.map */
/*# sourceMappingURL=admin.css.map */