Some adaption for new column classes

Also removed reference to .bs-customizer-input
Herst · Sep 3, 2017 · 10ed536 · 10ed536
1 parent b5e0ec7
commit 10ed536
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/bootlint.js b/src/bootlint.js
@@ -17,13 +17,13 @@ var LocationIndex = _location.LocationIndex;
 (function (exports) {
     'use strict';
     var NUM_COLS = 12;
-    var COL_REGEX = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/;
-    var COL_REGEX_G = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/g;
+    var COL_REGEX = /\bcol(-(sm|md|lg|xl))?(-(auto|\d{1,2}))?\b/;
+    var COL_REGEX_G = /\bcol(-(sm|md|lg|xl))?(-(auto|\d{1,2}))?\b/g;
     var COL_CLASSES = [];
-    var SCREENS = ['xs', 'sm', 'md', 'lg'];
+    var SCREENS = ['', 'sm', 'md', 'lg', 'xl'];
     SCREENS.forEach(function (screen) {
-        for (var n = 1; n <= NUM_COLS; n++) {
-            COL_CLASSES.push('.col-' + screen + '-' + n);
+        for (var n = -1; n <= NUM_COLS; n++) {
+            COL_CLASSES.push('.col' + (screen ? '-' + screen : '') + (n < 0 ? '' : '-' + (n || 'auto')));
         }
     });
     var SCREEN2NUM = {
@@ -678,7 +678,7 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     addLinter('E013', function lintRowChildrenAreCols($, reporter) {
-        var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix', '.bs-customizer-input']);
+        var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix']);
         var selector = '.row>*' + ALLOWED_CHILDREN.map(function (colClass) {
             return ':not(' + colClass + ')';
         }).join('');