Commit Graph

1770 Commits

Author SHA1 Message Date
Scott González
b41873ba0d Autocomplete: Re-enable native autocomplete whent he page is unloaded. Fixes #7790 - Autocomplete-enabled text input does not keep value when using back button in browser. 2011-10-18 08:10:57 -04:00
Richard D. Worth
5c6cfe2645 Sortable: replaced hard-coded sortable with this.widgetName, and removed lines from destroy that are handled by super. Fixes #7741 - ui.sortable is not working when it is extended
(cherry picked from commit 228b1b191b)
2011-09-27 07:59:20 -04:00
kborchers
872387abd5 Datepicker: Added additional check to checkExternalClick to work when clicking in another datepicker and removed old fix. Fixes #7686 - infinite loop when onclose event shows a second calendar
(cherry picked from commit af76ad1c82)
2011-09-16 10:47:46 -04:00
Richard D. Worth
af7d433818 Datepicker i18n hu: Corrected four-digit year in dateFormat. Fixes #7714 - Hungarian translation
(cherry picked from commit cedac75bcc)
2011-09-13 05:11:24 -04:00
Richard D. Worth
eddf076b8c Datepicker i17n hu: Corrected some spellings and abbreviations as well as dateFormat. Fixes #7714 - Hungarian translation 2011-09-13 05:11:02 -04:00
Scott González
000b1736ac Button: Fixed RTL detection to default to LTR. Fixes #7697 - Buttonset: Incorrect corners for disconnected elements.
(cherry picked from commit 08450c3b2d)
2011-09-06 11:01:23 -04:00
Corey Frang
5d4d40f7be Dialog: Update to 96e5c24 - keyup apparently doesn't work like I thought it would everywhere, switching back to keydown.
(cherry picked from commit dfe75e1b55)
2011-08-20 18:06:16 -05:00
Corey Frang
8f16cc304a Dialog: Tabbing out of a modal dialog was possible because keypress doesn't fire for tabs everywhere, switched to keyup. Added Unit Test - Caught by @DomenicDenicola - Fixes #3123 - Tabbing stops in modal dialog
(cherry picked from commit 96e5c241e1)
2011-08-19 06:07:47 -05:00
Scott González
7b3e6a85c1 Droppable: Don't use .parentsUntil(). Fixes #7530 - Droppable fails on a.element.parentsuntil in version 1.8.14. 2011-08-12 10:06:52 -04:00
Scott González
930c65011c Draggable: Only run iframeFix logic if the option is truthy. Fixes #7632 - Draggable: iframeFix always runs with old versions of jQuery. 2011-08-12 10:05:04 -04:00
Scott González
7c15d3c19f Datepicker: Revert "Datepicker: Removing unnessecary typeof check. Fixed #6669 - Datepicker: _selectDate restores focus to non-object" Fixes #7623 - DatePicker reappears after selection in ie8.
This reverts commit 86a09aeb33.
2011-08-10 07:58:17 -04:00
Scott González
c7c5b6b15c Widget: Wrap the remove event trigerring in a try/catch. Fixes #7510 - jQuery.data throws a script error in certain circumstances. 2011-08-09 11:51:08 -04:00
Karl Kirch
1b5af10bb1 Datepicker: Added ability to stop datepicker from beforeShow. Fixes #7602 - Ability to stop datepicker from appearing with beforeShow event handler.
(cherry picked from commit d146297356)
2011-08-09 09:58:13 -04:00
Scott González
c5799b5141 Mouse: Work around a bug in IE 8 where disabled inputs don't have a nodeName. Fixes #7620 - Mouse: Error in IE 8 with disabled inputs.
(cherry picked from commit 7f812f8be9)
2011-08-09 09:32:49 -04:00
Scott González
3e98e73772 Revert "Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called"
This reverts commit b8e14e79e5.
2011-08-09 08:27:04 -04:00
Corey Frang
07d5271f7e Button: Adding quotes to the attribute selector for labels - Fixes #7534 - Button label selector omits quotes / fails for ids with ":"
(cherry picked from commit 065aef537b)

Conflicts:

	ui/jquery.ui.button.js
