From 64176caa972fdf925fe244cdbf1d53d82da592f4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 10 Sep 2011 22:14:57 -0700 Subject: add bootstrap-scrollspy --- js/bootstrap-modal.js | 3 ++ js/bootstrap-scrollspy.js | 88 ++++++++++++++++++++++++++++++++++++ js/tests/unit/bootstrap-modal.js | 68 ++++++++++++++++++++-------- js/tests/unit/bootstrap-scrollspy.js | 31 +++++++++++++ 4 files changed, 171 insertions(+), 19 deletions(-) create mode 100644 js/bootstrap-scrollspy.js create mode 100644 js/tests/unit/bootstrap-scrollspy.js (limited to 'js') diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index a7ab252eb..f1e795668 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -59,6 +59,7 @@ this.isShown = true _.escape.call(this) + _.backdrop.call(this, function () { that.$element .appendTo(document.body) @@ -133,6 +134,8 @@ $.support.transition && this.$element.hasClass('fade')? this.$backdrop.one(transitionEnd, removeElement) : removeElement() + } else { + callback() } } diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js new file mode 100644 index 000000000..c492e2fee --- /dev/null +++ b/js/bootstrap-scrollspy.js @@ -0,0 +1,88 @@ +/* ============================================================= + * bootstrap-scrollspy.js + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ============================================================= + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================== + */ + +!function ( $ ) { + + var $window = $(window) + + function ScrollSpy( topbar ) { + var processScroll = $.proxy(this.processScroll, this) + this.$topbar = $(topbar) + this.setup() + this.$topbar + .delegate('li > a', 'click', processScroll) + .bind('topbar:refresh', $.proxy(this.setup, this)) + $window.scroll(processScroll) + this.processScroll() + } + + ScrollSpy.prototype = { + + setup: function () { + this.targets = this.$topbar.find('li > a').map(function () { + var href = $(this).attr('href') + return /^#\w/.test(href) && $(href).length ? href : null + }) + + this.offsets = $.map(this.targets, function (id) { + return $(id).offset().top + }) + } + + , processScroll: function () { + var scrollTop = $window.scrollTop() + 10 + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activateButton( targets[i] ) + } + } + + , activateButton: function (target) { + this.activeTarget = target + + this.$topbar + .find('.active') + .removeClass('active') + + this.$topbar + .find('a[href=' + target + ']') + .parent('li') + .addClass('active') + } + + } + + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ + + $.fn.scrollSpy = function() { + return this.each(function () { + new ScrollSpy(this) + }) + } + +}( jQuery || ender ) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js index cfdf4064d..513d28780 100644 --- a/js/tests/unit/bootstrap-modal.js +++ b/js/tests/unit/bootstrap-modal.js @@ -17,40 +17,70 @@ $(function () { }) test("should insert into dom when modal:show event is called", function () { + stop() $.support.transition = false var div = $("") - div.modal().trigger("modal:show") - ok($('#modal-test').length, 'modal insterted into dom') - div.remove() + div + .modal() + .trigger("modal:show") + .bind("modal:shown", function () { + ok($('#modal-test').length, 'modal insterted into dom') + start() + div.remove() + }) }) - test("should remove from dom when close is called", function () { + test("should remove from dom when modal:hide is called", function () { + stop() $.support.transition = false var 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() + div + .modal() + .trigger("modal:show") + .bind("modal:shown", function () { + ok($('#modal-test').length, 'modal insterted into dom') + div.trigger("modal:hide") + }) + .bind("modal:hidden", function() { + ok(!$('#modal-test').length, 'modal removed from dom') + start() + div.remove() + }) }) test("should toggle when toggle is called", function () { + stop() $.support.transition = false var 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() + div + .modal() + .trigger("modal:toggle") + .bind("modal:shown", function () { + ok($('#modal-test').length, 'modal insterted into dom') + div.trigger("modal:toggle") + }) + .bind("modal:hidden", function() { + ok(!$('#modal-test').length, 'modal removed from dom') + start() + div.remove() + }) }) test("should remove from dom when click .close", function () { + stop() $.support.transition = false var 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() + div + .modal() + .trigger("modal:toggle") + .bind("modal:shown", function () { + ok($('#modal-test').length, 'modal insterted into dom') + div.find('.close').click() + }) + .bind("modal:hidden", function() { + ok(!$('#modal-test').length, 'modal removed from dom') + start() + div.remove() + }) }) }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-scrollspy.js b/js/tests/unit/bootstrap-scrollspy.js new file mode 100644 index 000000000..b9b309062 --- /dev/null +++ b/js/tests/unit/bootstrap-scrollspy.js @@ -0,0 +1,31 @@ +$(function () { + + module("bootstrap-scrollspy") + + test("should be defined on jquery object", function () { + ok($(document.body).scrollspy, 'scrollspy method is defined') + }) + + test("should return element", function () { + ok($(document.body).scrollspy()[0] == document.body, 'document.body returned') + }) + + test("should switch active class on scroll", function () { + var sectionHTML = '
' + , $section = $(sectionHTML).append('#qunit-runoff') + , topbarHTML ='
' + + '
' + + '
' + + '

Bootstrap

' + + '' + + '
' + + '
' + + '
' + , $topbar = $(topbarHTML).topbar() + + ok(topbar.find('.active', true) + }) + +}) \ No newline at end of file -- cgit v1.2.3 From 7e5b304dbfd8f5413db0bbe557b8e3d9a81b09c4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 10 Sep 2011 22:24:31 -0700 Subject: add liscense to js files --- js/bootstrap-alerts.js | 20 ++++++++++++++++++++ js/bootstrap-dropdown.js | 26 +++++++++++++++++++++++--- js/bootstrap-modal.js | 20 ++++++++++++++++++++ js/bootstrap-popover.js | 27 ++++++++++++++++++++++----- js/bootstrap-scrollspy.js | 4 ++-- js/bootstrap-tabs.js | 20 ++++++++++++++++++++ js/bootstrap-twipsy.js | 21 ++++++++++++++++++++- 7 files changed, 127 insertions(+), 11 deletions(-) (limited to 'js') diff --git a/js/bootstrap-alerts.js b/js/bootstrap-alerts.js index 4c9c9394d..dbce13466 100644 --- a/js/bootstrap-alerts.js +++ b/js/bootstrap-alerts.js @@ -1,3 +1,23 @@ +/* ========================================================== + * bootstrap-alerts.js + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + (function( $ ){ /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index fe73e7994..26db85461 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,7 +1,24 @@ -(function( $ ){ +/* ============================================================ + * bootstrap-dropdown.js + * http://twitter.github.com/bootstrap/javascript.html#dropdown + * ============================================================ + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ +(function( $ ){ var selector = 'a.menu, .dropdown-toggle' @@ -13,6 +30,9 @@ $('body').bind("click", clearMenus) }) + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + $.fn.dropdown = function ( options ) { return this.each(function () { $(this).delegate(selector, 'click', function (e) { diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index f1e795668..8b21c192d 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,3 +1,23 @@ +/* ========================================================= + * bootstrap-modal.js + * http://twitter.github.com/bootstrap/javascript.html#modal + * ========================================================= + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + + (function( $ ){ /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 5928fe8ca..4995fe5d8 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,10 +1,24 @@ - /* EXTENDS BOOTSTRAP-TWIPSY.js - =========================== */ +/* =========================================================== + * bootstrap-popover.js + * http://twitter.github.com/bootstrap/javascript.html#popover + * =========================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================================================== */ -(function( $ ) { - /* POPOVER PUBLIC CLASS DEFINITION - * ============================== */ +(function( $ ) { var Popover = function ( element, options ) { this.$element = $(element) @@ -12,6 +26,9 @@ this.enabled = true } + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TWIPSY.js + ========================================= */ + Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, { setContent: function () { diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index c492e2fee..2cf487c50 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -15,8 +15,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ============================================================== - */ + * ============================================================== */ + !function ( $ ) { diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index 029ccc65c..aaa73644d 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -1,3 +1,23 @@ +/* ======================================================== + * bootstrap-tabs.js + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================== */ + + (function( $ ){ function activate ( element, container ) { diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index ac2f56241..a227af4d2 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -1,4 +1,23 @@ -/* Adapted from the original jQuery.tipsy by Jason Frame */ +/* ========================================================== + * bootstrap-twipsy.js + * http://twitter.github.com/bootstrap/javascript.html#twipsy + * Adapted from the original jQuery.tipsy by Jason Frame + * ========================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + (function( $ ) { -- cgit v1.2.3 From 709789d16dccc9c812b62e8d22c61d7f4748e9e2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 10 Sep 2011 22:28:17 -0700 Subject: clicking open dropdown shoud close it --- js/bootstrap-dropdown.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 26db85461..8be8f13c0 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -36,8 +36,11 @@ $.fn.dropdown = function ( options ) { return this.each(function () { $(this).delegate(selector, 'click', function (e) { + var li = $(this).parent('li') + , isActive = li.hasClass('open') + clearMenus() - $(this).parent('li').toggleClass('open') + !isActive && li.toggleClass('open') return false }) }) -- cgit v1.2.3