Jacob Thornton
839ef3a030
2.0.2 -> 2.0.3
2012-04-24 02:19:02 -07:00
Jacob Thornton
c408d8961b
rewrite server.js, fix travis
2012-04-23 03:44:32 -07:00
Jacob Thornton
c896a182e1
increase length of waitfor timeout for phantom
2012-04-23 03:18:13 -07:00
Jacob Thornton
f84882122e
style changes to phantom integration
2012-04-19 17:40:58 -07:00
Jacob Thornton
03f78f7a60
run qunit tests in phantomjs for travis-ci
2012-04-19 17:34:07 -07:00
Jacob Thornton
bc07e2adae
allow for pushstate in scrollspy
2012-04-18 13:35:14 -07:00
Jacob Thornton
8f98c4fbf6
offset -> position #3088
2012-04-18 13:15:13 -07:00
Nirav Sanghani
8e8b1ad03d
Allow updater function (updates the value of the input field) to be overridden.
2012-04-16 17:05:35 -07:00
Jacob Thornton
0b8042656f
fixes #2941 + whitespace in collapse
2012-04-15 16:15:32 -07:00
Jacob Thornton
be0efcfcfc
whitespace
2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee
fix opera bug \o/ !!!! #1776
2012-04-14 23:24:19 -07:00
Jacob Thornton
b14455b03a
add tests for mouseout delay in tooltip
2012-04-14 23:10:03 -07:00
Jacob Thornton
c7dc4cc573
change position of var in dropdown + cleanup makefile vars
2012-04-14 22:43:36 -07:00
Jacob Thornton
d65f7f204a
don't open dropdown if target is disabled
2012-04-14 21:44:57 -07:00
Jacob Thornton
82267d48ff
calling pause on a slide should actually pause it - even when hovering
2012-04-14 17:49:51 -07:00
Jacob Thornton
81a296d06a
whitespace
2012-04-14 16:38:44 -07:00
Jacob Thornton
c291e4d786
fix typeahead test
2012-04-14 16:32:20 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Jacob Thornton
08fee005a8
https://github.com/twitter/bootstrap/issues/2954
2012-04-07 21:26:46 -07:00
Jacob Thornton
83febb3452
remake and add isHTML check to popover as well
2012-04-04 15:02:30 -07:00
Jacob Thornton
4bd611884a
detect if title in tooltip is text or html. if text - use text
method to prevent xss.
...
all add a few notes to js readme about updated event
2012-04-04 14:58:04 -07:00
Jacob Thornton
2dc979a202
MSTransitionEnd + move paren (thanks rick waldron)
2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7
move over paren just because.
2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b
simplify transition plugin a little
2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31
remove "technique"
2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea
replace UA sniffing
2012-03-29 12:35:06 -07:00
Jacob Thornton
3e7920820a
add missing closing brace
2012-03-24 20:01:51 -07:00
Jacob Thornton
0dfff052cb
add MSTransitionEnd event to js plugin
2012-03-24 19:02:55 -07:00
Jacob Thornton
f02d017ffa
return matcher value directly + cleanup first lines of files
2012-03-24 18:59:04 -07:00
Jacob Thornton
bccc2cb719
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
2012-03-24 18:20:09 -07:00
Jacob Thornton
ef5ac02b69
allow prevent default for show and hide event in modal
2012-03-24 17:50:21 -07:00
Jacob Thornton
b3bf223617
filter out non matches in map
2012-03-21 23:59:27 -07:00
Jacob Thornton
20e085723b
cache $(href) lookup
2012-03-21 23:51:32 -07:00
Jacob Thornton
706ee46b73
sort scrollspy to prevent flicker for unordered nav
2012-03-21 23:45:58 -07:00
Jacob Thornton
94b24aaa47
clear timeout to reset delays for tooltip/popover
2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914
top stripping leading and trailing whitespace + always use .html method
2012-03-21 21:35:02 -07:00
Jacob Thornton
cb8dcfcebf
if transitioning collapse, don't start new transition
2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f
prevent dropdowns from closing when clicking inside form element inside dropdown
2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478
fix slide logic for ie+ in carousel
2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09
if parent in collapse, only grab children
2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d
fix collapse bug in ie7+ for initial collapse in
2012-03-19 20:51:20 -07:00
Jacob Thornton
384a082e8d
active - onActivate
2012-03-19 20:24:46 -07:00
Jacob Thornton
05e0d5f3d9
fire active event on active
2012-03-19 16:09:08 -07:00
Jacob Thornton
67f199678c
if interval is false, do not autocycle the carousel
2012-03-19 15:48:57 -07:00
Jacob Thornton
83a7a69893
typeahead should escape regexp special chars
2012-03-19 15:33:28 -07:00
Jacob Thornton
bf59220b87
;)
2012-03-19 15:19:01 -07:00
Jacob Thornton
5a2c7eb50a
select last item in scrollspy if you've reached the bottom of the document or element
2012-03-19 15:18:00 -07:00
Jacob Thornton
527fb87dad
add /head
2012-03-17 21:29:56 -07:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07:00
Jacob Thornton
56fe54df43
remove collapse class on open so that dropdowns are viewable
2012-03-12 13:37:44 -07:00
Mark Otto
95cb6f07a8
Merge branch 'zerkms-master' into 2.0.2-wip
...
Conflicts:
Makefile
2012-03-11 17:38:23 -07:00
Ivan Kurnosov
354252b4b5
Grammar fix in js/README.md
2012-03-12 10:24:18 +13:00
Jacob Thornton
26e683f1d0
Merge pull request #2177 from phopkins/typeahead_friendly
...
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton
43760eb202
fix for @pamelafox and #1861
2012-02-24 22:17:36 -08:00
Jacob Thornton
fb74018ae2
and pause on hover option to carousel
2012-02-24 21:51:39 -08:00
Pete Hopkins
3a6f58598c
Allows escape to bubble when menu isn't shown
2012-02-22 14:19:55 -05:00
Pete Hopkins
70fecd1115
Fires change event when element is selected from menu
2012-02-22 14:19:55 -05:00
Pete Hopkins
80d03e143c
Allow events to propagate / default if not used.
...
- All key events when the menu is not shown now propagate.
- Blur is also allowed to propagate.
2012-02-22 14:19:55 -05:00
Jacob Thornton
f046c12bd2
fix cycling in carousel
2012-02-20 22:01:38 -08:00
Jacob Thornton
3d58b46226
fix bootstrap-button toggle regression + tests
2012-02-18 23:29:58 -08:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Jacob Thornton
9d12b2d601
don't try next if not next
2012-02-16 20:43:57 -08:00
Jacob Thornton
e730f8adb5
null out interval so that pause doesn't resume on next or prev
2012-02-16 20:22:01 -08:00
Jacob Thornton
792059b7ad
fix alerts
2012-02-16 20:04:26 -08:00
Jacob Thornton
6e77c9d123
add semicolons to the end of js files
2012-02-13 18:41:02 -08:00
Jacob Thornton
5b4a29d84e
honor data attributes set on modal as well
2012-02-12 11:15:12 -08:00
Jacob Thornton
139a077543
don't use e.target incase button has icon or other content inside it
2012-02-07 21:55:27 -08:00
Mark Otto
a10c23f1aa
Merge branch 'CaryLandholt-master' into 2.0.1-wip
2012-02-06 23:42:02 -08:00
Mark Otto
6325402372
Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master
2012-02-06 23:41:53 -08:00
raphaelz
3722bb9a88
Grammatical changes have been made as suggested by @cvrebert for issue #1787 .
2012-02-07 02:11:25 -05:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08:00
Cary Landholt
c3c13a2474
Fixed typo "tabs" ==> "button"
2012-02-01 22:20:24 -06:00
Mark Otto
f34ddb5c3f
nuke all curly ticks
2012-02-01 18:27:38 -08:00
Mark Otto
160a0bf560
update tests for popover to use proper classes
2012-01-30 01:30:18 -08:00
Mark Otto
f4e5bc1c53
namespace popover values
2012-01-30 01:20:51 -08:00
Mark Reeder
f9b53d424e
Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size
...
https://github.com/twitter/bootstrap/issues/1208
2012-01-29 21:14:07 -08:00
Mark Otto
0952f3796e
fix js readme api capitalization
2012-01-29 13:07:31 -08:00
Jacob Thornton
6935f693b3
typahead does case insensitive matching with simple sorter + accepts highlighter option
2012-01-28 13:16:05 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Jacob Thornton
c2c02d104c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 11:04:05 -08:00
Jacob Thornton
d465952138
clean up js api for dropdowns
2012-01-28 11:03:39 -08:00
Jon Stevens
8ade6989c3
no debugger
2012-01-28 02:25:13 -08:00
Jacob Thornton
e61164e67a
all unit tests passing in ie7
2012-01-28 01:35:13 -08:00
Jacob Thornton
3451dcbc28
fix failing typeahead tests
2012-01-28 00:03:26 -08:00
Jacob Thornton
7cbb586825
move the matcher and sorter into the options - encourage people to override them...
2012-01-27 22:27:06 -08:00
Jacob Thornton
0255f47eb3
add zindex option for tooltips/popovers and fix modal zindex doc example
2012-01-27 21:36:58 -08:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Jacob Thornton
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
11d7ef1515
Merge pull request #1272 from napoleond/2.0-wip
...
Support tab and enter in typeahead
2012-01-26 23:04:42 -08:00
Mark Otto
5a48b22b83
Merge pull request #1269 from phopkins/ie_typeahead
...
[2.0-wip] Fix typehead plugin for IE7/8
2012-01-26 17:04:35 -08:00
David N
b9589fcb80
Enable default browser key behaviour when typeahead isn't showing.
2012-01-26 17:23:09 -06:00
Mark Otto
5844aa550d
consistent new lines at ends of files
2012-01-26 15:00:59 -08:00
Pete Hopkins
1f04481092
Switches from Array#filter to jQuery.grep for IE<=8 support
2012-01-26 17:07:06 -05:00
Jacob Thornton
319b65e64b
prevent default
2012-01-25 11:49:00 -08:00
Jacob Thornton
5e5e87fbd0
scrollspy working for sub navs
2012-01-24 22:33:33 -08:00
Jon Stevens
84a8aa1bea
2.0-wip: fix js heads
2012-01-24 11:08:03 -08:00
Eden
ec68b84123
i don't think the batch s/2011/2012/ was supposed to hit this. :)
2012-01-24 08:27:19 -08:00
Nicklas Ansman Giertz
4882e6da2f
Rename the tooltip test file
...
It had not been renamed when twipsys became tooltips.
2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz
05fdd43e41
Add testcase to popover
...
This test case verifies that custom classes are respected.
2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz
6a9f169fd6
Make the popove respect custom classes
2012-01-22 12:06:59 +01:00
Jacob Thornton
373a54187e
add ability to cycle carousel to a particular frame
2012-01-21 23:02:29 -08:00
Jacob Thornton
6e490628d1
more efficient matcher + bold matched query in item
2012-01-21 22:06:36 -08:00
Jacob Thornton
4fe11342d0
make case lookahead case insensitive
2012-01-21 21:46:47 -08:00
Jacob Thornton
2187e0838f
change scrollspy offset to be option + fix typo in scrollspy
2012-01-21 21:35:20 -08:00
Jacob Thornton
3ed836b198
should check for alert class not alertmessage
2012-01-20 13:50:36 -08:00
Jacob Thornton
93c8152216
only prevent default if getting data-href
2012-01-20 13:42:10 -08:00
Jacob Thornton
593b062c7a
wrap transition
2012-01-17 10:32:25 -08:00
Mark Otto
16eccc43d9
dates updated to 2012
2012-01-14 23:28:48 -08:00
Renault John Lecoultre
2cea94e892
Fixed when placement is a function
2012-01-13 22:33:05 +01:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Jacob Thornton
7aca72322e
move hover state out of timeout duh
2012-01-08 15:12:34 -08:00
Jacob Thornton
91d393fd47
change prepend to append
2012-01-08 15:01:23 -08:00
Jacob Thornton
aa0c4acd80
fix modal insertion boolean
2012-01-08 14:38:21 -08:00
Jacob Thornton
76cadd1d2a
only append modal to dom if not already present
2012-01-08 14:36:41 -08:00
Jacob Thornton
5a33c1b96e
make dropdowns toggle when clicked (for mobile)
2012-01-08 14:19:53 -08:00
Jacob Thornton
f83240a8f9
add slide and slid events + disable sliding during slide
2012-01-08 13:39:27 -08:00
Jacob Thornton
fbd686ad65
get tabs working in ie9
2012-01-08 12:08:00 -08:00
Jacob Thornton
f1cbd22b99
fix buttons for firefox
2012-01-08 11:23:51 -08:00
Jacob Thornton
4478df7681
first pass at ultra basic autocomplete
2012-01-08 00:49:38 -08:00
Jacob Thornton
dd99e2d048
start of autocomplete plugin
2012-01-06 18:30:32 -08:00
Jacob Thornton
64c8623533
Merge pull request #907 from ansman/2.0-wip
...
Twipsy now respects custom classes
2012-01-06 11:07:59 -08:00
Nicklas Ansman Giertz
969fbe7150
Add a test case for issue #908 (twipsy doesn't respect custom classes)
...
The test case verifies that a custom class is respected.
2012-01-06 11:33:18 +01:00
Nicklas Ansman Giertz
f07bcafd39
Make twipsy respect custom classes when using a custom template
...
If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.
2012-01-06 11:16:29 +01:00
Jacob Thornton
314feb702f
listen to window for dropdown clear
2012-01-05 18:32:08 -08:00
Jacob Thornton
5661855be3
actuall use interval option :P
2012-01-02 22:57:04 -08:00
Jacob Thornton
e89618a47f
clean up options implementation for carousel
2012-01-02 22:55:51 -08:00
Jacob Thornton
3fb6f6ee86
basic carousel implementation
2012-01-02 22:30:57 -08:00
Jacob Thornton
2d092dfeea
start playing with carousel stuff
2012-01-02 16:04:01 -08:00
Jacob Thornton
12868933b9
clean up dead elements in firefox (which is droping transitionEnd events :(
2011-12-24 23:06:16 -08:00
Jacob Thornton
4ef5a90445
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2011-12-24 22:56:40 -08:00
Jacob Thornton
823d89dbb2
move position of twipsy into getPosition so it can easily be extended for svg use
2011-12-24 22:56:01 -08:00
Jacob Thornton
a3822cfa84
Merge pull request #842 from jonathaningram/patch-2
...
Add close and closed hooks for alert
2011-12-24 22:16:48 -08:00
Jacob Thornton
ea23461970
fix unit test for twipsy
2011-12-22 19:28:58 -08:00
Jacob Thornton
87ac818253
change above below to top bottom and add "inside" placement option
2011-12-22 19:10:32 -08:00
Jonathan Ingram
5de1e39a8f
From #822
2011-12-22 16:41:26 +11:00
Jacob Thornton
6d5b506517
minor cleanups
2011-12-21 17:38:05 -08:00
Jacob Thornton
80cb760fac
animate -> animation
2011-12-21 13:29:12 -08:00
Jacob Thornton
f72a94ae28
update more readme changes - introduce target specificty convention to more plugins
2011-12-20 23:28:48 -08:00
Jacob Thornton
0980a33b47
update all to new on api + add animation support to tabs
2011-12-20 19:37:41 -08:00
Jacob Thornton
1ef5fa7d6b
giant refactor - all spec passing again...
2011-12-20 18:02:47 -08:00
Jacob Thornton
7df0d1c7d1
rename transitions to transition and fix scrollspy example
2011-12-14 18:45:33 -08:00
Mark Otto
aa69286c30
rename transitions js file, fix link in js docs
2011-12-13 10:05:19 -08:00
Jacob Thornton
cee2f61898
define constructor on prototypes
2011-11-30 22:42:22 -08:00
Jacob Thornton
b1cba98aab
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton
dc628c9115
start of carousel
2011-11-30 22:05:09 -08:00
Silumesii Maboshe
1af3596a5e
Capitalising 'Bootstrap' and abbreviations. Fixing typos.
2011-11-28 08:13:54 +02:00
Jacob Thornton
7eb340ec58
add code to reset data for collapsed element so that item can be intitialized with correct options
2011-11-27 17:31:12 -08:00
Jacob Thornton
7522517b47
derp
2011-11-27 17:12:58 -08:00
Jacob Thornton
f77d0c21df
turn attribute rules to list
2011-11-27 17:12:17 -08:00
Jacob Thornton
76f95f4ea2
change even was removed, in favor of show shown
2011-11-27 17:11:31 -08:00
Jacob Thornton
7f74f11262
fix heading for js readme...
2011-11-27 17:09:31 -08:00
Jacob Thornton
46fe38386a
rename tabs to tab - clean up lots of api stuff make href acceptable target val
2011-11-27 17:04:55 -08:00
Jacob Thornton
3925ea9986
remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly
2011-11-27 16:01:26 -08:00
Jacob Thornton
3157de8d1d
clean up comments for better built files
2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b
allow scrollspy to target a specific nav
2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355
new plugin "collapse" for collapsible lists and "accordion" like support
2011-11-25 17:23:14 -08:00
Jacob Thornton
96adf8f918
fix copy paste bug
2011-11-24 20:27:55 -08:00
Jacob Thornton
53ff2682cd
clean up scrollspy a bit - add public api method
2011-11-24 20:27:18 -08:00
Jacob Thornton
b14f551c9c
fix some more modal things
2011-11-24 20:12:13 -08:00
Jacob Thornton
1fa02fbda2
refactor modal
2011-11-24 20:04:07 -08:00
Jacob Thornton
69372701cf
refactor dropdown in accordance with readme
2011-11-24 19:40:25 -08:00
Jacob Thornton
71654cbf69
refactor alerts + add new readme which idefientifies goals for 2.0 js
2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6
update buttons js for button groups
2011-11-24 14:43:26 -08:00
Jacob Thornton
36a7eb3851
add build script for minified files and allow elements to be returned to getContent and title in popovers
2011-11-20 21:36:26 -08:00
Jacob Thornton
47c7f655ac
update comment numbers
2011-11-20 21:13:28 -08:00
Jacob Thornton
8a891f2a7b
act on all twipsy instances
2011-11-20 21:06:32 -08:00
Jacob Thornton
bc65b58551
merge in js from 1.4... start working through js docs
2011-11-20 20:58:04 -08:00
Jacob Thornton
0b1d5d9189
revert all js stuff back to 1.4 :/
2011-11-20 18:19:50 -08:00
Jacob Thornton
523e02f7df
fix scrollspy simplify stuff more - break everything.
2011-10-19 23:12:50 -07:00
Jacob Thornton
8545fe9787
greatly simply js plugins - remove js api where reasonable
2011-10-19 21:56:06 -07:00
Jacob Thornton
c9669be1ec
get modal working with new data-attrs
2011-10-05 00:14:55 -07:00
Jacob Thornton
a91a407bd6
start updating to data- driven js
2011-10-04 21:48:53 -07:00
Mark Otto
2d81d65533
initial idea for handling closing of modals from whatever element you want with .js-dismiss class
2011-09-28 20:21:09 -07:00
Mark Otto
ec8619a980
update docs to remove old stuff, update to all new classes; no more backwards compatibility
2011-09-17 17:21:43 -07:00
Jacob Thornton
f0d5caf054
check for jquery/ender on window
2011-09-16 11:09:26 -07:00
Jacob Thornton
d1b594db7a
$(document).ready instead of $(function() {}) for ender support
2011-09-15 23:16:06 -07:00
Jacob Thornton
ad87e11f03
add version number to js comments
2011-09-12 11:15:32 -07:00
Jacob Thornton
dcf9aabc44
get all spec passing again
2011-09-11 22:58:51 -07:00
Jacob Thornton
200f5817ba
method invocation jqueryui style
2011-09-11 21:03:17 -07:00
Jacob Thornton
173be3f1e8
change hella js... broke all the tests. i <3 wip
2011-09-11 20:08:43 -07:00
Jacob Thornton
709789d16d
clicking open dropdown shoud close it
2011-09-10 22:28:17 -07:00
Jacob Thornton
7e5b304dbf
add liscense to js files
2011-09-10 22:24:31 -07:00
Jacob Thornton
64176caa97
add bootstrap-scrollspy
2011-09-10 22:14:57 -07:00
Jacob Thornton
a71d5d8e99
add the dhg flavor back
2011-09-10 19:01:16 -07:00
Jacob Thornton
235246d6fc
not feeling the slide in
2011-09-10 18:26:37 -07:00
Jacob Thornton
9c76070cbd
rework the transitions for the modal a bit
2011-09-10 18:13:37 -07:00
Jacob Thornton
5f65df9e2d
add some more events to alerts and modal and update docs
2011-09-10 14:04:22 -07:00
Jacob Thornton
1041977d0a
finish up rounding out tests for all js plugins
2011-09-10 13:17:08 -07:00
Jacob Thornton
48aa209348
more tests, more js goodness
2011-09-10 12:49:21 -07:00
Jacob Thornton
5f4e30ed1d
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
2011-09-09 22:47:49 -07:00
Jacob Thornton
96c3e70996
cleanup old stuff
2011-05-03 18:12:43 -07:00
Mark Otto
677b5554f3
Remove the unnecessary global.js file, remove the old baseline grid image, add in hashgrid, update readme to remove finished todos;
2011-04-27 14:49:56 -07:00
Mark Otto
eb81782cdb
Porting over all Blueprint styles to new Baseline repo
2011-04-27 13:53:51 -07:00