released v1.0.7

gijsroge · Jun 27, 2015 · b886d22 · b886d22
1 parent c45737f
commit b886d22
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "priority-nav",
   "title": "priority-nav",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": [
     "dist/priority-nav.js",
     "dist/priority-nav-core.css"

diff --git a/dist/priority-nav.js b/dist/priority-nav.js
@@ -1,5 +1,5 @@
 /*
- * priority-nav - v1.0.6 | (c) 2015 @gijsroge | MIT license
+ * priority-nav - v1.0.7 | (c) 2015 @gijsroge | MIT license
  * Repository: https://github.com/gijsroge/priority-navigation.git
  * Description: Priority+ pattern navigation that hides menu items if they don't fit on screen.
  * Demo: http://gijsroge.github.io/priority-nav.js/
@@ -297,12 +297,12 @@
             /**
              * Keep executing until all menu items that are overflowing are moved
              */
-            while (totalWidth < restWidth || viewportWidth < settings.breakPoint && _this.querySelector(mainNav).children.length > 0) {
+            while (totalWidth < restWidth  && _this.querySelector(mainNav).children.length > 0 || viewportWidth < settings.breakPoint && _this.querySelector(mainNav).children.length > 0) {
                 //move item to dropdown
                 priorityNav.toDropdown(_this, identifier);
                 //recalculate widths
                 calculateWidths(_this, identifier);
-
+                //update dropdownToggle label
                 if(viewportWidth < settings.breakPoint) updateLabel(_this, identifier, settings.navDropdownBreakpointLabel);
             }
 
@@ -312,6 +312,7 @@
             while (totalWidth > breaks[identifier][breaks[identifier].length - 1] && viewportWidth > settings.breakPoint) {
                 //move item to menu
                 priorityNav.toMenu(_this, identifier);
+                //update dropdownToggle label
                 if(viewportWidth > settings.breakPoint) updateLabel(_this, identifier, settings.navDropdownLabel);
             }
 

diff --git a/dist/priority-nav.min.js b/dist/priority-nav.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "priority-nav",
   "title": "priority-nav",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "dist/priority-nav.js",
   "description": "Priority+ pattern navigation that hides menu items if they don't fit on screen.",
   "homepage": "http://gijsroge.github.io/priority-nav.js/",