push latest modal static code

fat · fat · commit 366191ab0aa7 · 2011-09-17T14:27:42.000-07:00
diff --git a/1.3.0/bootstrap-modal.js b/1.3.0/bootstrap-modal.js
@@ -89,7 +89,7 @@
             that.$element
               .addClass('in')
               .trigger('shown')
-          }, 1)
+          }, 0)
         })
 
         return this
@@ -133,15 +133,19 @@
       , animate = this.$element.hasClass('fade') ? 'fade' : ''
     if ( this.isShown && this.settings.backdrop ) {
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-        .click($.proxy(this.hide, this))
         .appendTo(document.body)
 
+      if ( this.settings.backdrop != 'static' ) {
+        this.$backdrop.click($.proxy(this.hide, this))
+      }
+
       setTimeout(function () {
         that.$backdrop && that.$backdrop.addClass('in')
         $.support.transition && that.$backdrop.hasClass('fade') ?
           that.$backdrop.one(transitionEnd, callback) :
           callback()
-      })
+      }, 0)
+
     } else if ( !this.isShown && this.$backdrop ) {
       this.$backdrop.removeClass('in')
 
diff --git a/javascript.html b/javascript.html
@@ -101,9 +101,9 @@ <h3>Options</h3>
             <tbody>
              <tr>
                <td>backdrop</td>
-               <td>boolean</td>
+               <td>boolean, string</td>
                <td>false</td>
-               <td>Includes a modal-backdrop element</td>
+               <td>Includes a modal-backdrop element. Set backdrop to <code>"static"</code> if you do not want the modal closed when the backdrop is clicked</td>
              </tr>
              <tr>
                <td>keyboard</td>
@@ -122,7 +122,7 @@ <h3>Options</h3>
           <h3>Markup</h3>
           <p>You can activate modals on your page easily without having to write a single line of javascript. Just give an element a <code>data-controls-modal</code> attribute which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as data attributes as well.</p>
 <pre class="prettyprint linenums">
-&lt;a class="btn" data-controls-modal="my-modal" data-backdrop="true" &gt;Launch Modal&lt;/a&gt;
+&lt;a class="btn" data-controls-modal="my-modal" data-backdrop="static" &gt;Launch Modal&lt;/a&gt;
 </pre>
           <p><span class="label notice">Notice</span> If you want your modal to animate in and out, just add a <code>.fade</code> class to your <code>.modal</code> element (refer to the demo to see this in action).</p>
           <h3>Methods</h3>
@@ -458,7 +458,7 @@ <h3>Options</h3>
              </tr>
              <tr>
                <td>title</td>
-               <td>string | function</td>
+               <td>string, function</td>
                <td>'title'</td>
                <td>attribute or method for retrieving title text</td>
              </tr>
@@ -575,13 +575,13 @@ <h3>Options</h3>
              </tr>
              <tr>
                <td>title</td>
-               <td>string | function</td>
+               <td>string, function</td>
                <td>'title'</td>
                <td>attribute or method for retrieving title text</td>
              </tr>
              <tr>
                <td>content</td>
-               <td>string | function</td>
+               <td>string, function</td>
                <td>'data-content'</td>
                <td>attribute or method for retrieving content text</td>
              </tr>
