Commit Graph

2397 Commits

Author SHA1 Message Date
Dave Stein
ec9c1cf6f4 Draggable: Proper use of ._trigger for detecting preventDefault. _uiHash now returns position and helper - removed offset. 2011-11-06 16:20:56 -05:00
Gaëtan Muller
124cf3cc6c Accordion: Fixed #7238 - Problem with accordion slide animation fixed width calculation 2011-11-06 15:21:22 +01:00
Scott González
3de7d8b68c Position: Check for fraction support. 2011-11-02 11:09:00 -04:00
Scott González
f76873c2d2 Tabs test: Increase delay in load test. 2011-11-02 09:35:20 -04:00
Scott González
f11dab34cc Datepicker: Changed Kazakh locale from kz to kk. Fixes #7829 - Kazakhstan language code. 2011-11-01 18:16:04 -04:00
Corey Frang
f7ec502992 Draggable: Using this.document and this.window instead of doc/win 2011-10-27 21:39:33 -05:00
Corey Frang
ec846fb723 Merge branch 'master' into interactions 2011-10-27 21:35:05 -05:00
Corey Frang
35e4ccae91 Widget: Removing code to merge clean 2011-10-27 21:34:48 -05:00
Scott González
e1e43e3109 Draggable: Add ui-draggable class. 2011-10-27 14:20:55 -04:00
kborchers
e206e54935 Menubar: Refactored _next, _prev, _right and _left into a single method called _move and then created next and previous public methods that call _move. Very similar to how Menu handles keyboard interaction. 2011-10-26 22:54:12 -05:00
=
1337573adc Squashed commit of the following:
Draggable:
 Fixed when cssPosition is being set.
 Scrolling handles non-doc overflow.
 _handleScrolling handles scrolling up and left now
 Made window, doc, and window part of base widget
 All parts of drag may be stopped via stopPropagation
 User can now override position of draggable on start, drag, and stop
 Whitespace fix
 Moved overflowWidth and overflowHeight into overflow.width and overflow.height
