fixed bad js include causing the minified file to fail

This commit is contained in:
Kevin Ross 2015-12-24 09:32:36 -06:00
parent 9bc9ffea74
commit 1a7421fb99
5 changed files with 7 additions and 6 deletions

View File

@ -123,7 +123,7 @@ module.exports = function (grunt) {
'dist/js/babel/switch.js': 'js/src/switch.js', 'dist/js/babel/switch.js': 'js/src/switch.js',
'dist/js/babel/radio.js': 'js/src/radio.js', 'dist/js/babel/radio.js': 'js/src/radio.js',
'dist/js/babel/radioInline.js': 'js/src/radioInline.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', '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/switch.js': 'js/src/switch.js',
'docs/dist/js/babel/radio.js': 'js/src/radio.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/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', '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/switch.js': 'js/src/switch.js',
'dist/js/umd/radio.js': 'js/src/radio.js', 'dist/js/umd/radio.js': 'js/src/radio.js',
'dist/js/umd/radioInline.js': 'js/src/radioInline.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', 'dist/js/umd/bootstrapMaterialDesign.js': 'js/src/bootstrapMaterialDesign.js',
} }
} }

View File

@ -16,7 +16,6 @@
</div> </div>
</footer> </footer>
<script src="{{ site.data.cdn.jquery }}"></script> <script src="{{ site.data.cdn.jquery }}"></script>
<script src="{{ site.data.cdn.tether }}"></script> <script src="{{ site.data.cdn.tether }}"></script>
<script src="{{ site.data.cdn.bootstrap }}"></script> <script src="{{ site.data.cdn.bootstrap }}"></script>

View File

@ -13,6 +13,8 @@ module Variables
if baseurl.eql? '' if baseurl.eql? ''
minified = false minified = false
end end
# minified = true # debug minified
site.data['minified'] = minified site.data['minified'] = minified
metadata_files = { metadata_files = {

View File

@ -15,7 +15,7 @@
"../dist/js/babel/bootstrapMaterialDesign.js", "../dist/js/babel/bootstrapMaterialDesign.js",
"../dist/js/babel/checkbox.js", "../dist/js/babel/checkbox.js",
"../dist/js/babel/checkboxInline.js", "../dist/js/babel/checkboxInline.js",
"../dist/js/babel/fileInput.js", "../dist/js/babel/file.js",
"../dist/js/babel/text.js", "../dist/js/babel/text.js",
"../dist/js/babel/textarea.js", "../dist/js/babel/textarea.js",
"../dist/js/babel/select.js", "../dist/js/babel/select.js",

View File

@ -125,7 +125,7 @@ const BootstrapMaterialDesign = (($) => {
let jqueryFn = `mdb${component.charAt(0).toUpperCase() + component.slice(1)}` let jqueryFn = `mdb${component.charAt(0).toUpperCase() + component.slice(1)}`
try { 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 // console.debug(`instantiating: $('${selector}')[${jqueryFn}](${componentConfig})`) // eslint-disable-line no-console
$(selector)[jqueryFn](componentConfig) $(selector)[jqueryFn](componentConfig)