diff options
| author | fat <[email protected]> | 2015-05-07 12:48:22 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2015-05-07 12:57:31 -0700 |
| commit | 0724bd91ff81b5eca0addce0c336c72b3ec10be5 (patch) | |
| tree | e379980598b1662ff14ff5543c825887148bc0c4 /js/tests | |
| parent | d1fbe200f46002431cdeebf965c4b789ef7ed267 (diff) | |
| download | bootstrap-0724bd91ff81b5eca0addce0c336c72b3ec10be5.tar.xz bootstrap-0724bd91ff81b5eca0addce0c336c72b3ec10be5.zip | |
es6 alert :|
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/index.html | 8 | ||||
| -rw-r--r-- | js/tests/unit/alert.js | 3 | ||||
| -rw-r--r-- | js/tests/visual/alert.html | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index fab2ebc16..536e34c74 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -129,9 +129,11 @@ })(); </script> - <!-- Plugin sources --> - <script>$.support.transition = false</script> - <script src="../../js/alert.js"></script> + <!-- es6 Plugin sources --> + <script src="../../js/dist/util.js"></script> + <script src="../../js/dist/alert.js"></script> + + <!-- Old Plugin sources --> <script src="../../js/button.js"></script> <script src="../../js/carousel.js"></script> <script src="../../js/collapse.js"></script> diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 6be990a51..97818960a 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -38,7 +38,8 @@ $(function () { + '<a class="close" href="#" data-dismiss="alert">×</a>' + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' + '</div>' - var $alert = $(alertHTML).bootstrapAlert() + + var $alert = $(alertHTML).bootstrapAlert().appendTo($('#qunit-fixture')) $alert.find('.close').trigger('click') diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html index 0070315a2..9e6a939e9 100644 --- a/js/tests/visual/alert.html +++ b/js/tests/visual/alert.html @@ -41,8 +41,8 @@ <!-- JavaScript Includes --> <script src="../vendor/jquery.min.js"></script> -<script src="../../transition.js"></script> -<script src="../../alert.js"></script> +<script src="../../dist/util.js"></script> +<script src="../../dist/alert.js"></script> </body> </html> |