Skip to content

B
bootstrap
Commit 0e39f945 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

parents 82f6f08f 5e89f71a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
Gruntfile.js
View file @ 0e39f945
......@@ -145,7 +145,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-recess');
grunt.loadNpmTasks('browserstack-runner');
// Docs HTML validation task
grunt.registerTask('validate-docs', ['jekyll', 'validation']);
......
dist/js/bootstrap.js
View file @ 0e39f945
......@@ -1064,7 +1064,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
})
$(document)
.on('shown.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
......
dist/js/bootstrap.min.js
View file @ 0e39f945
This diff is collapsed.
js/modal.js
View file @ 0e39f945
......@@ -238,7 +238,7 @@
})
$(document)
.on('shown.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment