Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

3 files changed, 103 insertions, 99 deletions

diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js
index 2791bd841..525aea002 100644
--- a/js/tests/unit/phantom.js
+++ b/js/tests/unit/phantom.js
@@ -76,29 +76,26 @@
 // shoutout mdn: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Polyfill
 
 if (!Function.prototype.bind) {
-  Function.prototype.bind = function(oThis) {
+  Function.prototype.bind = function (oThis) {
     if (typeof this !== 'function') {
       // closest thing possible to the ECMAScript 5
       // internal IsCallable function
       throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
     }
 
-    var aArgs   = Array.prototype.slice.call(arguments, 1),
-        fToBind = this,
-        fNOP    = function() {},
-        fBound  = function() {
-          return fToBind.apply(this instanceof fNOP
-                 ? this
-                 : oThis,
-                 aArgs.concat(Array.prototype.slice.call(arguments)));
-        };
+    var aArgs   = Array.prototype.slice.call(arguments, 1)
+    var fToBind = this
+    var FNOP    = function () {}
+    var fBound  = function () {
+      return fToBind.apply(this instanceof FNOP ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments)))
+    }
 
     if (this.prototype) {
       // native functions don't have a prototype
-      fNOP.prototype = this.prototype;
+      FNOP.prototype = this.prototype
     }
-    fBound.prototype = new fNOP();
+    fBound.prototype = new FNOP()
 
-    return fBound;
-  };
+    return fBound
+  }
 }
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index f9df5d07e..5ade9dd18 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -22,68 +22,72 @@
     <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <nav id="navbar-example" class="navbar navbar-default navbar-static-top" role="navigation">
-    <div class="container-fluid">
-      <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
-        &#9776;
-      </button>
-      <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
-        <ul class="nav navbar-nav pull-left">
-          <li class="dropdown nav-item">
-            <a id="drop1" href="#" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Dropdown
-            </a>
-            <ul class="dropdown-menu" aria-labelledby="drop1">
-              <li><a href="https://twitter.com/fat">Action</a></li>
-              <li><a href="https://twitter.com/fat">Another action</a></li>
-              <li><a href="https://twitter.com/fat">Something else here</a></li>
-              <li role="separator" class="divider"></li>
-              <li><a href="https://twitter.com/fat">Separated link</a></li>
-            </ul>
-          </li>
-          <li class="dropdown nav-item">
-            <a href="#" id="drop2" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Dropdown 2
-            </a>
-            <ul class="dropdown-menu" aria-labelledby="drop2">
-              <li><a href="https://twitter.com/fat">Action</a></li>
-              <li><a href="https://twitter.com/fat">Another action</a></li>
-              <li><a href="https://twitter.com/fat">Something else here</a></li>
-              <li role="separator" class="divider"></li>
-              <li><a href="https://twitter.com/fat">Separated link</a></li>
-            </ul>
-          </li>
-        </ul>
-        <ul class="nav navbar-nav pull-right">
-          <li id="fat-menu" class="dropdown nav-item">
-            <a href="#" id="drop3" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Dropdown 3
-            </a>
-            <ul class="dropdown-menu" aria-labelledby="drop3">
-              <li><a href="https://twitter.com/fat">Action</a></li>
-              <li><a href="https://twitter.com/fat">Another action</a></li>
-              <li><a href="https://twitter.com/fat">Something else here</a></li>
-              <li role="separator" class="divider"></li>
-              <li><a href="https://twitter.com/fat">Separated link</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
+  <nav id="navbar-example" class="navbar navbar-light bg-faded" role="navigation">
+    <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
+      &#9776;
+    </button>
+
+    <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
+
+      <ul class="nav navbar-nav pull-left">
+
+        <li class="dropdown nav-item">
+          <a id="drop1" href="#" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Dropdown
+          </a>
+          <div class="dropdown-menu" aria-labelledby="drop1">
+            <a class="dropdown-item" href="https://twitter.com/fat">Action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Another action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a>
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a>
+          </div>
+        </li>
+
+        <li class="dropdown nav-item">
+          <a href="#" id="drop2" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Dropdown 2
+          </a>
+          <div class="dropdown-menu" aria-labelledby="drop2">
+            <a class="dropdown-item" href="https://twitter.com/fat">Action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Another action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a>
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a>
+          </div>
+        </li>
+
+      </ul>
+
+      <ul class="nav navbar-nav pull-right">
+        <li id="fat-menu" class="dropdown nav-item">
+          <a href="#" id="drop3" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Dropdown 3
+          </a>
+          <div class="dropdown-menu" aria-labelledby="drop3">
+            <a class="dropdown-item" href="https://twitter.com/fat">Action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Another action</a>
+            <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a>
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a>
+          </div>
+        </li>
+      </ul>
     </div>
   </nav>
 
-  <ul class="nav nav-pills">
+  <ul class="nav nav-pills m-t-lg">
     <li class="active nav-item"><a href="#" class="nav-link">Regular link</a></li>
     <li class="dropdown nav-item">
       <a id="drop4" class="nav-link" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
         Dropdown
       </a>
       <ul id="menu1" class="dropdown-menu" aria-labelledby="drop4">
-        <li><a href="https://twitter.com/fat">Action</a></li>
-        <li><a href="https://twitter.com/fat">Another action</a></li>
-        <li><a href="https://twitter.com/fat">Something else here</a></li>
-        <li role="separator" class="divider"></li>
-        <li><a href="https://twitter.com/fat">Separated link</a></li>
+        <a class="dropdown-item" href="https://twitter.com/fat">Action</a>
+        <a class="dropdown-item" href="https://twitter.com/fat">Another action</a>
+        <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a>
       </ul>
     </li>
     <li class="dropdown nav-item">
@@ -91,11 +95,11 @@
         Dropdown 2
       </a>
       <ul id="menu2" class="dropdown-menu" aria-labelledby="drop5">
-        <li><a href="https://twitter.com/fat">Action</a></li>
-        <li><a href="https://twitter.com/fat">Another action</a></li>
-        <li><a href="https://twitter.com/fat">Something else here</a></li>
-        <li role="separator" class="divider"></li>
-        <li><a href="https://twitter.com/fat">Separated link</a></li>
+        <a class="dropdown-item" href="https://twitter.com/fat">Action</a>
+        <a class="dropdown-item" href="https://twitter.com/fat">Another action</a>
+        <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a>
       </ul>
     </li>
   </ul>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 7bb38ebf0..047916707 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -25,30 +25,30 @@
 </head>
 <body>
 
-<nav class="navbar navbar-default navbar-static-top">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="#">navbar-static-top</a>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li><a href="#about">About</a></li>
-        <li><a href="#contact">Contact</a></li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">This should not jump to the left when the modal is shown.</a></li>
-      </ul>
-    </div><!--/.nav-collapse -->
+<nav class="navbar navbar-dark bg-inverse navbar-static-top">
+  <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
+    &#9776;
+  </button>
+  <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
+    <a class="navbar-brand" href="#">This shouldn't jump!</a>
+    <ul class="nav navbar-nav">
+      <li class="nav-item active">
+        <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#">Features</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#">Pricing</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#">About</a>
+      </li>
+    </ul>
   </div>
 </nav>
 
-<div class="container">
+<div class="container m-t-lg">
 
   <div class="page-header">
     <h1>Modal <small>Bootstrap Visual Test</small></h1>
@@ -67,7 +67,7 @@
           <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
 
           <h4>Popover in a modal</h4>
-          <p>This <a href="#" role="button" class="btn btn-default js-popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?" data-placement="left">button</a> should trigger a popover on click.</p>
+          <p>This <a href="#" role="button" class="btn btn-primary js-popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?" data-placement="left">button</a> should trigger a popover on click.</p>
 
           <h4>Tooltips in a modal</h4>
           <p><a href="#" class="js-tooltip" title="Tooltip">This link</a> and <a href="#" class="js-tooltip" title="Tooltip">that link</a> should have tooltips on hover.</p>
@@ -141,10 +141,13 @@
 
 <!-- JavaScript Includes -->
 <script src="../vendor/jquery.min.js"></script>
+<script src="../vendor/tether.min.js"></script>
 
 <script src="../../dist/util.js"></script>
 <script src="../../dist/modal.js"></script>
 <script src="../../dist/collapse.js"></script>
+<script src="../../dist/tooltip.js"></script>
+<script src="../../dist/popover.js"></script>
 
 <!-- <script src="../../transition.js"></script>
 <script src="../../tooltip.js"></script>
@@ -153,11 +156,11 @@
 <!-- JavaScript Test -->
 <script>
 $(function () {
-  // $('.js-popover').popover()
-  // $('.js-tooltip').tooltip()
-  // $('#tall-toggle').click(function () {
-  //   $('#tall').toggle()
-  // })
+  $('.js-popover').popover()
+  $('.js-tooltip').tooltip()
+  $('#tall-toggle').click(function () {
+    $('#tall').toggle()
+  })
 })
 </script>