From 7628c3da0213467cfcbd209c2b0167be8c84f07d Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Sun, 17 May 2015 23:07:56 -0700 Subject: [PATCH] JS errors when mobileContainer not present (fixes #282) --- assets/common/application/offcanvas/index.js | 6 ++++-- assets/common/js/main.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/common/application/offcanvas/index.js b/assets/common/application/offcanvas/index.js index 15e0f9f3b..c4089ad4e 100644 --- a/assets/common/application/offcanvas/index.js +++ b/assets/common/application/offcanvas/index.js @@ -345,11 +345,13 @@ var Offcanvas = new prime({ timeout(function(){ blocks = this.offcanvas.search('.g-block'); - mCtext = mobileContainer.text().length; + mCtext = mobileContainer ? mobileContainer.text().length : 0; var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length; togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide'); - mobileContainer.parent('.g-content')[!mCtext ? 'addClass' : 'removeClass']('nomarginall')[!mCtext ? 'addClass' : 'removeClass']('nopaddingall'); + if (mobileContainer) { + mobileContainer.parent('.g-content')[!mCtext ? 'addClass' : 'removeClass']('nomarginall')[!mCtext ? 'addClass' : 'removeClass']('nopaddingall'); + } if (!shouldCollapse && !this.attached) { this.attach(); } else if (shouldCollapse && this.attached) { diff --git a/assets/common/js/main.js b/assets/common/js/main.js index 6a3137390..2d7a0d9a2 100644 --- a/assets/common/js/main.js +++ b/assets/common/js/main.js @@ -655,11 +655,13 @@ var Offcanvas = new prime({ timeout(function(){ blocks = this.offcanvas.search('.g-block'); - mCtext = mobileContainer.text().length; + mCtext = mobileContainer ? mobileContainer.text().length : 0; var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length; togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide'); - mobileContainer.parent('.g-content')[!mCtext ? 'addClass' : 'removeClass']('nomarginall')[!mCtext ? 'addClass' : 'removeClass']('nopaddingall'); + if (mobileContainer) { + mobileContainer.parent('.g-content')[!mCtext ? 'addClass' : 'removeClass']('nomarginall')[!mCtext ? 'addClass' : 'removeClass']('nopaddingall'); + } if (!shouldCollapse && !this.attached) { this.attach(); } else if (shouldCollapse && this.attached) {