From c9669be1ec2862b88ffdb296191e82fed79f56a4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 5 Oct 2011 00:14:55 -0700 Subject: [PATCH] get modal working with new data-attrs --- docs/javascript.html | 21 +++++++++------------ js/bootstrap-modal.js | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/docs/javascript.html b/docs/javascript.html index d5eb987392..9f2b138763 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -12,7 +12,7 @@ - + @@ -182,7 +182,7 @@ $('#my-modal').bind('hidden', function () { - - @@ -221,7 +219,7 @@ $('#my-modal').bind('hidden', function () { 
 <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown="dropdown" >
+  <li class="dropdown" data-dropdown="true" >
     <a href="#" class="dropdown-toggle">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
@@ -231,7 +229,6 @@ $('#my-modal').bind('hidden', function () {
     </ul>
   </li>
 </ul>
-

Notice If your ui has several dropdowns, consider adding the data-dropdown attribute to a more significant container element like .tabs or .topbar.

Methods

$().dropdown()

@@ -239,7 +236,7 @@ $('#my-modal').bind('hidden', function () {

Demo

-
+
Project Name @@ -252,7 +249,7 @@ $('#my-modal').bind('hidden', function () {
  • - Dropdown 1 + Dropdown 1
  • - Dropdown 2 + Dropdown 2
    • Secondary link
    • Something else here
      • @@ -645,11 +642,11 @@ $('#my-modal').bind('hidden', function () { 
      $(".alert-message").alert('close')

      Demo

      - × + ×

      Holy guacamole! Best check yo self, you’re not looking too good.

      - × + ×

      Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

      Take this action Or do this diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index c8d41a50b2..60b83d58fd 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -55,7 +55,7 @@ var Modal = function ( content, options ) { this.settings = $.extend({}, $.fn.modal.defaults, options) this.$element = $(content) - .delegate('[data-modal-dismiss]', $.proxy(this.hide, this)) + .delegate('[data-modal-dismiss]', 'click', $.proxy(this.hide, this)) if ( this.settings.show ) { this.show()