Merge branch 'wkuc-master' into development

rdebeasi · rdebeasi · commit 40e82824caa1 · 2016-10-05T20:47:31.000-04:00
diff --git a/flexmenu.js b/flexmenu.js
@@ -92,7 +92,6 @@
 					// Find all of the list items that have been pushed below the first item. Put those items into the popup menu. Put one additional item into the popup menu to cover situations where the last item is shorter than the "more" text.
 					$lastChild = $this.find('> li:last-child');
 					keepLooking = (needsMenu($lastChild));
-					$lastChild.appendTo($popup);
 					// If there only a few items left in the navigation bar, move them all to the popup menu.
 					if ((i - 1) <= s.cutoff) { // We've removed the ith item, so i - 1 gives us the number of items remaining.
 						$($this.children().get().reverse()).appendTo($popup);
@@ -101,6 +100,8 @@
 					}
 					if (!keepLooking) {
 						break;
+					}else{
+						$lastChild.appendTo($popup);
 					}
 				}
 				if (allInPopup) {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@`
`92`	`92`	`// Find all of the list items that have been pushed below the first item. Put those items into the popup menu. Put one additional item into the popup menu to cover situations where the last item is shorter than the "more" text.`
`93`	`93`	`$lastChild = $this.find('> li:last-child');`
`94`	`94`	`keepLooking = (needsMenu($lastChild));`
`95`		`- $lastChild.appendTo($popup);`
`96`	`95`	`// If there only a few items left in the navigation bar, move them all to the popup menu.`
`97`	`96`	`if ((i - 1) <= s.cutoff) { // We've removed the ith item, so i - 1 gives us the number of items remaining.`
`98`	`97`	`$($this.children().get().reverse()).appendTo($popup);`
`@@ -101,6 +100,8 @@`
`101`	`100`	`}`
`102`	`101`	`if (!keepLooking) {`
`103`	`102`	`break;`
	`103`	`+ }else{`
	`104`	`+ $lastChild.appendTo($popup);`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`	`if (allInPopup) {`