2011-10-25 21:54:03 -04:00
ddstreet
e3156ea286 Effects Core: Do not overwrite css or class changes that aren't animated during class animation. Fixed #7106 - animateClass: css and class changes during animation are lost 2011-10-25 17:40:37 -05:00
Scott González
4cc61b459d Autocomplete: Add 1px to the width of the menu to avoid wrapping in Firefox. Fixes #7513 - Autocomplete: long text wraps in Firefox. 2011-10-25 17:19:26 -04:00
Scott González
6625060d83 Widget: Use parentWindow if defaultView doesn't exist.
Thanks ronchalant
2011-10-21 09:26:07 -04:00
Scott González
a0856efef3 Widget: Added window and document properties. Fixes #7801 - Widget: Add document and window properties. 2011-10-20 16:57:47 -04:00
Scott González
c145f1698a Button: Create text span in correct document. 2011-10-20 13:28:31 -04:00
kborchers
92c61b3507 Menubar: Allow structures other than just UL/LI 2011-10-19 13:59:07 -05:00
Corey Frang
2f89f35643 Widget: Refactoring setOptions loop to remove unnesecary closure / that reference 2011-10-19 12:54:08 -05:00
kborchers
164ebf8202 Popup: Remove any references to "that" and use _delay instead of setTimeout. 2011-10-19 10:13:05 -05:00
Hans Hillen
3c258bfa3c Rewrite popup/menu interaction to make popup managed by menu (adds trigger option to menu). Makes popup agnostic of menu and allows datepicker to use popup (soon). 2011-10-19 12:05:37 +02:00
Marwan Al Jubeh
c3c8400289 Core, Draggable: Fixed #7800 - Draggable helper="clone" doesn't remove the dragged clone if original element is removed upon drop 2011-10-17 19:14:54 +03:00
Scott González
bdd602e21b Spinner: Re-enable autocomplete if the page is unloaded so the browser will remember the current value when navigating through history. 2011-10-17 10:12:35 -04:00
Scott González
81b2ef4a60 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-17 09:25:36 -04:00
Scott González
a0946d0364 Draggable: Remove all ids when using helper: true. 2011-10-17 08:26:12 -04:00
Scott González
63374dcb52 Autocomplete: Avoid handling keypress when keydown modified the search term. Fixes #7799 - Autocomplete regression - Cannot type '&' in IE and Chrome. 2011-10-17 08:11:23 -04:00
Scott González
c4df28939c Draggable: Use ._bind(). 2011-10-14 15:03:10 -04:00
Scott González
ee094ccf4d Draggable: Cleanup. 2011-10-14 14:29:03 -04:00
Corey Frang
d4d8d74b10 Scale: We can't detect this reliably currently, so assume all elements are positioned with left and top 2011-10-14 10:24:01 -05:00
Florian Gutmann
42d33f2f86 Dialog: fix small memory leak when having lot's of instances. Fixes #7793 - Small memory leak in ui dialog. 2011-10-14 11:18:48 -04:00
Scott González
26bcf972e6 Spinner: Fixed mousewheel stop timer. 2011-10-13 16:47:01 -04:00
Scott González
4694f85d4c Spinner: Adjust height check for IE 6 rendering. 2011-10-13 16:39:14 -04:00
kborchers
9a274c0675 Menu: Check if menu is scrolling to prevent inadvertent mouseover events from being fired on scroll 2011-10-12 16:13:34 -05:00
Scott González
75415b35ea Autocomplete: Don't react to the escape key if the menu isn't open. Fixes #7579 - autocomplete overwrites input erroneously when user hits ESC before timeout expires. 2011-10-12 16:25:59 -04:00
Scott González
84e99650bf Autocomplete: Added missing semicolon. 2011-10-12 13:58:02 -04:00
Scott González
d8b0ce8db2 Autocomplete: Use strict equality check. 2011-10-12 13:53:50 -04:00
Scott González
ea19645c20 Autocomplete: Don't react to menu blurs. Fixes #7742 - Autocomplete: Blur should not change the value of the input. 2011-10-12 13:38:38 -04:00
kborchers
f24ab94f86 Popup: Removed the focusout and focusin handlers which are nolonger necessary. Also updated the tooltip style demo to have a little more interactive content. 2011-10-11 00:06:09 -05:00
igor milla
f25937b215 jquery.ui.datepicker-uk.js : Corrected translation of the weekHeader. 2011-10-11 02:09:08 +03:00
Scott González
fa26847f91 Tabs: Force ajax tabs to resolve asynchronously to avoid a bug caused by cached XHRs resolving immediately in IE. 2011-10-10 15:34:47 -04:00
=
c8e13708eb Draggable: Scrollbars being handled when scrollParent is document 2011-10-09 00:54:47 -04:00
=
e43ce91212 Draggable: No longer overwriting _trigger 2011-10-08 23:34:26 -04:00
=
7745d61a24 Draggable: No longer using disableSelection in favor of preventDefault 2011-10-08 23:30:03 -04:00
=
7ef6df95eb Draggable: Helper option can now take function that returns DOMElement 2011-10-01 12:38:48 -04:00
=
1f23656fe2 Draggable: Fixed coding style, moved properties out of prototype 2011-10-01 12:05:36 -04:00
Marian Rudzynski
8d09f750a4 Menubar: moved mouseleave _bind call into existing _bind block, added the mouseenter binding back in to help with accidental quick mouseouts causing the menu to close and use same close time for all 2011-10-01 10:56:49 -04:00
David Leal
663719863f Autocomplete: Fix stray reference to element.val(). 2011-10-01 12:06:40 +01:00
Scott González
1e395ecf08 Accordion: Fixed nested accordions. 2011-09-30 17:06:22 -04:00
Corey Frang
e8ba367a58 Effects: fixing an animateClass issue when the class was empty 2011-09-29 20:45:23 -04:00
Corey Frang
dda67fc171 Effect core: Making animate class cross-frame safe, style guidence 2011-09-29 18:55:58 -04:00
kborchers
ac8a19b62d Menubar: Fixed an issue with autoExpand binding that caused the menu to close on fast mouseenter by changing to _bind on the parent menubar item 2011-09-29 14:23:26 -05:00
Scott González
c2f036277c Spinner: Added culture option. 2011-09-28 18:30:58 -04:00
Scott González
d85c67dd96 whitespace 2011-09-27 22:02:07 -04:00
Dave Stein
cb828a52bd Draggable: Code style better matching style guideline 2011-09-27 21:33:38 -04:00
Dave Stein
05b1d23990 Draggable: Initial commit for new implementation, clone is only usable option 2011-09-27 21:10:59 -04:00
Richard D. Worth
228b1b191b 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 2011-09-27 07:57:06 -04:00
Jörn Zaefferer
cf3e655be1 Autocomplete: Delay option just delays request, doesn't clear existing timeout, therefore not preventing unncessary requests. Calling abort() on existing requests has no effect for JSONP, but even then its unncessary to start a request if the user is still typing. Works fine in 1-8-stable. 2011-09-24 19:07:08 +02:00
Jörn Zaefferer
bf51b0e71c Spinner: Fix the IE6-height-fix to not break the spinner when initialized while not visible 2011-09-24 14:36:39 +02:00
polomoshnov
0b4f80899c Removed unnecessary code. 2011-09-23 13:57:02 +12:00
Corey Frang
34a0479d1c Menu: Refactoring the collapseAll to deal with some issues selecting - Updating unit tests. Thanks @kborchers 2011-09-22 15:30:46 -05:00
Jörn Zaefferer
cb372b7c20 Popup: Make menu dependency actually optional, cleanup demos 2011-09-21 22:54:29 +02:00
Jörn Zaefferer
a3866bf057 Popup: Use duration:fast for default animations. Also fix two missing semicolons. 2011-09-21 22:48:55 +02:00
kborchers
2196b74a31 Popup: Added show/hide animations and a demo 2011-09-21 10:42:07 -05:00
Jörn Zaefferer
6d430e4fd3 Merge remote branch 'kborchers/menu_notJustUL' 2011-09-19 10:18:04 +02:00
kborchers
7f808b2047 Position: Check to also make sure to only flip if more of the element is inside "within" 2011-09-16 11:52:22 -05:00
Scott González
a60a99ee48 Merge remote branch 'kborchers/bug_7686' 2011-09-16 10:45:35 -04:00
Jay Oster
c36b43d0ee Datepicker: Fix this reference in _hideDatepicker(). Fixed #7722 - Datepicker: Does not properly clear current instance when hidden. 2011-09-15 17:02:18 -07:00
kborchers
9e617bbad1 Menu: Add support for structures other than UL/LI plus visual and unit tests 2011-09-14 10:29:36 -05:00
Scott González
6807d588ee Spinner: Work around a bug in IE 6 with the height of the buttons. 2011-09-14 09:41:57 -04:00
Scott González
91786d550b Spinner: Added missing dependency to header comment. 2011-09-14 09:01:29 -04:00
Scott González
42337dd959 Spinner: Fix step mismatches whenever stepping, paging or using the value setter.
Thanks Nate Ferrero
2011-09-14 08:55:22 -04:00
Richard D. Worth
cedac75bcc Datepicker i18n hu: Corrected four-digit year in dateFormat. Fixes #7714 - Hungarian translation 2011-09-13 05:06:06 -04:00
Richard D. Worth
b8821d945e Datepicker i18n hu: Corrected some spellings and abbreviations as well as dateFormat. Fixes #7714 - Hungarian translation 2011-09-13 04:57:31 -04:00
Jörn Zaefferer
61290de86d Spinner: Replace var that with this and _delay 2011-09-13 00:28:29 +02:00
Jörn Zaefferer
45ed8d8447 Popup: Replace var that with this and _delay 2011-09-13 00:27:54 +02:00
Jörn Zaefferer
e1ec6f8ebb Menu: Refactor to get rid of var that. Cleanup some odd formattings and unneeded temp vars 2011-09-13 00:24:43 +02:00
Jörn Zaefferer
ae0c4e44ff Merge remote branch 'kborchers/menu_autoCollapse' 2011-09-12 23:54:19 +02:00
Jörn Zaefferer
bf26bf1ac4 Menu: Get rid of var self, replacing with that or calls to _delay 2011-09-12 23:52:17 +02:00
Jörn Zaefferer
3a0340f4ee Widget: return timer value from _delay 2011-09-12 23:47:09 +02:00
Jörn Zaefferer
30482cd04b Widget: Get rid of var self 2011-09-12 23:41:01 +02:00
Jörn Zaefferer
2a6ca3fb39 Widget: Add a _delay method. Will be used in various places to replace setTimeout with custom binding (mostly getting rid of var self/that) 2011-09-12 23:37:14 +02:00
Jörn Zaefferer
609e1f87f4 Menu: Replace regular bind call with _bind 2011-09-12 23:19:19 +02:00
kborchers
af76ad1c82 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 2011-09-12 13:30:41 -05:00
kborchers
94317d7aa4 Menu: Added autoCollapse as the default and added a unit test 2011-09-12 08:43:49 -05:00
Scott González
7216c08b2f Spinner: Added ability to specify custom incremental function. 2011-09-09 20:08:51 -04:00
Scott González
4387d19030 Spinner: Default min and max options to null. 2011-09-09 19:24:10 -04:00
Scott González
c1cda180a9 Tabs: Find panels using aria-controls instead of index for remove method. Fixes #7698 - Panels do not sort when a tab is sorted which can cause a mismatch error when a tab is removed. 2011-09-06 13:01:01 -04:00
Scott González
08450c3b2d Button: Fixed RTL detection to default to LTR. Fixes #7697 - Buttonset: Incorrect corners for disconnected elements. 2011-09-06 11:00:42 -04:00
Jörn Zaefferer
02c821da6e Popup: Missing semicolon. Can't use :ui-button selected if button isn't loaded. 2011-09-05 17:59:36 +02:00
Scott González
c5ba0535cf Autocomplete: Fixed setting of valueMethod for textareas. Fixes #7674 - Autocomplete doesn't work with textareas. 2011-08-30 20:45:48 -04:00
Scott González
87f78973b9 Tabs: Pass the required deep parameter to cloneNode(). Fixes completely broken tabs in Opera.
Thanks monoblaine.
2011-08-30 20:22:35 -04:00
Corey Frang
dfe75e1b55 Dialog: Update to 96e5c24 - keyup apparently doesn't work like I thought it would everywhere, switching back to keydown. 2011-08-20 18:05:39 -05:00
Corey Frang
96e5c241e1 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 2011-08-19 06:03:59 -05:00
Jörn Zaefferer
fb57cc8aba Tooltip: Change default to flipfit for both dimensions, now that it is available. Fixes positioning issue when tooltipped element is at the top of the screen. 2011-08-18 21:39:27 +02:00
Jörn Zaefferer
25f2113cc1 Merge remote branch 'kborchers/position_flipfit2' 2011-08-15 11:32:49 +02:00
Scott González
1aea0ff4b8 Spinner: Removed value option. Don't change empty values to zero on init. Don't enforce min/max on blur. 2011-08-13 19:05:04 -04:00
kborchers
80bbebd489 Position: Added better collision detection for flip and fit, added visual tests for each and updated the unit tests to take the changes into account. In the process, I removed the rounding that was being done to the position since older jQuery couldn't handle the fractions. There was another pull for this same issue and I have merged the unit tests from that pull into this commit. Also added flipfit! 2011-08-12 22:19:52 -05:00
Scott González
257021b1af Spinner: Fixed precision when stepping.
Thanks hughlomas
2011-08-12 23:11:35 -04:00
Scott González
6c1bf56029 Spinner: Moved all event handlers into an object. 2011-08-12 22:33:44 -04:00
Scott González
4587f2de68 Widget: Use this.widget() for event delegation. 2011-08-12 22:10:31 -04:00
Scott González
18a3b53988 Tabs: Fixed detection of local vs. remote tabs. Fixes #4941 - Mishandling of base tag. Fixes #4836 - Self refering href only partially detected. 2011-08-11 16:48:58 -04:00
Chris Kelly
478a01582c Typo fix: loose -> lose 2011-08-10 16:01:44 -04:00
Scott González
ac04462d22 Tabs: Cleanup. 2011-08-10 09:30:52 -04:00
Scott González
de7fd4c130 Spinner: Fixed integration with globalize. 2011-08-10 09:15:47 -04:00
Jörn Zaefferer
56e9cd7119 Replace $.global with Globalize, update Spinner to use it. Related demos currently broken due to previous changes. 2011-08-10 14:55:16 +02:00
Scott González
bb79b41871 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 5f0a2f01c4.
2011-08-10 07:55:19 -04:00
Scott González
7c7d3df8e7 Spinner: Return formatted value when using value method. 2011-08-09 21:38:19 -04:00
Scott González
92766654ae 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:45:41 -04:00
Karl Kirch
d146297356 Datepicker: Added ability to stop datepicker from beforeShow. Fixes #7602 - Ability to stop datepicker from appearing with beforeShow event handler. 2011-08-09 09:55:50 -04:00
Scott González
7f812f8be9 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. 2011-08-09 09:32:01 -04:00
Scott González
e827a0e280 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 effdd5d19c.
2011-08-09 08:26:33 -04:00
Jörn Zaefferer
f8f38e86c4 Merge remote branch 'kou/autocomplete-destroy-search-timeout' 2011-08-09 12:09:52 +02:00
Scott González
8c5a6f7241 Spinner: Use a polynomial instead of hard-coded blocks for incremental stepping. 2011-08-07 19:21:23 -04:00
Scott González
2a8a77a9b2 Spinner: More tests. Don't trigger spin when programmatically stepping or paging. 2011-08-07 19:11:49 -04:00
Scott González
6c84531d7c Spinner: Fixed double firing of change event when setting the value option directly. 2011-08-07 12:38:01 -04:00
Scott González
6c9dac29a5 Spinner: Don't need to call _format() and _aria() in _setOptions() since it's wrapped as a modifier. 2011-08-07 12:30:33 -04:00
Scott González
dd0a436c37 Spinner: Trigger change event when the value is changed programmatically. 2011-08-07 12:27:14 -04:00
Scott González
bea9933a8b Spinner: Re-render value if numberFormat option changes. 2011-08-07 11:35:38 -04:00
Scott González
051b9e07d9 Spinner: Use _getCreateOptions() for value. 2011-08-07 08:20:14 -04:00
Kouhei Sutou
b83a2063cf Autocomplete: ensure clear searching timeout on destroy. 2011-08-07 15:50:34 +09:00
Scott González
e9cdd576f4 Merge branch 'spinner-getCreateOptions'
Conflicts:
	ui/jquery.ui.spinner.js
