From 73f80614b69f68f351a721206cb4e3b83612afde Mon Sep 17 00:00:00 2001
From: Arnold Daniels <arnold@jasny.net>
Date: Tue, 6 May 2014 04:56:26 +0200
Subject: [PATCH] Fixed customizer. Fixes #233 Bump version to 3.1.3

---
 _config.yml                     | 10 +++++-----
 bower.json                      |  2 +-
 docs/assets/js/customizer.js    | 13 +++++++++----
 grunt/bs-raw-files-generator.js | 25 +++++++++++++++----------
 js/fileinput.js                 |  2 +-
 js/offcanvas.js                 |  2 +-
 js/rowlink.js                   |  2 +-
 js/transition.js                |  2 +-
 package.json                    |  2 +-
 9 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/_config.yml b/_config.yml
index be0bf2344..29bb7faeb 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,13 +19,13 @@ exclude:
   - "vendor"
 
 # Custom vars
-current_version:  3.1.2
+current_version:  3.1.3
 repo:             https://github.com/jasny/bootstrap
 
 download:
-  source:         https://github.com/jasny/bootstrap/archive/v3.1.2.zip
-  dist:           https://github.com/jasny/bootstrap/releases/download/v3.1.2/jasny-bootstrap-3.1.2-dist.zip
+  source:         https://github.com/jasny/bootstrap/archive/v3.1.3.zip
+  dist:           https://github.com/jasny/bootstrap/releases/download/v3.1.3/jasny-bootstrap-3.1.3-dist.zip
 
 cdn:
-  css:            //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.2/css/jasny-bootstrap.min.css
-  js:             //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.2/js/jasny-bootstrap.min.js
+  css:            //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.3/css/jasny-bootstrap.min.css
+  js:             //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.3/js/jasny-bootstrap.min.js
diff --git a/bower.json b/bower.json
index 4dfacfa09..59ec7ff6e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jasny-bootstrap",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": [
     "./dist/css/jasny-bootstrap.css",
     "./dist/js/jasny-bootstrap.js"
diff --git a/docs/assets/js/customizer.js b/docs/assets/js/customizer.js
index ccdd7bc26..3694645ca 100644
--- a/docs/assets/js/customizer.js
+++ b/docs/assets/js/customizer.js
@@ -183,9 +183,14 @@ window.onload = function () { // wait for load in a dumb way because B-0
     return imports
   }
 
-  function generateLESS(lessFilename, lessFileIncludes, vars) {
+  function generateLESS(lessFilename, lessFileIncludes, vars, additionalLessFiles) {
     var lessSource = __less[lessFilename]
 
+    // Additional imports files, not present in less file, but required to build
+    $.each(additionalLessFiles || [], function(index, filename) {
+      lessSource += __less[filename]
+    })
+
     $.each(includedLessFilenames(lessFilename), function(index, filename) {
       var fileInclude = lessFileIncludes[filename]
 
@@ -197,7 +202,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
       // Custom variables are added after Bootstrap variables so the custom
       // ones take precedence.
-      if (('build/default-variables.less' === filename) && vars) lessSource += generateCustomCSS(vars)
+      if (('variables.less' === filename) && vars) lessSource += generateCustomCSS(vars)
     })
 
     lessSource = lessSource.replace(/@import[^\n]*/gi, '') //strip any imports
@@ -206,7 +211,6 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
   function compileLESS(lessSource, baseFilename, intoResult) {
     var parser = new less.Parser({
-        paths: ['build/default-variables.less', 'mixins.less'],
         optimization: 0,
         filename: baseFilename + '.css'
     }).parse(lessSource, function (err, tree) {
@@ -239,7 +243,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
           $(this).val() && (vars[$(this).prev().text()] = $(this).val())
         })
 
-    var bsLessSource    = generateLESS('jasny-bootstrap.less', lessFileIncludes, vars)
+    var bsLessSource    = generateLESS('jasny-bootstrap.less', lessFileIncludes, vars,
+        ['build/variables.less', 'build/mixins.less'])
 
     try {
       compileLESS(bsLessSource, 'jasny-bootstrap', result)
diff --git a/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js
index 5991df5d3..e57c2498c 100644
--- a/grunt/bs-raw-files-generator.js
+++ b/grunt/bs-raw-files-generator.js
@@ -9,16 +9,21 @@
 var btoa = require('btoa');
 var fs = require('fs');
 
-function getFiles(type) {
+function getFiles(type, subdirs, exclude) {
   var files = {};
-  fs.readdirSync(type)
-    .filter(function (path) {
-      return new RegExp('\\.' + type + '$').test(path);
-    })
-    .forEach(function (path) {
-      var fullPath = type + (path === 'variables.less' ? '/build/' : '/') + path;
-      files[path] = fs.readFileSync(fullPath, 'utf8');
-    });
+  if (!exclude) exclude = [];
+  
+  subdirs.forEach(function(subdir) {
+    var sub = subdir ? subdir + '/' : '';
+    fs.readdirSync(type + '/' + sub)
+      .filter(function (path) {
+        return new RegExp('\\.' + type + '$').test(path) && exclude.indexOf(sub + path) === -1;
+      })
+      .forEach(function (path) {
+        var fullPath = type + '/' + sub + path;
+        files[sub + path] = fs.readFileSync(fullPath, 'utf8');
+      });
+  });
   return 'var __' + type + ' = ' + JSON.stringify(files) + '\n';
 }
 
@@ -26,6 +31,6 @@ module.exports = function generateRawFilesJs(banner) {
   if (!banner) {
     banner = '';
   }
-  var files = banner + getFiles('js') + getFiles('less');
+  var files = banner + getFiles('js', ['']) + getFiles('less', ['', 'build'], ['build/jasny-bootstrap.less']);
   fs.writeFileSync('docs/assets/js/raw-files.min.js', files);
 };
diff --git a/js/fileinput.js b/js/fileinput.js
index 3ab96cbf6..f4a9d9736 100644
--- a/js/fileinput.js
+++ b/js/fileinput.js
@@ -1,5 +1,5 @@
 /* ===========================================================
- * Bootstrap: fileinput.js v3.1.2
+ * Bootstrap: fileinput.js v3.1.3
  * http://jasny.github.com/bootstrap/javascript/#fileinput
  * ===========================================================
  * Copyright 2012-2014 Arnold Daniels
diff --git a/js/offcanvas.js b/js/offcanvas.js
index fe72bf7a1..aa15c45dc 100644
--- a/js/offcanvas.js
+++ b/js/offcanvas.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: offcanvas.js v3.1.2
+ * Bootstrap: offcanvas.js v3.1.3
  * http://jasny.github.io/bootstrap/javascript/#offcanvas
  * ========================================================================
  * Copyright 2013-2014 Arnold Daniels
diff --git a/js/rowlink.js b/js/rowlink.js
index d4899a185..5192f91f7 100644
--- a/js/rowlink.js
+++ b/js/rowlink.js
@@ -1,5 +1,5 @@
 /* ============================================================
- * Bootstrap: rowlink.js v3.1.2
+ * Bootstrap: rowlink.js v3.1.3
  * http://jasny.github.io/bootstrap/javascript/#rowlink
  * ============================================================
  * Copyright 2012-2014 Arnold Daniels
diff --git a/js/transition.js b/js/transition.js
index c5940d969..1abe982ea 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.1.2
+ * Bootstrap: transition.js v3.1.3
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/package.json b/package.json
index 30b722461..672909abd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jasny-bootstrap",
   "description": "Additional features and components for Bootstrap",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "keywords": [
     "bootstrap",
     "css"