2011-08-03 22:19:29 -05:00
kborchers
14ab4f4f37 Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE
(cherry picked from commit dafc941b36)
2011-08-02 19:25:34 -04:00
Corey Frang
82df6924cb Effects: Backporting 8108ec8 - Fixes #7595 - Wrapper-creating jquery-ui animations will discard any focus state during the animation - Thanks @rubyruy 2011-08-02 16:58:52 -05:00
Andreas Pelme
abf97f7301 Backport of f9996682b5 for 1-8-stable.
Original commit message from f9996682b5:
Dialog: Before handling escape key presses, check if the default action has been prevented. Fixes #6966 - Pressing ESC on dialog when 2 dialogs are open closes both dialogs.
2011-08-02 18:40:25 +02:00
Scott González
1d4795683e Datepicker: Removed click handling for month and year dropdowns. Fixes #6198 - Datepicker Month and Year dropdowns in IE have to click twice.
Thanks jdufresne
(cherry picked from commit 70687f7955)
2011-08-01 15:29:54 -04:00
Scott González
bd48ddfa94 Revert "Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE"
This reverts commit 7eda94a8c9.
2011-08-01 14:17:38 -04:00
Scott González
b796cc57bd jQuery 1.6 support. 2011-07-29 14:57:06 -04:00
Scott González
8d43fe7e34 Slider: Fixed var statement. Fixes #7564 - alignValue Global Scope. 2011-07-19 11:42:01 -04:00
Richard D. Worth
c1929fc290 Datepicker i18n: Corrected Dutch abbreviation of month name March. Fixed #7566 - Dutch march name translation
(cherry picked from commit 5002bf6185)
2011-07-19 11:08:07 -04:00
Richard D. Worth
c81bfb9815 Datepicker: show inline datepicker setting explicit display:block instead of using .show() in case it is disconnected. Fixed #7552 - A Datepicker created on a detached div has zero height
(cherry picked from commit b8af0d1f75)
2011-07-19 08:12:41 -04:00
Corey Frang
ab3b78e9eb Merge pull request #322 from kborchers/bug_5665
Datepicker: Added checks for the disabled option. Fixed #5665 - Datepicker: Disabled parameter doesn't work(cherry picked from commit 4bdbab9a67)
2011-07-19 08:10:05 -04:00
marcneuwirth
b8e14e79e5 Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called
(cherry picked from commit effdd5d19c)
2011-06-28 11:00:06 -05:00
marcneuwirth
bb9f9fac81 Datepicker: Added onSelect.apply() call to _doKeyDown method when enter button pushed if onSelect is defined. Fixed #7124 - Datepicker: onSelect does not fire when enter button is pushed
(cherry picked from commit a56aa861b1)
2011-06-28 10:50:58 -05:00
marcneuwirth
86a09aeb33 Datepicker: Removing unnessecary typeof check. Fixed #6669 - Datepicker: _selectDate restores focus to non-object 2011-06-27 17:07:43 -05:00
kborchers
4878ed8c1a Datepicker: Reset this.maxRows (rows in a month) on each row in a multi-row datepicker.
(cherry picked from commit ed7802090f)
2011-06-16 13:35:56 -04:00
kborchers
57b9e9d399 Datepicker: Calculate the max number of rows necessary when displaying months. Fixes #7043 - Datepicker: Using multiple months always renders 6 rows of dates even if only 5 are needed
(cherry picked from commit 1d984e76b7)
2011-06-16 13:35:48 -04:00
Scott González
4d8529cf84 Datepicker: Don't use .delegate(). Fixes #7470 - Datepicker: 1.8.x can't be used with jQuery 1.3.2 due to use of .delegate(). 2011-06-13 08:46:57 -04:00
Scott González
d3ffacb756 Effects: Fixed typo. Fixes #7435 - animateClass ignores easing due to typo 'easding'. 2011-05-28 11:48:11 -04:00
kborchers
ce2fbb9429 Droppable: Added dragStart and dragStop to ddmanager and call them from draggable to recalculate droppable positions after a drag causes a scroll. Fixes #5003 - Scroll on Droppable Demo Breaks Demo
(cherry picked from commit 67bd872fe1)
2011-05-27 15:36:37 -04:00
Jay Merrifield
b04c6ece34 Mouse: Optimize the cancel locator, works around a bug where .add(event.target) in IE8 can take a long time when there are multiple siblings. Fixes #7118 - IE Bug Large ComboBox (Dialog)
(cherry picked from commit 09e88d6220)
2011-05-26 23:44:05 -04:00
Jeff Remy
b196d1fb61 Resizable: correct aspectRatio handling with min/max dimensions. Fixed #4951 - Resizable with aspectRatio true & a maxWidth doesn't obey ratio once hit max width.
(cherry picked from commit 981e96948f)
2011-05-26 19:11:04 -04:00
Andrew Powell
3735bab147 Button: adding event.preventDefault. Fixes #5945 - Disabled buttons still allow clicks
(cherry picked from commit 597a313ab6)
2011-05-26 12:29:04 -04:00
Glenn Goodrich
ad947c7ba9 Button: modified the event bindings for focus and blur. Fixed #6711 - checkbox/radio button do not show focused state when using Keyboard Navigation
(cherry picked from commit c49dbe0f01)
2011-05-26 11:29:39 -04:00
kborchers
ed65ce7a14 Sortable: Changed to check the parent's length so that the dom position of the removed element is not updated. Fixed #4088 - Unable to remove() ui.draggable (sortable item) immediately after the drop callback.
(cherry picked from commit 8e8a7b015f)
2011-05-25 16:13:00 -04:00
Jörn Zaefferer
e05559eb16 There's no guard against unparsed characters at the end of the date string, any extra characters are just ignored
Fixes #7244 - Datepicker: parseDate() does not throw an exception for long years
(cherry picked from commit 92b0f6702a)
2011-05-18 17:35:57 +02:00
Jörn Zaefferer
fab17293e4 Dialog: Changed IE6 overlay width adjustment to apply to all IE versions. Fixed #3623 - Opening a Modal Dialog shows a horizontal scroll bar
(cherry picked from commit 29b36bb409)
2011-05-18 17:12:01 +02:00
Scott González
c45dd91f1b Button: Refactored formResetHandler and fixed scope. Foxes #7261 - Refresh scope in formResetHandler unintentionally wide.
(cherry picked from commit e0fafbb735)
2011-05-18 10:33:37 -04:00
Kato Kazuyoshi
3124864541 Datepicker: onClose callback should be triggered by show. Fixed #6656 - onClose event not triggered.
(cherry picked from commit 2063a113d6)
2011-05-18 16:03:13 +02:00
Jay Merrifield
c1470492bd Datepicker: Made the day of year calculator be more accurate. Fixes #6827 - Datepicker: Incorrect value for "oo" during Daylight Saving Time.
(cherry picked from commit 41205cef4b)
2011-05-16 07:54:38 -04:00
kborchers
1866905695 Draggable: Changed logic to only subtract left and top offsets of containment if left and top are not already 0. Fixed #4838 - containment: 'document' is incorrect for top and left in draggable
(cherry picked from commit 6e6d0b749c)
2011-05-13 15:35:53 -04:00
Kris Borchers
427f3d4345 Button: Don't fire click/change events if mouse was dragged during click of toggle (checkbox/radio) button. Fixed #6970 - Button state inconsistencies after (accidental) drag-clicking the button.
(cherry picked from commit a69a1788bc)
2011-05-13 15:29:03 -04:00
kborchers
16b4ffb791 Draggable: Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE. Fixed #6950 - ie 8 invalid drag and drop error
(cherry picked from commit d136e4333e)
2011-05-13 15:18:25 -04:00
Doug Neiner
3842fa9f94 Button: no longer calls _resetButton() after changing the disabled option. Fixed #6242 - Button .enable() strange behavior on Webkit (Google Chrome, Safari)
(cherry picked from commit 8df834f68c)
2011-05-12 20:48:55 -04:00
Doug Neiner
15cb56726f Button: Added rtl detection so corner classes would properly be applied to buttonsets. Fixed #6796. jQueryui - buttonset on rtl
(cherry picked from commit 50a4186ef9)
2011-05-12 20:44:42 -04:00
Andrew Powell
10fa7f9ae9 Datepicker: removed conditional mozilla browser check block. Fixes #7322 - Year selector disappears after setting an option in Firefox
(cherry picked from commit a6227be2c0)
2011-05-12 11:29:13 -04:00
Scott González
804ba0a2df Revert "Datepicker: Fixed #7043 - Using multiple months always renders 6 rows of dates even if only 5 are needed."
This reverts commit 5e1032ec74.
2011-05-12 08:18:06 -04:00
Kato Kazuyoshi
2b84107b31 Datepicker: Disabled datepicker should disable own select element too. Fixed #6850 - Disable datepicker should disable month and year dropdowns.
(cherry picked from commit 4585182c70)
2011-05-11 15:33:16 -04:00
Garrison Locke
3edda96f2a Datepicker: Removed duplicate call to _updateDatepicker when changing option in Firefox. Fixed #7322 - datepicker: Year would disappear when changing option.
(cherry picked from commit a645630eba)
2011-05-11 14:22:59 -04:00
Adam Baratz
03ce9fb8cd Slider: add handles in single DOM operation. Fixed #7259 - optimize handle creation.
(cherry picked from commit 7fb6ca146e)
2011-05-11 13:13:40 -04:00
Kato Kazuyoshi
201b5ed48c Draggable: Remove id when cloning helpers. Fixes #4564 - Draggable+Sortable Demo duplicates DOM Ids.
(cherry picked from commit 98fcb477d6)
2011-05-11 13:07:50 -04:00
Kato Kazuyoshi
5e1032ec74 Datepicker: Fixed #7043 - Using multiple months always renders 6 rows of dates even if only 5 are needed.
(cherry picked from commit ac459ff7df)
2011-05-11 11:10:37 -04:00
Scott González
36110e07d4 Autocomplete: Use appropriate methods for getting scroll values for .prop()/.attr() compat. Fixes #7354 - Autocomplete: Scrollable results don't visually update with jQuery 1.6. 2011-05-11 08:40:16 -04:00
Carson McDonald
38af07ec4e Resizable: Skip autohide hover action when resizable is disabled. Fix #6948 - Resizable autoHide Doesn't Work With Resizable's disable
(cherry picked from commit 0e2bc5efe2)
2011-05-10 10:53:26 -04:00
kborchers
7eda94a8c9 Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE
(cherry picked from commit 9c50bdfde0)
2011-05-09 13:12:20 -04:00
Scott González
73602652ac Datepicker: Moved the setting of _datepickerShowing to after postProcess to prevent being able to tab away leaving the datepicker open. Fixed #6775 - DatePicker remains open when tabbing out 2011-05-06 13:31:43 -04:00
Eike Send
4c218eeb0a Button: stop disabled button from firing click events. fixes #5945. Behavior was inconsisten between BUTTON and A elements.
(cherry picked from commit a7f1659cdc)
2011-05-05 08:49:53 -04:00
Kato Kazuyoshi
870977ae6b Datepicker: Remove old "ui-datepicker-multi-N" before add new one. Fixed #6704 - Display overflow when multiple datepickers have different numberOfMonths.
(cherry picked from commit fc97ccd398)
2011-05-04 17:12:01 -04:00
Kato Kazuyoshi
f9faa0ab5f Datepicker: Greedy matching in month name. Fixed #7062 - $.datepicker.parseDate does not work for some locale date strings.
(cherry picked from commit a891e81e06)
2011-05-04 17:00:40 -04:00
Kato Kazuyoshi
0d0addee16 Datepicker: Remove BOM. Fixed #6734 - Datepicker i18n: Problem with JavascriptPacker.
(cherry picked from commit f505de68fd)
2011-05-04 16:56:22 -04:00
Mark Johnson
15b9e9d176 Draggable: Modified the iframe shims to load prior to dragging. Fixed #7270.
(cherry picked from commit b1c8a13a16)
2011-05-02 17:49:38 -04:00
whittet
f3737a9183 Bug fix for another use case, see comment by whittet here: http://bugs.jqueryui.com/ticket/6702
(cherry picked from commit 2bf061ea6f)
2011-05-02 17:46:20 -04:00
Edward Faulkner
a6d8fd1480 Draggable: containment now updates dynamically to handle scrolling container. Fixed #4445 containment ignored when scrolling in overflow div
(cherry picked from commit d620749611)
2011-05-02 17:44:41 -04:00
adambaratz
0da176b006 Datepicker: bind hover events using delegate. Fixed #7256 - minimize event binding in Datepicker initialization.
(cherry picked from commit 74d195e396)
2011-05-02 10:07:33 -04:00
adambaratz
96f6b1a7db Core: reuse tabindex value. Fixed #7257 - optimize :tabbable.
(cherry picked from commit fe3b36b8ef)
2011-05-02 08:36:55 -04:00
Scott González
54399403e7 Class Animation: Use .attr( "class" ) instead of .attr( "className" ) and adjust the queueing logic for jQuery 1.6 compatibility. Fixes #7275 - $.effects.animateClass broken in jQuery 1.6. 2011-04-27 10:49:08 -04:00
Lopo
df7e300038 Datepicker: Fixed Slovak locale. Fixes #7254 - Datepicker: Incorrect day name for Slovak localization.
(cherry picked from commit 59c787fa4a)
2011-04-15 00:14:03 -04:00
Scott González
06815a98b1 Datepicker: Fixed dateFormat for nl locale. Fixes #7250 - Datepicker: Incorrect dateFormat in jquery.ui.datepicker-nl.js.
(cherry picked from commit 3af0923b73)
2011-04-15 00:08:35 -04:00
Kyle Florence
3c13b33682 Progressbar: hide valueDiv when value is 0. Fixes #7231 - valueDiv should be hidden when value is at 0%
(cherry picked from commit 3b77ac654b)
2011-04-09 14:59:19 -04:00
Scott González
e388153049 Dialog: Don't use .attr( props, true ) for creating buttons since that API doesn't exist in jQueery 1.3.2. Fixes #7226 - Dialog buttons badly handled with JQuery 1.3.2. 2011-04-07 14:06:36 -04:00
Richard Worth
c205fbc4cc Sortable: Reverted 56b0da59d7 as #4551 is invalid.
(cherry picked from commit 54016b8469)
2011-04-07 09:14:31 -04:00
Scott González
a8fc3da628 Datepicker: Only generate yearshtml once. Fixes #7176 - Datepicker shows only single year in year dropdown if numberOfMonths > 1.
(cherry picked from commit 98c53d8432)
2011-04-04 07:56:52 -04:00
Scott González
8310d185b3 Slider: Properly handle value and value methods as setters. Fixes #4881 - Slider: value and values methods as setters aren't chainable.
(cherry picked from commit 2197c61f1f)
2011-03-28 17:34:57 -04:00
Giovanni Giacobbi
eb3d955438 Restructured if/else's for better readability
(cherry picked from commit 3ce8429f4f)
2011-03-21 09:48:10 -04:00
Scott González
74d6069c16 Merge branch '1-8-stable' of github.com:jquery/jquery-ui into 1-8-stable 2011-03-18 08:28:18 -04:00
Scott González
2b4a902e00 Datepicker: Changed a comment that causes problems with YUI Compressor. Fixes #7129 - Datepicker: Can't minify with YUI Compressor.
(cherry picked from commit 6d01645716)
2011-03-18 08:27:46 -04:00
Richard Worth
3cfba5d9a8 Autocomplete: moved autoFocus implementation to after menu visible for a11y
(cherry picked from commit 4026d3acd7)
2011-03-15 12:27:40 -04:00
Richard Worth
779df6517d Autocomplete: new option autoFocus, default false. Fixed #7032 - Autocomplete: Add option to automatically highlight the first result 2011-03-15 05:43:19 -04:00
Richard Worth
69ebdf46a5 Accordion: set aria-selected to true on selected header, false on others. Fixed #7078 - Accordion: Set aria-selected 2011-03-15 04:52:24 -04:00
Richard Worth
6bbc43113c Button: avoid .last() call to ensure compatibility with jQuery 1.3. Fixed #7089 - Button: .last() used in ui.button but not exists in jQ 1.3 2011-03-14 17:18:35 -04:00
Matt Hoskins
6fcdff13fa Draggable: Calling .refreshPositions instead of ._refreshItems when dragging with a connected sortable to force containerCache initialisation/update. Fixed: #5563 - connectToSortable misbehaves if the position of the sortable changes after the sortable and draggable have been initialised as _refreshItems no longer updating container cache.(cherry picked from commit 84257e7f0a) 2011-03-14 10:51:24 -04:00
ddstreet
2d6ad06873 Button: find associated label even without common ancestor. Fixes #7092 - button creation that requires a matching label does not find label in all cases
(cherry picked from commit 0b30a1d450)
2011-03-11 10:54:18 -05:00
Marcel Toele
c5b0a8660a Droppable: enabled and accepting droppables are now activated prior to evaluating their geometry. Fixes #7104 Droppable: if activeClass changes the geometry of a droppable, then dnd uses the wrong geometry.
(cherry picked from commit 86e6ed2eb1)
2011-03-11 10:21:24 -05:00
Guillaume Gautreau
a067dfa8a2 Draggable: modify margins of the containment according to the margin of the draggable element. Fixed #7084 - Draggable with parent containment and margin
(cherry picked from commit 3a0ec399cd)
2011-03-08 09:33:23 -05:00
awgy
15aec63edc Mouse: Reset click event suppression on next mousedown. Fixes #6946 - Mouse: click event suppressed after drag in Gecko(cherry picked from commit 548bdb12a1) 2011-03-07 10:52:03 -05:00
Adam Parod
12d38b1886 Datepicker: Reformat minDate/maxDate when dateFormat changes. Fixes #7009 - Reformat minDate/maxDate when dateFormat changes.
(cherry picked from commit 74b7c3f684)
2011-03-07 09:35:40 -05:00
michaelmwu
20b010640e Sortable: Changed floating calculation to determine also whether items are being displayed horizontally. Helps fix odd sorting behavior for horizontal lists. Fixed #6702 - horizontal sortable not working (and solution)(cherry picked from commit f1d939bc58) 2011-03-07 08:28:59 -05:00
Richard Worth
bfb5582435 Datepicker i18n: corrected arabic month name for May. Fixed #7055 - Datepicker: arabic month name has March in place of May
(cherry picked from commit 5c6afa8e7b)
2011-03-02 21:47:51 -05:00
Scott González
c9bbd9aa6e Button: Only add text classes if there is text. Fixes #7040 - button class change breaks icon only buttons.
(cherry picked from commit e72afe4afc)
2011-02-26 11:15:08 +01:00
Scott González
98513985a2 Datepicker: Added Tajikistan localization. Fixes #7034 - Datepicker: Add Tajikistan localization.
(cherry picked from commit 0cd297702d)
2011-02-25 10:40:56 +01:00
adam j. sontag
971566d258 Datepicker: Display Year before Month in Hungarian i18n. Fixes #7019 - Hungarian Localisation has month-date in wrong order
(cherry picked from commit b4bcc1bf9d)
2011-02-21 21:19:46 +01:00
Scott González
9162679e15 Datepicker: Account for daylight saving when calculating number of days in a month. Fixes #6978 - In Calender for march 2011 dates showing till 5th only.
Thanks jomyjohn
(cherry picked from commit c44818fcca)
2011-02-16 13:16:00 -05:00
Dan Heberden
ab7a5b441a Datepicker: prevent datepicker initialization on empty jquery collection and add unit test. Fixed #6976 - datepicker creates extra dom element with empty object
(cherry picked from commit 5c3dc7d48a)
2011-02-15 13:27:18 -05:00
Martin Solli
685ac7a042 Datepicker: improved translation of Norwegian names for days and months. Fixed #6986 - Improved translation of day and month names(cherry picked from commit d505c7c66d) 2011-02-15 10:00:53 -05:00
Scott González
cf9dac6c17 Datepicker: Properly handle datepickers attached to inputs that are hidden using CSS. Fixes #6988 - Datepicker: Treat all hidden text fields the same.
(cherry picked from commit 6fbee255d8d895c7e84a4b2eaad2cfadc8a3425a)
2011-02-15 08:38:27 -05:00
Alex Dovenmuehle
9191ee3cd8 Button: Batched class changes to improve performance. Fixes #6934. Button: Batch class changes to improve performance.
(cherry picked from commit 5b104dbcef)
2011-02-10 22:12:56 -05:00