Fix JS error that happens when more menu is not used in nav

thoughtbot · Apr 21, 2016 · b7c61c1 · b7c61c1
1 parent 4e6693f
commit b7c61c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/source/javascripts/refills/centered_navigation.js b/source/javascripts/refills/centered_navigation.js
@@ -1,18 +1,20 @@
 $(window).on("load resize",function(e) {
-
  var more = document.getElementById("js-centered-more");
- var windowWidth = $(window).width();
- var moreLeftSideToPageLeftSide = $(more).offset().left;
- var moreLeftSideToPageRightSide = windowWidth - moreLeftSideToPageLeftSide;
 
- if (moreLeftSideToPageRightSide < 330) {
- $("#js-centered-more .submenu .submenu").removeClass("fly-out-right");
- $("#js-centered-more .submenu .submenu").addClass("fly-out-left");
- }
+ if ($(more).length > 0) {
+ var windowWidth = $(window).width();
+ var moreLeftSideToPageLeftSide = $(more).offset().left;
+ var moreLeftSideToPageRightSide = windowWidth - moreLeftSideToPageLeftSide;
+
+ if (moreLeftSideToPageRightSide < 330) {
+ $("#js-centered-more .submenu .submenu").removeClass("fly-out-right");
+ $("#js-centered-more .submenu .submenu").addClass("fly-out-left");
+ }
 
- if (moreLeftSideToPageRightSide > 330) {
- $("#js-centered-more .submenu .submenu").removeClass("fly-out-left");
- $("#js-centered-more .submenu .submenu").addClass("fly-out-right");
+ if (moreLeftSideToPageRightSide > 330) {
+ $("#js-centered-more .submenu .submenu").removeClass("fly-out-left");
+ $("#js-centered-more .submenu .submenu").addClass("fly-out-right");
+ }
  }
 
  var menuToggle = $("#js-centered-navigation-mobile-menu").unbind();

diff --git a/source/javascripts/refills/navigation.js b/source/javascripts/refills/navigation.js
@@ -1,17 +1,19 @@
 $(window).resize(function() {
  var more = document.getElementById("js-navigation-more");
- var windowWidth = $(window).width();
- var moreLeftSideToPageLeftSide = $(more).offset().left;
- var moreLeftSideToPageRightSide = windowWidth - moreLeftSideToPageLeftSide;
+ if ($(more).length > 0) {
+ var windowWidth = $(window).width();
+ var moreLeftSideToPageLeftSide = $(more).offset().left;
+ var moreLeftSideToPageRightSide = windowWidth - moreLeftSideToPageLeftSide;
 
- if (moreLeftSideToPageRightSide < 330) {
- $("#js-navigation-more .submenu .submenu").removeClass("fly-out-right");
- $("#js-navigation-more .submenu .submenu").addClass("fly-out-left");
- }
+  if (moreLeftSideToPageRightSide < 330) {
+  $("#js-navigation-more .submenu .submenu").removeClass("fly-out-right");
+  $("#js-navigation-more .submenu .submenu").addClass("fly-out-left");
+  }
 
- if (moreLeftSideToPageRightSide > 330) {
- $("#js-navigation-more .submenu .submenu").removeClass("fly-out-left");
- $("#js-navigation-more .submenu .submenu").addClass("fly-out-right");
+ if (moreLeftSideToPageRightSide > 330) {
+ $("#js-navigation-more .submenu .submenu").removeClass("fly-out-left");
+ $("#js-navigation-more .submenu .submenu").addClass("fly-out-right");
+ }
  }
 });