diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 614b0e3456..00fd56694c 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -1,11 +1,5 @@ $(document).ready(function(){ - // Scrollspy - // ========= - - $('body > .topbar').scrollSpy() - - // table sort example // ================== diff --git a/docs/index.html b/docs/index.html index 6c50960329..93f240775c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -37,7 +37,7 @@ -
+
Bootstrap @@ -1262,7 +1262,7 @@

Fixed topbar

-
+

Project Name

@@ -1331,7 +1331,7 @@
  • Messages
  • Settings
  • Contact
    • -
  • +
  • Dropdown
    • Secondary link
      • diff --git a/docs/javascript.html b/docs/javascript.html index c7f31961d4..6d5cf9517e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -39,7 +39,7 @@ -
      +

      Bootstrap JS

      @@ -120,7 +120,7 @@

      Markup

      -

      You can activate modals on your page easily without having to write a single line of javascript. Just give an element a data-controls-modal 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.

      +

      You can activate modals on your page easily without having to write a single line of javascript. Just give an element a data-controls-modal 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.

       <a class="btn" data-controls-modal="my-modal" data-backdrop="true" >Launch Modal</a>
      @@ -146,19 +146,11 @@ $('#my-modal').modal({ 
      $('#my-modal').modal(true)

      Notice Alternatively, this can be retrieved with $().data('modal').

      Events

      -

      Bootstrap's modal class exposes a few events for hooking into modal functionality. The include:

      - - - +

      Bootstrap's modal class exposes a few events for hooking into modal functionality.

      - + @@ -229,7 +221,7 @@ $('#my-modal').bind('hidden', function () { 
       <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown>
+  <li class="dropdown" data-dropdown="x" >
     <a href="#" class="dropdown-toggle">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
@@ -247,7 +239,7 @@ $('#my-modal').bind('hidden', function () {
           
      
           
      Demo
      
           
      
-            
      
+            
      
               
      
                 
      
                   
      Project Name
      
@@ -303,20 +295,20 @@ $('#my-modal').bind('hidden', function () {
           
      $('#topbar').dropdown()
      
           
      Markup
      
           
      To easily add scrollspy behavior to your nav, just add the data-scrollspy attribute to the .topbar.
-          
      <div class="topbar" data-scrollspy >...</div>
      
+          
      <div class="topbar" data-scrollspy="x" >...</div>
      
           
      Methods
      
           
      $().scrollspy()
      
           
      
           Auto activates navigation buttons by users scroll position.
           
      
           
      $('body > .topbar').scrollSpy()
      
-           
      Notice Topbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> might correspond to a <div id="home"></div>.
+           
      Notice Topbar anchor tags must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the dom like <div id="home"></div>.
           
      
           
      .scrollspy('refresh')
      
-          
      The scrollspy caches nav buttons and section coordinates for performance. If you need to update this cache (likely if you have dynamic content) just call this refresh method. If you used the data attribute to define your scrollspy, just call refresh on the body like below.
      
+          
      The scrollspy caches nav buttons and section coordinates for performance. If you need to update this cache (likely if you have dynamic content) just call this refresh method. If you used the data attribute to define your scrollspy, just call refresh on the body.
      
           
      $('body').scrollspy('refresh')
      
           
      Demo
      
-          
      Look at the topbar navigation on this page.
      
+          
      Checkout the the topbar navigation on this page.
      
         
      
       
      
     
@@ -338,7 +330,7 @@ $('#my-modal').bind('hidden', function () {
           
      $('.tabs').tabs()
      
           
      Markup
      
           
      You can activate a tab or pill navigation without writing any javascript by simply giving them a data-tabs or data-pills attribute.
      
-          
       <ul class="tabs" data-tabs >...</ul>
      
+          
       <ul class="tabs" data-tabs="x" >...</ul>
      
           
      Methods
      
           
      $().tabs or $().pills
      
           
      
@@ -366,7 +358,7 @@ $('#my-modal').bind('hidden', function () {
 </script>

      Demo

      -
        +
        • Home
        • Profile
        • Messages
          • @@ -648,11 +640,11 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita

          Closes an alert.

          $(".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.

          diff --git a/js/tests/index.html b/js/tests/index.html index 4f904b9c0c..2ca94102ad 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -10,7 +10,7 @@ - + diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js index 513d287804..4bbb3313cc 100644 --- a/js/tests/unit/bootstrap-modal.js +++ b/js/tests/unit/bootstrap-modal.js @@ -16,36 +16,37 @@ $(function () { ok($.fn.modal.defaults, 'default object exposed') }) - test("should insert into dom when modal:show event is called", function () { + test("should insert into dom when show method is called", function () { stop() $.support.transition = false var div = $("") div .modal() - .trigger("modal:show") - .bind("modal:shown", function () { + .modal("show") + .bind("shown", function () { ok($('#modal-test').length, 'modal insterted into dom') start() div.remove() }) }) - test("should remove from dom when modal:hide is called", function () { + test("should hide modal when hide is called", function () { stop() $.support.transition = false var div = $("") div .modal() - .trigger("modal:show") - .bind("modal:shown", function () { + .bind("shown", function () { + ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') - div.trigger("modal:hide") + div.modal("hide") }) - .bind("modal:hidden", function() { - ok(!$('#modal-test').length, 'modal removed from dom') + .bind("hidden", function() { + ok(!$('#modal-test').is(":visible"), 'modal hidden') start() div.remove() }) + .modal("show") }) test("should toggle when toggle is called", function () { @@ -54,16 +55,17 @@ $(function () { var div = $("") div .modal() - .trigger("modal:toggle") - .bind("modal:shown", function () { + .bind("shown", function () { + ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') - div.trigger("modal:toggle") + div.modal("toggle") }) - .bind("modal:hidden", function() { - ok(!$('#modal-test').length, 'modal removed from dom') + .bind("hidden", function() { + ok(!$('#modal-test').is(":visible"), 'modal hidden') start() div.remove() }) + .modal("toggle") }) test("should remove from dom when click .close", function () { @@ -72,15 +74,16 @@ $(function () { var div = $("") div .modal() - .trigger("modal:toggle") - .bind("modal:shown", function () { + .bind("shown", function () { + ok($('#modal-test').is(":visible"), 'modal visible') ok($('#modal-test').length, 'modal insterted into dom') div.find('.close').click() }) - .bind("modal:hidden", function() { - ok(!$('#modal-test').length, 'modal removed from dom') + .bind("hidden", function() { + ok(!$('#modal-test').is(":visible"), 'modal hidden') start() div.remove() }) + .modal("toggle") }) }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js index 42ecd70ae5..3e13d2fd20 100644 --- a/js/tests/unit/bootstrap-popover.js +++ b/js/tests/unit/bootstrap-popover.js @@ -14,20 +14,20 @@ $(function () { test("should render popover element", function () { $.support.transition = false - var popover = $('@mdo') + var popover = $('@mdo') .appendTo('#qunit-runoff') .popover() - .trigger('popover:show') + .popover('show') ok($('.popover').length, 'popover was inserted') - popover.trigger('popover:hide') + popover.popover('hide') ok(!$(".popover").length, 'popover removed') $('#qunit-runoff').empty() }) test("should store popover instance in popover data object", function () { $.support.transition = false - var popover = $('@mdo') + var popover = $('@mdo') .popover() ok(!!popover.data('popover'), 'popover instance exists') @@ -38,32 +38,37 @@ $(function () { var popover = $('@fat') .appendTo('#qunit-runoff') .popover({ - title: '@fat' - , content: 'loves writing tests （╯°□°）╯︵ ┻━┻' + title: function () { + return '@fat' + } + , content: function () { + return 'loves writing tests （╯°□°）╯︵ ┻━┻' + } }) - .trigger('popover:show') + + popover.popover('show') ok($('.popover').length, 'popover was inserted') equals($('.popover .title').text(), '@fat', 'title correctly inserted') equals($('.popover .content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted') - popover.trigger('popover:hide') + popover.popover('hide') ok(!$('.popover').length, 'popover was removed') $('#qunit-runoff').empty() }) test("should get title and content from attributes", function () { $.support.transition = false - var popover = $('@mdo') + var popover = $('@mdo') .appendTo('#qunit-runoff') .popover() - .trigger('popover:show') + .popover('show') ok($('.popover').length, 'popover was inserted') equals($('.popover .title').text(), '@mdo', 'title correctly inserted') equals($('.popover .content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted') - popover.trigger('popover:hide') + popover.popover('hide') ok(!$('.popover').length, 'popover was removed') $('#qunit-runoff').empty() }) diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js index 05de7e9380..04000696ae 100644 --- a/js/tests/unit/bootstrap-twipsy.js +++ b/js/tests/unit/bootstrap-twipsy.js @@ -31,10 +31,10 @@ $(function () { var twipsy = $('') .appendTo('#qunit-runoff') .twipsy({placement: 'below'}) - .trigger('twipsy:show') + .twipsy('show') ok($(".twipsy").hasClass('fade below in'), 'has correct classes applied') - twipsy.trigger('twipsy:hide') + twipsy.twipsy('hide') ok(!$(".twipsy").length, 'twipsy removed') $('#qunit-runoff').empty() }) @@ -44,10 +44,10 @@ $(function () { var twipsy = $('') .appendTo('#qunit-runoff') .twipsy({fallback: '@fat'}) - .trigger('twipsy:show') + .twipsy('show') equals($(".twipsy").text(), "@fat", 'has correct default text') - twipsy.trigger('twipsy:hide') + twipsy.twipsy('hide') ok(!$(".twipsy").length, 'twipsy removed') $('#qunit-runoff').empty() }) @@ -57,10 +57,10 @@ $(function () { var twipsy = $('') .appendTo('#qunit-runoff') .twipsy() - .trigger('twipsy:show') + .twipsy('show') ok(!$('.twipsy b').length, 'b tag was not inserted') - twipsy.trigger('twipsy:hide') + twipsy.twipsy('hide') ok(!$(".twipsy").length, 'twipsy removed') $('#qunit-runoff').empty() }) @@ -70,10 +70,10 @@ $(function () { var twipsy = $('') .appendTo('#qunit-runoff') .twipsy({html: true}) - .trigger('twipsy:show') + .twipsy('show') ok($('.twipsy b').length, 'b tag was inserted') - twipsy.trigger('twipsy:hide') + twipsy.twipsy('hide') ok(!$(".twipsy").length, 'twipsy removed') $('#qunit-runoff').empty() })
      NameEvent Description