2011-08-06 20:08:50 -04:00
Scott González
e4898fdfc6 Spinner: Added comment with formula that approximates current incrementing logic. 2011-08-06 17:10:09 -04:00
Scott González
b10c4cdab5 Spinner: Define defaults for callbacks. 2011-08-06 17:08:50 -04:00
Scott González
2b22bbdd6a Spinner: Only trigger change when the field has blurred and the value has changed. 2011-08-06 15:32:19 -04:00
Scott González
08a7a11a1b Spinner: Don't set focus on stop, focus should already be correct. Always remove ui-state-active on blur, since we no longer blur when interacting with buttons. 2011-08-06 15:26:12 -04:00
Scott González
64cdaa82e6 Spinner: Keep the focus on the text field even when using the buttons. 2011-08-06 15:07:34 -04:00
Scott González
fb5cad37ce Spinner: Don't clear invalid values on blur (but clear the value option). 2011-08-06 13:28:25 -04:00
Scott González
4d2ac1abca Spinner: Don't stop propgation of mousedown. Added TODOs. 2011-08-06 13:27:42 -04:00
Scott González
e4c0f202c8 Spinner: Use _getCreateOptions() instead of custom _markupOptions(). 2011-08-06 12:58:37 -04:00
Scott González
c1da941f9f Spinner: Invoke _markupOptions() before _draw(). 2011-08-06 12:53:49 -04:00
Scott González
c4bd14f1bb Spinner: Don't stop propagation for keydown events. 2011-08-06 12:49:11 -04:00
Scott González
6981cab9c4 Spinner: Cleanup, use ._bind() and ._hoverable(). 2011-08-06 12:38:59 -04:00
Corey Frang
065aef537b Button: Adding quotes to the attribute selector for labels - Fixes #7534 - Button label selector omits quotes / fails for ids with ":" 2011-08-03 22:16:34 -05:00
Scott González
e15c32d067 Merge pull request #413 from kborchers/bug_4333_3
Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE
2011-08-02 16:24:27 -07:00
Corey Frang
8108ec82db Effects: Adding a check to retain focused elements after wrapping and unwrapping in animations - Fixes #7595 - Wrapper-creating jquery-ui animations will discard any focus state during the animation - Thanks @rubyruy 2011-08-02 16:54:24 -05:00
kborchers
dafc941b36 Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE 2011-08-02 08:36:22 -05:00
Scott González
70687f7955 Datepicker: Removed click handling for month and year dropdowns. Fixes #6198 - Datepicker Month and Year dropdowns in IE have to click twice.
Thanks jdufresne
2011-08-01 15:28:37 -04:00
Scott González
350e4ab5b8 Revert "Mouse: Changed mouseHandled check to a local var rather than using originalEvent. Fixed #4333 - Nested draggables problem in IE"
This reverts commit 9c50bdfde0.
2011-08-01 14:16:16 -04:00
Corey Frang
38028f6de1 Autocomplete: Correcting readOnly from readonly - @scottgonzalez 2011-07-29 13:12:34 -05:00
Jörn Zaefferer
0ff3396e88 Widget delegation: Small if-simplify refactoring 2011-07-28 21:55:38 +02:00
Jörn Zaefferer
a57c435257 Whitespace 2011-07-28 15:56:57 +02:00
Jörn Zaefferer
5e35a0c55b Widget delegation: Put back the simple click event handler where it was. 2011-07-28 15:55:56 +02:00
Jörn Zaefferer
5b45d618dc Widget delegation: Further simplify menu code, blur handler also doesn't do anything 2011-07-28 15:53:55 +02:00
Jörn Zaefferer
9e2efe95b2 Widget delegation: Further simplify menu code 2011-07-28 15:52:52 +02:00
Jörn Zaefferer
02aad7b0ae Widget delegation: Update menu to use _bind with delegation. Clean up test. 2011-07-28 15:47:59 +02:00
Jörn Zaefferer
5a45f483d7 Merge branch 'master' into widget-delegation 2011-07-28 15:16:20 +02:00
kborchers
e16e99a154 Menu: Added focusing first menu item when menu receives focus and collapseAll when menu loses focus (blur). 2011-07-26 08:52:33 -05:00
Jörn Zaefferer
f89091105f Merge remote branch 'kborchers/menu_home_end' 2011-07-25 23:57:51 +02:00
Scott González
19a9de7e66 Merge branch 'master' into core-1.6.1
Conflicts:
	demos/menubar/default.html
	tests/unit/autocomplete/autocomplete.html
	tests/visual/effects/effects.all.html
	ui/jquery.ui.menu.js
	ui/jquery.ui.popup.js
2011-07-25 11:53:14 -04:00
Scott González
f59a3e91e3 Datepicker: Use .attr() for size. 2011-07-25 11:13:54 -04:00
kborchers
23340f1162 Menu: Added Home moves to first item and End moves to last item in currently active menu or submenu. Also fixed PageUp and PageDown so that they don't wrap back around to other end of menu. Also fixed scrolling to use activeMenu rather than element to all. Also added unit tests for keyboard nav 2011-07-25 09:13:13 -05:00