kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

more tests, more js goodness

This commit is contained in:
Jacob Thornton 2011-09-10 12:49:21 -07:00
parent 79d5f90713
commit 48aa209348
9 changed files with 206 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/index.html
View File

@ -21,7 +21,7 @@
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="assets/js/bootstrap-dropdown.js"></script>
<script src="../js/bootstrap-dropdown.js"></script>
<script src="assets/js/application.js"></script>
<script src="assets/js/application-scrollspy.js"></script>

8
docs/javascript.html
View File

@ -89,12 +89,12 @@ $('#modal-content').modal({
<h4>modal:toggle</h4>
<p> Toggle the modal open state.</p>
<pre class="prettyprint linenums">$('#modal-content').trigger('modal:toggle')</pre>
<h4>modal:open</h4>
<h4>modal:show</h4>
<p>Opens the modal.</p>
<pre class="prettyprint linenums">$('#modal-content').trigger('modal:open')</pre>
<h4>modal:close</h4>
<pre class="prettyprint linenums">$('#modal-content').trigger('modal:show')</pre>
<h4>modal:hide</h4>
<p>Closes the modal.</p>
<pre class="prettyprint linenums">$('#modal-content').trigger('modal:close')</pre>
<pre class="prettyprint linenums">$('#modal-content').trigger('modal:hide')</pre>
<h3>Demo</h3>
<!-- sample modal content -->

30
js/bootstrap-modal.js vendored
View File

@ -40,10 +40,10 @@
}
this.$element = $(content)
.bind('modal:open', $.proxy(this.open, this))
.bind('modal:close', $.proxy(this.close, this))
.bind('modal:show', $.proxy(this.show, this))
.bind('modal:hide', $.proxy(this.hide, this))
.bind('modal:toggle', $.proxy(this.toggle, this))
.delegate('.close', 'click', $.proxy(this.close, this))
.delegate('.close', 'click', $.proxy(this.hide, this))
return this
}
@ -51,12 +51,12 @@
Modal.prototype = {
toggle: function () {
return this[!this.isOpen ? 'open' : 'close']()
return this[!this.isShown ? 'show' : 'hide']()
}
, open: function () {
, show: function () {
var that = this
this.isOpen = true
this.isShown = true
_.escape.call(this)
_.backdrop.call(this)
@ -73,12 +73,12 @@
return this
}
, close: function (e) {
, hide: function (e) {
e && e.preventDefault()
var that = this
this.isOpen = false
this.isShown = false
_.escape.call(this)
_.backdrop.call(this)
@ -108,11 +108,11 @@
backdrop: function () {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
if ( this.isOpen && this.settings.backdrop ) {
if ( this.isShown && this.settings.backdrop ) {
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.click(function () { that.close() })
.click($.proxy(this.hide, this))
.appendTo(document.body)
} else if ( !this.isOpen && this.$backdrop ) {
} else if ( !this.isShown && this.$backdrop ) {
this.$backdrop.removeClass('in')
function removeElement() {
@ -128,13 +128,13 @@
, escape: function () {
var that = this
if ( this.isOpen && this.settings.closeOnEscape ) {
if ( this.isShown && this.settings.closeOnEscape ) {
$('body').bind('keyup.modal.escape', function ( e ) {
if ( e.which == 27 ) {
that.close()
that.hide()
}
})
} else if ( !this.isOpen ) {
} else if ( !this.isShown ) {
$('body').unbind('keyup.modal.escape')
}
}
@ -156,7 +156,7 @@
$.fn.modal.defaults = {
backdrop: false
, closeOnEscape: false
, hideOnEscape: false
}
})( jQuery || ender )

1
js/bootstrap-popover.js vendored
View File

@ -60,6 +60,7 @@
$.fn.popover = function (options) {
if (typeof options == 'object') options = $.extend({}, $.fn.popover.defaults, options)
$.fn.twipsy.initWith.call(this, options, Popover)
return this
}
$.fn.popover.defaults = $.extend({}, $.fn.twipsy.defaults, { content: '', placement: 'right'})

4
js/bootstrap-twipsy.js vendored
View File

@ -188,6 +188,7 @@
$.fn.twipsy = function (options) {
$.fn.twipsy.initWith.call(this, options, Twipsy)
return this
}
$.fn.twipsy.initWith = function (options, Constructor) {
@ -263,6 +264,9 @@
this[binder](eventIn, enter)[binder](eventOut, leave)
}
this.bind('twipsy:show', enter)
this.bind('twipsy:hide', leave)
return this
}

52
js/tests/unit/bootstrap-modal.js vendored
View File

@ -3,30 +3,54 @@ $(function () {
module("bootstrap-modal")
test("should be defined on jquery object", function () {
ok($(document.body).modal, 'modal method is defined')
var div = $("<div id='modal-test'></div>")
ok(div.modal, 'modal method is defined')
})
test("should not return element", function () {
ok(!$(document.body).modal()[0], 'document.body not returned')
test("should return element", function () {
var div = $("<div id='modal-test'></div>")
ok(div.modal() == div, 'document.body returned')
})
test("should return instance of modal class", function () {
ok($(document.body).modal() instanceof $.fn.modal.Modal, 'document.body returned')
test("should expose defaults var for settings", function () {
ok($.fn.modal.defaults, 'default object exposed')
})
test("should expose defaults var for settings", {
ok(!!$.fn.modal.default, 'default object exposed')
})
test("should insert into dom when open is called", function () {
var div = $("<div></div>")
div.modal().open()
test("should insert into dom when modal:show event is called", function () {
$.support.transition = false
var div = $("<div id='modal-test'></div>")
div.modal().trigger("modal:show")
ok($('#modal-test').length, 'modal insterted into dom')
div.remove()
})
test("should remove from dom when close is called", function () {
$.support.transition = false
re
var div = $("<div id='modal-test'></div>")
div.modal().trigger("modal:show")
ok($('#modal-test').length, 'modal insterted into dom')
div.trigger("modal:hide")
ok(!$('#modal-test').length, 'modal removed from dom')
div.remove()
})
test("should remove from dom when click .close")
test("should toggle when toggle is called", function () {
$.support.transition = false
var div = $("<div id='modal-test'></div>")
div.modal().trigger("modal:toggle")
ok($('#modal-test').length, 'modal insterted into dom')
div.trigger("modal:toggle")
ok(!$('#modal-test').length, 'modal removed from dom')
div.remove()
})
test("should remove from dom when click .close", function () {
$.support.transition = false
var div = $("<div id='modal-test'><span class='close'></span></div>")
div.modal().trigger("modal:toggle")
ok($('#modal-test').length, 'modal insterted into dom')
div.find('.close').click()
ok(!$('#modal-test').length, 'modal removed from dom')
div.remove()
})
})

13
js/tests/unit/bootstrap-popover.js vendored
View File

@ -0,0 +1,13 @@
// $(function () {
//
// module("bootstrap-popover")
//
// test("should be defined on jquery object", function () {
// ok($(document.body).popover, 'popover method is defined')
// })
//
// test("should return element", function () {
// ok($(document.body).popover()[0] == document.body, 'document.body returned')
// })
//
// })

49
js/tests/unit/bootstrap-tabs.js vendored
View File

@ -0,0 +1,49 @@
$(function () {
module("bootstrap-tabs")
test("should be defined on jquery object", function () {
ok($(document.body).tabs, 'tabs method is defined')
})
test("should return element", function () {
ok($(document.body).tabs()[0] == document.body, 'document.body returned')
})
test("should activate element by tab id", function () {
var tabsHTML = '<ul class="tabs">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>'
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-runoff")
$(tabsHTML).tabs().find('a').last().click()
equals($("#qunit-runoff").find('.active').attr('id'), "profile")
$(tabsHTML).tabs().find('a').first().click()
equals($("#qunit-runoff").find('.active').attr('id'), "home")
$("#qunit-runoff").empty()
})
test("should activate element by pill id", function () {
var pillsHTML = '<ul class="pills">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>'
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-runoff")
$(pillsHTML).pills().find('a').last().click()
equals($("#qunit-runoff").find('.active').attr('id'), "profile")
$(pillsHTML).pills().find('a').first().click()
equals($("#qunit-runoff").find('.active').attr('id'), "home")
$("#qunit-runoff").empty()
})
})

81
js/tests/unit/bootstrap-twipsy.js vendored
View File

@ -0,0 +1,81 @@
$(function () {
module("bootstrap-twipsy")
test("should be defined on jquery object", function () {
var div = $("<div></div>")
ok(div.twipsy, 'popover method is defined')
})
test("should return element", function () {
var div = $("<div></div>")
ok(div.twipsy() == div, 'document.body returned')
})
test("should expose default settings", function () {
ok(!!$.fn.twipsy.defaults, 'defaults is defined')
})
test("should remove title attribute", function () {
var twipsy = $('<a href="#" rel="twipsy" title="Another twipsy"></a>').twipsy()
ok(!twipsy.attr('title'), 'title tag was removed')
})
test("should add data attribute for referencing original title", function () {
var twipsy = $('<a href="#" rel="twipsy" title="Another twipsy"></a>').twipsy()
equals(twipsy.attr('data-original-title'), 'Another twipsy', 'original title preserved in data attribute')
})
test("should place tooltips relative to placement option", function () {
$.support.transition = false
var twipsy = $('<a href="#" rel="twipsy" title="Another twipsy"></a>')
.appendTo('#qunit-runoff')
.twipsy({placement: 'below'})
.trigger('twipsy:show')
ok($(".twipsy").hasClass('fade below in'), 'has correct classes applied')
twipsy.trigger('twipsy:hide')
ok(!$(".twipsy").length, 'twipsy removed')
$('#qunit-runoff').empty()
})
test("should add a fallback in cases where elements have no title tag", function () {
$.support.transition = false
var twipsy = $('<a href="#" rel="twipsy"></a>')
.appendTo('#qunit-runoff')
.twipsy({fallback: '@fat'})
.trigger('twipsy:show')
equals($(".twipsy").text(), "@fat", 'has correct default text')
twipsy.trigger('twipsy:hide')
ok(!$(".twipsy").length, 'twipsy removed')
$('#qunit-runoff').empty()
})
test("should not allow html entities", function () {
$.support.transition = false
var twipsy = $('<a href="#" rel="twipsy" title="<b>@fat</b>"></a>')
.appendTo('#qunit-runoff')
.twipsy()
.trigger('twipsy:show')
ok(!$('.twipsy b').length, 'b tag was not inserted')
twipsy.trigger('twipsy:hide')
ok(!$(".twipsy").length, 'twipsy removed')
$('#qunit-runoff').empty()
})
test("should allow html entities if html option set to true", function () {
$.support.transition = false
var twipsy = $('<a href="#" rel="twipsy" title="<b>@fat</b>"></a>')
.appendTo('#qunit-runoff')
.twipsy({html: true})
.trigger('twipsy:show')
ok($('.twipsy b').length, 'b tag was inserted')
twipsy.trigger('twipsy:hide')
ok(!$(".twipsy").length, 'twipsy removed')
$('#qunit-runoff').empty()
})
})