initial idea for handling closing of modals from whatever element you want with ...

diff --git a/docs/index.html b/docs/index.html
index 857af2448652a6bb3c7ad0a89ccc6d21b2a130ac..b24999c6232c332ad2d2c7951b05188957514a7e 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -1644,7 +1644,7 @@
         <!-- Modal -->
         <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
           <div class="modal-header">
-            <a href="#" class="close">&times;</a>
+            <a href="#" class="close js-dismiss">&times;</a>
             <h3>Modal Heading</h3>
           </div>
           <div class="modal-body">
@@ -1652,7 +1652,7 @@
           </div>
           <div class="modal-footer">
             <a href="#" class="btn primary">Primary</a>
-            <a href="#" class="btn secondary">Secondary</a>
+            <a href="#" class="btn">Secondary</a>
           </div>
         </div>
       </div>

diff --git a/docs/javascript.html b/docs/javascript.html
index d16926186e49ffb31dd205a429d442d6b15b726a..d5eb987392600da32941806e05f9ef3b69013193 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -182,15 +182,15 @@ $('#my-modal').bind('hidden', function () {
           <!-- sample modal content -->
           <div id="modal-from-dom" class="modal hide fade">
             <div class="modal-header">
-              <a href="#" class="close">&times;</a>
+              <a href="#" class="close js-dismiss">&times;</a>
               <h3>Modal Heading</h3>
             </div>
             <div class="modal-body">
               <p>One fine body…</p>
             </div>
             <div class="modal-footer">
-              <a href="#" class="btn primary">Primary</a>
-              <a href="#" class="btn secondary">Secondary</a>
+              <a href="#" class="btn primary">Save changes</a>
+              <a href="#" class="btn js-dismiss">Close</a>
             </div>
           </div>
 

diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index da67060731c80cc8e624d5e0bb58ffd0fa0fdfdb..5c38a7477b9863a322f444bbec4acca3a46f8544 100644 (file)
--- 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)
     this.$element = $(content)
-      .delegate('.close', 'click.modal', $.proxy(this.hide, this))
+      .delegate('.js-dismiss', 'click.modal', $.proxy(this.hide, this))
 
     if ( options ) {
       $.extend( this.settings, options )