Fix points ordering

fabienmoyon · Nov 9, 2015 · 38e6962 · 38e6962
1 parent c142b3f
commit 38e6962
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/js/core.js b/src/js/core.js
@@ -238,11 +238,19 @@ s.getActiveBreakpoint = function () {
     //Get breakpoint for window width
     if (!s.params.breakpoints) return false;
     var breakpoint = false;
-    for ( var point in s.params.breakpoints ) {
+    var points = [], point;
+    for ( point in s.params.breakpoints ) {
         if (s.params.breakpoints.hasOwnProperty(point)) {
-            if (point >= $(window).width() && !breakpoint) {
-                breakpoint = point;
-            }
+            points.push(point);
+        }
+    }
+    points.sort(function (a, b) {
+        return parseInt(a, 10) > parseInt(b, 10);
+    });
+    for (var i = 0; i < points.length; i++) {
+        point = points[i];
+        if (point >= $(window).width() && !breakpoint) {
+            breakpoint = point;
         }
     }
     return breakpoint || 'max';