rake convert

Author: glebm

assets/javascripts/bootstrap.js

@@ -700,7 +700,7 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-      if (!data && options.toggle && option == 'show') options.toggle = false
+      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
       if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
@@ -2233,7 +2233,7 @@ if (typeof jQuery === 'undefined') {
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-    var scrollHeight = $('body').height()
+    var scrollHeight = $(document.body).height()
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)

assets/javascripts/bootstrap.min.js

@@ -78,7 +78,7 @@
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-    var scrollHeight = $('body').height()
+    var scrollHeight = $(document.body).height()
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)

assets/javascripts/bootstrap/affix.js

@@ -172,7 +172,7 @@
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-      if (!data && options.toggle && option == 'show') options.toggle = false
+      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
       if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })

assets/javascripts/bootstrap/collapse.js

@@ -17,9 +17,8 @@
 
 .collapse {
   display: none;
-  visibility: hidden;
 
-  &.in      { display: block; visibility: visible; }
+  &.in      { display: block; }
   // [converter] extracted tr&.in to tr.collapse.in
   // [converter] extracted tbody&.in to tbody.collapse.in
 }

assets/stylesheets/bootstrap/_component-animations.scss

@@ -67,7 +67,6 @@
 
     &.collapse {
       display: block !important;
-      visibility: visible !important;
       height: auto !important;
       padding-bottom: 0; // Override default setting
       overflow: visible !important;

assets/stylesheets/bootstrap/_navbar.scss

@@ -223,11 +223,9 @@
 .tab-content {
   > .tab-pane {
     display: none;
-    visibility: hidden;
   }
   > .active {
     display: block;
-    visibility: visible;
   }
 }
 

assets/stylesheets/bootstrap/_navs.scss

@@ -8,7 +8,6 @@
   position: absolute;
   z-index: $zindex-tooltip;
   display: block;
-  visibility: visible;
   // Reset font and text properties given new insertion method
   font-family: $font-family-base;
   font-size: $font-size-small;

assets/stylesheets/bootstrap/_tooltip.scss

@@ -44,7 +44,6 @@
 
 .hidden {
   display: none !important;
-  visibility: hidden !important;
 }
 
 

assets/stylesheets/bootstrap/_utilities.scss

@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION       = '3.3.3'
-  BOOTSTRAP_SHA = 'e7efd810339eb538c4103a6d116956f1917c43d8'
+  BOOTSTRAP_SHA = 'a3b6c9072c3d62316f21c0be405b81121d71cdf9'
 end