Skip to content

Commit

Permalink
Update devDependencies and gems.
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Dec 28, 2017
1 parent 3e0dd5a commit 0a0d99a
Show file tree
Hide file tree
Showing 6 changed files with 365 additions and 344 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ group :development, :test do
gem 'jekyll', '~> 3.6.2'
gem 'jekyll-redirect-from', '~> 0.13.0'
gem 'jekyll-sitemap', '~> 1.1.1'
gem 'jekyll-toc', '~> 0.5.0.rc'
gem 'jekyll-toc', '~> 0.5.0'
end
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GEM
sass (~> 3.4)
jekyll-sitemap (1.1.1)
jekyll (~> 3.3)
jekyll-toc (0.5.0.rc)
jekyll-toc (0.5.0)
nokogiri (~> 1.6)
jekyll-watch (1.5.1)
listen (~> 3.0)
Expand Down Expand Up @@ -63,7 +63,7 @@ DEPENDENCIES
jekyll (~> 3.6.2)
jekyll-redirect-from (~> 0.13.0)
jekyll-sitemap (~> 1.1.1)
jekyll-toc (~> 0.5.0.rc)
jekyll-toc (~> 0.5.0)

BUNDLED WITH
1.16.1
18 changes: 9 additions & 9 deletions build/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ if (BUNDLE) {
module.exports = {
input: path.resolve(__dirname, '../js/src/index.js'),
output: {
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
format: 'umd'
},
name: 'bootstrap',
external,
globals,
plugins,
banner: `/*!
banner: `/*!
* Bootstrap v${pkg.version} (${pkg.homepage})
* Copyright 2011-${year} ${pkg.author}
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/`
*/`,
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
format: 'umd',
globals,
name: 'bootstrap'
},
external,
plugins
}
1 change: 1 addition & 0 deletions js/src/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ const Dropdown = (($) => {
return parent || element.parentNode
}

// eslint-disable-next-line complexity
static _dataApiKeydownHandler(event) {
// If not input/textarea:
// - And not a key in REGEXP_KEYDOWN => not a dropdown command
Expand Down
Loading

0 comments on commit 0a0d99a

Please sign in to comment.