From 1a7421fb995e51fdaa85e412268c851e144f720a Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Thu, 24 Dec 2015 09:32:36 -0600 Subject: [PATCH] fixed bad js include causing the minified file to fail --- Gruntfile.js | 6 +++--- docs/_includes/footer.html | 1 - docs/_plugins/variables.rb | 2 ++ grunt/configBridge.json | 2 +- js/src/bootstrapMaterialDesign.js | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 46c40dfc..7f53a1bb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -123,7 +123,7 @@ module.exports = function (grunt) { 'dist/js/babel/switch.js': 'js/src/switch.js', 'dist/js/babel/radio.js': 'js/src/radio.js', 'dist/js/babel/radioInline.js': 'js/src/radioInline.js', - 'dist/js/babel/fileInput.js': 'js/src/file.js', + 'dist/js/babel/file.js': 'js/src/file.js', 'dist/js/babel/bootstrapMaterialDesign.js': 'js/src/bootstrapMaterialDesign.js', } }, @@ -150,7 +150,7 @@ module.exports = function (grunt) { 'docs/dist/js/babel/switch.js': 'js/src/switch.js', 'docs/dist/js/babel/radio.js': 'js/src/radio.js', 'docs/dist/js/babel/radioInline.js': 'js/src/radioInline.js', - 'docs/dist/js/babel/fileInput.js': 'js/src/file.js', + 'docs/dist/js/babel/file.js': 'js/src/file.js', 'docs/dist/js/babel/bootstrapMaterialDesign.js': 'js/src/bootstrapMaterialDesign.js', } }, @@ -180,7 +180,7 @@ module.exports = function (grunt) { 'dist/js/umd/switch.js': 'js/src/switch.js', 'dist/js/umd/radio.js': 'js/src/radio.js', 'dist/js/umd/radioInline.js': 'js/src/radioInline.js', - 'dist/js/umd/fileInput.js': 'js/src/file.js', + 'dist/js/umd/file.js': 'js/src/file.js', 'dist/js/umd/bootstrapMaterialDesign.js': 'js/src/bootstrapMaterialDesign.js', } } diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 57edfad0..9da6d0eb 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -16,7 +16,6 @@ - diff --git a/docs/_plugins/variables.rb b/docs/_plugins/variables.rb index 8e9d0d65..abd99533 100644 --- a/docs/_plugins/variables.rb +++ b/docs/_plugins/variables.rb @@ -13,6 +13,8 @@ module Variables if baseurl.eql? '' minified = false end + + # minified = true # debug minified site.data['minified'] = minified metadata_files = { diff --git a/grunt/configBridge.json b/grunt/configBridge.json index df8685dc..8d49708d 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -15,7 +15,7 @@ "../dist/js/babel/bootstrapMaterialDesign.js", "../dist/js/babel/checkbox.js", "../dist/js/babel/checkboxInline.js", - "../dist/js/babel/fileInput.js", + "../dist/js/babel/file.js", "../dist/js/babel/text.js", "../dist/js/babel/textarea.js", "../dist/js/babel/select.js", diff --git a/js/src/bootstrapMaterialDesign.js b/js/src/bootstrapMaterialDesign.js index 23600929..47ad345f 100644 --- a/js/src/bootstrapMaterialDesign.js +++ b/js/src/bootstrapMaterialDesign.js @@ -125,7 +125,7 @@ const BootstrapMaterialDesign = (($) => { let jqueryFn = `mdb${component.charAt(0).toUpperCase() + component.slice(1)}` try { - // instantiate component on selector elements with config + // safely instantiate component on selector elements with config, report errors and move on. // console.debug(`instantiating: $('${selector}')[${jqueryFn}](${componentConfig})`) // eslint-disable-line no-console $(selector)[jqueryFn](componentConfig)