library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,848 Commits 13 Branches 88 Tags 44 MiB
026f5171c7
Commit Graph

1974 Commits

Author SHA1 Message Date
Scott González
d36d116d36 Upgrade QUnit to 1.11.0. Fixes #8969 - Global test failure in Opera 12.12. 2013-01-31 10:19:48 -05:00
Kris Borchers
2a8494fc81 Dialog Tests: Cleanup el -> element 2013-01-30 23:44:25 -06:00
Kris Borchers
e886e4a9c1 Dialog Tests: Add test to ensure dialog keeps focus when clicking a modal overlay 2013-01-30 23:44:03 -06:00
Kris Borchers
d1505e3434 Dialog: Move call to _focusTabbable and triggering of open and focus events into the _show callback. Fixes #6756 - Dialog: show: "blind" with link in content doesn't animate properly. Fixes #8051 - Dialog: 'Explode' dialog animation causes crash in IE 6, 7 and 8. Fixes #4421 - Dialog: Focus lost from dialog which uses show-effect 2013-01-30 12:30:37 -06:00
Felix Nagel
91dde04dad Merge branch 'master' into selectmenu 2013-01-30 18:10:39 +01:00
David Petersen
2ca4d17982 Effects Core: make removeClass work correctly with changes jQuery 1.9.0. Fixed #9015 - Inclusion of jQuery UI breaks removeClass 2013-01-29 07:47:54 -06:00
David Sullivan
55360eeb7e Dialog: modified _createOverlay to _appendTo instead of document.body. Fixed #8984 - Modal dialogs display behind overlay when using appendTo option 2013-01-26 11:34:51 -05:00
David Petersen
649f105229 Dialog: Don't handle overlays on destory if there are not any. Fixed: #9004 - failed in _destroyOverlay when I destroy a modal dialog thau was never opened. Fixed: #9000 Dialog leaves broken event handler after close/destroy in certain cases 2013-01-24 13:43:02 -06:00
David Petersen
f7f165c9f8 Merge pull request #891 from petersendidit/datepicker_8994 
Datepicker: Handle when yearRange is a year or a modifier. Fixed #8994 -...
 2013-01-23 11:50:00 -08:00
David Petersen
8f7c3e309c Datepicker: Handle when yearRange is a year or a modifier. Fixed #8994 - Datepicker: next and prev buttons are disabled when using yearRange 2013-01-23 13:41:01 -06:00
Scott González
10c873ab6c Accordion: Add panel in addition to content for create event. Fixes #8998 - Accordion: Create event uses content instead of panel. 2013-01-22 09:19:04 -05:00
Felix Nagel
de149c47d7 Selectmenu: Updating to jQuery 1.9.0 2013-01-18 19:28:13 +01:00
Felix Nagel
f5e65b0819 Merge branch 'master' into selectmenu 2013-01-18 19:25:30 +01:00
Kris Borchers
34409e7ddd Updating to jQuery 1.9.0 2013-01-17 00:28:41 -06:00
Scott González
1f65b3bca9 Whitespace. 2013-01-16 13:45:54 -05:00
Felix Nagel
dcb28a7c71 Merge branch 'master' into selectmenu 2013-01-10 19:13:54 +01:00
Jörn Zaefferer
a335740537 Libs/externals: Fix line endings. 2013-01-08 17:28:45 +01:00
Scott González
48a790a327 Core: Resume focus test based on the event, not the callback. 2013-01-08 07:54:11 -05:00
Jörn Zaefferer
fb47fd0310 Merge branch 'master' into selectmenu 2013-01-03 09:45:09 +01:00
Mike Sherov
f667d090a7 Interactions: Update widget defaults to match documented API. 2013-01-02 18:27:22 -05:00
Mike Sherov
cf7dc089e0 Tests: Correct all 404 errors in the test suite 2013-01-02 18:03:03 -05:00
Mike Sherov
ff47763924 Datepicker Tests: Prepare for widget-ization tests. 2013-01-02 17:37:26 -05:00
Mike Sherov
b477098da5 Slider: add options for event callbacks 2013-01-02 14:58:12 -05:00
Felix Nagel
f244108d28 Selectmenu tests: Convert single quotes to double quotes 2013-01-02 20:28:22 +01:00
Felix Nagel
1ba02e9c5f Merge branch 'master' into selectmenu 2013-01-02 19:38:55 +01:00
Mike Sherov
18b8ffd796 Draggable Tests: Cover all cursorAt option formats. 2013-01-01 23:16:12 -05:00
TJ VanToll
695358983e Selectable: Account for scrolling on the helper's initial position. Fixed #8915 - Selectable: Lasso offset issue with scrolling. 2013-01-01 08:22:18 -05:00
TJ VanToll
2620be85e9 Selectable tests: Removed a non-existent script tag causing a 404 in the tests. 2013-01-01 08:19:20 -05:00
Jörn Zaefferer
37fda49e3c Accordion: Fix testsuite overflow issue in IE7. 2012-12-28 10:41:05 +01:00
Jörn Zaefferer
2c3d311f90 Menu: Allow changing icons option after creation. Fixes #8927 - Menu: Can't change icons option after init 2012-12-27 17:23:25 +01:00
Jörn Zaefferer
0d53fbfd0b Spinner: Trigger start/spin/stop events when calling step/page methods. Fixes #8901 - Spinner does not fire start/spin/stop events when calling stepUp()/Down(), pageUp()/Down() methods 2012-12-27 17:06:01 +01:00
Mike Sherov
1045d3a352 Draggable Tests: Fix IE7 offset failures 2012-12-27 10:39:14 -05:00
Jörn Zaefferer
04d668b717 Spinner: Update button icons when option changes. Fixes #8926 - Spinner: Can't change icons option after init 2012-12-27 12:50:04 +01:00
Mike Sherov
0d4022bceb Tests: Convert single quotes to double quotes. 2012-12-26 08:08:48 -05:00
Mike Sherov
ecb7b6ec12 Draggable Tests: add back in unreliable offset hack for cursorAt tests 2012-12-22 17:39:36 -05:00
Mike Sherov
46925b8808 Draggable Tests: use jquery.simulate.js to simulate drag events 2012-12-22 16:30:27 -05:00
Mike Sherov
6d88d264be Dialog Tests: Fix test fails due to window measurements in FF and IE7 2012-12-22 15:46:57 -05:00
Mike Sherov
48d7d53f7b Dev: stop loading *_tickets.js in the test suite. 2012-12-22 12:56:19 -05:00
Felix Nagel
44e472a613 Merge branch 'master' into selectmenu 2012-12-20 22:05:23 +01:00
Scott González
68a307c547 Build: Added notStrictEqual to the globals list for unit tests. 2012-12-20 09:49:26 -05:00
Felix Nagel
dab7bf8993 Merge branch 'master' into selectmenu 2012-12-20 00:32:28 +01:00
Felix Nagel
84621940bf Selectmenu tests: remove option dropdown 2012-12-20 00:12:35 +01:00
Dominic Barnes
209443d716 Slider: Create clone of options.values during _create(). Fixed #8892 - Multiple Sliders have Conflict with options.values. 2012-12-18 11:48:10 -05:00
Felix Nagel
1b1dbd8e3a Selectmenu tests: add Position plugin to loaded resources 2012-12-15 02:25:41 +01:00
Felix Nagel
58f2706cbb Selectmenu tests: improve compatibility visual test in order to work with ui-front 2012-12-15 02:24:45 +01:00
Felix Nagel
ae68ab8118 Selectmenu tests: improve appendTo option tests 2012-12-15 02:24:10 +01:00
Felix Nagel
930e9d5993 Selectmenu tests: adjust common test to new appendTo mechanism 2012-12-15 02:23:04 +01:00
Felix Nagel
8aa24dd1d5 Merge branch 'master' into selectmenu 2012-12-15 01:10:32 +01:00
Felix Nagel
25023c3040 Selectmenu tests: fixed headlines in disable / empty visual test 2012-12-15 01:07:10 +01:00
Scott González
8ec7a1b69f All: Use .addBack() instead of .andSelf(). 2012-12-14 11:13:50 -05:00
Scott González
80e46c93a8 Autocomplete: Append to closest .ui-front if available. 2012-12-14 09:10:32 -05:00
Felix Nagel
21e46b8bc6 Selectmenu tests: improve and merge visual tests 2012-12-13 01:15:48 +01:00
Felix Nagel
812a90fc82 Selectmenu tests: improve focus event test so its possible to test for too much focus events from menu widget 2012-12-12 19:30:45 +01:00
Scott González
f5aaf874e9 Progressbar: Moved .ui-progressbar-indeterminate to main element. Added tests for markup structure. 2012-12-12 11:21:49 -05:00
Felix Nagel
f6372bd7ea Merge branch 'master' into selectmenu 2012-12-12 16:44:19 +01:00
Mike Sherov
a677ea7dc0 Dev: update jquery.simulate.js to latest version from http://github.com/jquery/jquery-simulate 2012-12-12 03:59:11 -05:00
Mike Sherov
fec36fd214 Dev: remove todos from datepicker and dialog testsuite 2012-12-12 03:16:33 -05:00
Scott González
b9f206dbcf Dialog: Cleanup. 2012-12-11 16:23:18 -05:00
Scott González
28fcef5e9e Datepicker tests: Handle async focus in IE. 2012-12-11 10:06:13 -05:00
Scott González
694987f2f7 Menu tests: Better handling of async focus in IE. 2012-12-11 09:44:39 -05:00
Scott González
020abcf8a9 Spinner tests: Delay all the things to make IE happy. Maybe... 2012-12-10 15:54:06 -05:00
Scott González
245a82d5aa Dialog tests: More async focus handling to deal with IE8. 2012-12-10 15:31:56 -05:00
Scott González
d5f06c319a Spinner tests: Better handling of async focus in IE. 2012-12-10 10:35:28 -05:00
Scott González
fbc7956b9f Button tests: Handle async focus in IE. 2012-12-10 10:35:01 -05:00
Scott González
2841541362 Core tests: Handle async focus in IE. 2012-12-10 10:34:44 -05:00
Scott González
0f0ec001aa Dialog tests: Updated markup for deprecated tests to match standard tests. 2012-12-10 08:53:13 -05:00
Mike Sherov
9f76446775 Dev: remove unnecessary simulated drag delegation in test suite 2012-12-08 21:27:37 -05:00
Mike Sherov
5dee8dee30 Dev: Change incorrect references in test suite from #main to #qunit-fixture. 2012-12-08 13:19:36 -05:00
Mike Sherov
e83a89dd7d Dev: Remove *_tickets.js test files and move the associated tests to the proper locations. 2012-12-07 20:06:29 -05:00
Scott González
d4551bc3b8 Dialog: Respect maxHeight when determining size on open. Fixes #4820 - Dialog: Auto height does not respect the maxHeight option. 2012-12-07 16:57:03 -05:00
Scott González
70b16ef445 Dialog: Added appendTo option. Fixes #7948 - Dialog: Allow dialog to be attached to a element other than body. 2012-12-07 14:54:21 -05:00
Scott González
da17a232ca Autocomplete: Handle detached elements for appendTo after create. 2012-12-07 11:58:58 -05:00
Scott González
20a29dfd61 Datepicker: Run JSHint test in unit tests. 2012-12-06 11:56:56 -05:00
Scott González
f7614706ab Progressbar: Cleanup, byte shaving. 2012-12-06 10:10:07 -05:00
Scott González
9d0df53624 Progress tests: Cleanup. 2012-12-06 09:50:33 -05:00
Scott González
f1be88e795 Progressbar: Only remove aria-valuenow for indeterminate progressbars. Added more accessibility tests. 2012-12-06 09:35:41 -05:00
Scott González
8c763cdf98 Progressbar: Define defaults for callbacks. 2012-12-06 09:21:25 -05:00
Scott González
f59f5a8b12 Dialog: Restore inline styles for dimensions/display. Fixes #8119 - Dialog: Destroying a dialog leaves some styles changed. 2012-12-05 11:53:34 -05:00
Scott González
598cdae199 Datepicker: Handle changes to the disabled option. Fixes #8883 - Datepicker: Changing disabled option doesn't work. 2012-12-05 10:38:31 -05:00
Scott González
3c2acc3227 Dialog: Remove width, min-height, height styles on destroy. Fixes #8119 - Dialog: Destroying a dialog leaves some styles changed. 2012-12-04 10:03:05 -05:00
Scott González
050e71bdd8 Revert "Dialog: Cleanup style properties on _destroy. Reenables style check in domEqual, while removing commented and unnecessary old code. Fixes #8119 - Dialog: Destroying a dialog leaves style, scrollleft, and scrolltop leftovers." 
This reverts commit d687a1b10d.
 2012-12-04 09:21:33 -05:00
Jörn Zaefferer
1e8baf5683 Dialog: Remove the instance-storing for the overlay, just create one whenever it is needed. Heavily simplifies the code, while the memorly leak should be hardly an issue anymore, since fixed positioning restricts the overlay size to the window dimensions. Fixes #6058 - Dialog overlays are not properly reused when multiple instances of a Dialog exist. 2012-12-04 01:08:34 +01:00
Jörn Zaefferer
d687a1b10d Dialog: Cleanup style properties on _destroy. Reenables style check in domEqual, while removing commented and unnecessary old code. Fixes #8119 - Dialog: Destroying a dialog leaves style, scrollleft, and scrolltop leftovers. 2012-12-04 00:35:47 +01:00
Scott González
8b15aaf496 Widget: Don't modify the prototype passed to $.widget(). Fixes #8876 - Calling _super calls wrong inherited widget. 2012-12-03 14:18:24 -05:00
Scott González
7312933c88 Widget tests: Fixed order of actual and expected. 2012-12-03 13:57:28 -05:00
Jörn Zaefferer
bdb0fbe993 Dialog: Restrict title to a single line. Fixes #7773 - Dialog: If titlebar changes height during resize, button pane positioning changes. 2012-12-03 19:09:32 +01:00
Scott González
5ba267e7c7 Resizable: Respect containment for alsoResize option. Fixes #4603 - Resizable: alsoResize option doesn't work with containment. Fixes #5559 - Dialog: Content grows bigger than widget on resize at document edge. 2012-12-03 10:36:55 -05:00
Jörn Zaefferer
13505e5945 Dialog: Ensure all animations finish and clean up themselve when destroying dialog. Fixes #5860 - Dialog: Destroying a dialog during animated close leaves .ui-effects-wrapper in DOM. 2012-11-30 13:08:56 +01:00
Felix Nagel
6fd9d8f93c Selectmenu tests: add button widget js file to fix compatibility test 2012-11-29 20:36:48 +01:00
Felix Nagel
d1c9837a51 Selectmenu tests: remove themeswitcher as its no longer available 2012-11-29 20:35:29 +01:00
Scott González
948f874266 Button tests: Work around a quirk in Opera. 2012-11-29 09:19:05 -05:00
Felix Nagel
36533a718d Merge branch 'master' into selectmenu 2012-11-28 23:29:15 +01:00
Mike Sherov
37ea734182 Button tests: simulated clicks aren't perfect in oldIE and Opera 2012-11-28 11:22:14 -05:00
Scott González
dec844570f Autocomplete: When appendTo is a jQuery object or a DOM element, don't search against the document. Fixes #8858 - Autocomplete: Fails when appendTo is detached from the DOM. 2012-11-28 10:33:59 -05:00
Scott González
f2854408cc Tooltip: Escape the title attribute so that it's treated as text and not HTML. Fixes #8861 - Tooltip: XSS vulnerability in default content. 2012-11-27 11:21:33 -05:00
Mike Sherov
22bd9fc704 Button Tests: move aria-pressed test to correct module 2012-11-26 20:24:31 -05:00
Fabrício Matté
caacf8f504 Button: Let change handler handle display and aria update. Fixed #5518 - Button: Incorrect state after double click in Firefox 2012-11-26 20:15:53 -05:00
David Petersen
6121683d80 Tabs: Calculate border and padding on tabs container. Fixed #8836: Height overflows parent with heightStyle: 'fill'. 2012-11-26 16:35:07 -05:00
Scott González
ee8d20ea06 Dialog: Moved resizable handle test from resizable. 2012-11-26 16:27:18 -05:00
TJ VanToll
0cd470b0d5 Resizable: Modified the default z-index value of resizable handles. Fixed #7960 - Dialog: Modal dialogs do not disable resizables on the page. 2012-11-26 12:42:44 +01:00
Kris Borchers
a68d5ca31d Dialog: Add unit test to cover #8789 and #8838. 2012-11-26 12:14:29 +01:00
Kris Borchers
d179cbaf32 Dialog: Update position when size is changed. Fixes #8789 - Dialog does not close for first click on chrome. 2012-11-26 10:28:25 +01:00
Jörn Zaefferer
a09f5c07f5 Dialog: Follow-up to 9fe3a62d8 - also deprecate string notation for position option. 2012-11-26 10:28:25 +01:00
Jörn Zaefferer
f3525afe0e Dialog: Update focus-tabbable test with a timer workaround to get IE8 to pass. 2012-11-26 10:28:25 +01:00
Jörn Zaefferer
5aac8f563f Dialog: Add missing unit test for aria-describedby attribute 2012-11-26 10:28:24 +01:00
Jörn Zaefferer
a0310eb091 Dialog: Move array notation support for position option to backCompat check. Fixes #8824 - Deprecate array notation for position option. 2012-11-26 10:28:24 +01:00
Jörn Zaefferer
0be97bf8c0 Dialog: Removed broken disabled option from dialog, defuse disable/enable methods. Disabling dialogs is not supported. 2012-11-26 10:28:24 +01:00
Jörn Zaefferer
b27db7e3b9 Dialog: Extend autofocus, starting with [autofocus], then :tabbable content, then buttonpane, then close button, then dialog. Fixes #4731 - Dialog: Add option to set which element gains focus on open 2012-11-26 10:28:24 +01:00
Jörn Zaefferer
299681e8f0 Dialog: Cleanup in ticket tests: TODO to merge one test, fix whitespace 2012-11-26 10:28:24 +01:00
Jörn Zaefferer
b694409e76 Dialog: Extend visual test to verify DOM position restore on destroy; overhaul unit test for destroy method. 2012-11-26 10:28:23 +01:00
Jörn Zaefferer
999617343f Dialog: Pass through icons and showText (as 'text') options to button. Fixes #6830 - Allow Icons to be specified for Dialog buttons. 2012-11-26 10:28:23 +01:00
Jörn Zaefferer
4c9caa8169 Dialog: Extract button pane creation into _createButtonPane 2012-11-26 10:28:22 +01:00
Jörn Zaefferer
fed2972027 Dialog: Refactor _setOption to call _super early. Move dialogClass update above that to access old option value. 2012-11-26 10:28:22 +01:00
Jörn Zaefferer
83a9f219bf Dialog: Use button widget for close button (was already listed as dependency) 2012-11-26 10:28:21 +01:00
Jörn Zaefferer
0848040d3e Dialog: Focus tabbable only when dialog lost focus before. 2012-11-26 10:26:12 +01:00
Jörn Zaefferer
6edce86733 Dialog: Remove attroperty workaround for title attribute. Make the default null, as it should be. No back-compat, as the behaviour doesn't change. 2012-11-26 10:26:12 +01:00
Jörn Zaefferer
4632780435 Dialog: Fix yoda-if, remove unnecessary TODOs; add missing callbacks to commons test 2012-11-26 10:26:11 +01:00
Felix Nagel
e25cdd88e7 Merge branch 'master' into selectmenu 2012-11-23 13:49:12 +01:00
Felix Nagel
0d4a8dca55 Selectmenu tests: Upgrade jQuery to 1.8.3 2012-11-23 13:45:01 +01:00
kborchers
d3bc471688 Progressbar: Add ability to set value: false for an indeterminate progressbar. Fixes #7624 - Progressbar: Support value: false for indeterminate progressbar 2012-11-21 21:48:17 -06:00
Mike Sherov
70e013830d Button tests: fix IE7 fail for latest focus tests 2012-11-21 19:29:22 -05:00
TJ VanToll
93abe02b60 Button: Fixing handling of the disabled options on refresh method calls. Fixed #8828 - Button: Refresh does not re-enable disabled button. 2012-11-21 19:24:24 -05:00
Samuel Bovée
cb748b4a6f Slider: factorize code with Widget method call. Fixed #8772 - Wrong slider UI state when disabled at init 2012-11-21 19:18:00 -05:00
Mike Sherov
f13b5dfa7f Button: add blur event to buttons. Fixes #8559 - Button: Button doesn't remove active state when using keyboard. 2012-11-21 19:14:04 -05:00
Scott González
c348f2890c Button tests: Whitespace. 2012-11-20 12:52:26 -05:00
Mike Sherov
8cfee45ac9 Button tests: replace XHTML with HTML in button test suite 2012-11-19 09:23:05 -05:00
Roman Salnikov
7ffcaa2e3b Datepicker: reinitialize datepicker if mainDiv isn't on the page. Fixed #5679 - Datepicker should reinitialize if dpDiv is removed 2012-11-19 09:15:10 -05:00
mathias.stenbom
cf9fbce139 Draggable: made handles work with complex markup. Fixes #8757 - Draggable: Resizable handle with inner element does not work, when its also draggable 2012-11-19 09:06:50 -05:00
Mike Sherov
cc7df712cc Button: properly escape button names. Fixes #7505 - Button: Buttonset not applied to radio group with quotation/apostrophe in name. 2012-11-19 08:37:41 -05:00
Mike Sherov
a1b32b59d5 Resizable: use css() instead of position() for absolute placement. Fixes #3815 - Resizable: absolutely positioned element inside scrollable element is repositioned when resized 2012-11-17 01:29:39 -05:00
Scott González
23f7e30c77 Tabs: Remove ui-tabs-aria-controls data on destroy. 2012-11-16 16:10:22 -05:00
Scott González
8f46418c35 Slider tests: Don't use QUnit.reset() or on(). 2012-11-16 11:20:58 -05:00
Juan Pablo Kaniefsky
a18863205e Slider: when handles overlap, clicking and dragging will now pick the last one that was moved. Fixed #3467 - Sliders Handles can overlap, only small sliver of slider is selectable 2012-11-16 09:32:56 -05:00
Scott González
ccdceddd80 Datepicker tests: Work around encoding issues in oldIE. 2012-11-15 18:57:44 -05:00
Jörn Zaefferer
f86168bf6b Merge branch 'master' into selectmenu 2012-11-15 17:14:19 +01:00
Scott González
8c36603305 Dialog tests: Work around inconsistent handling of non-breaking spaces in IE7/8 with jQuery <1.8. 2012-11-15 10:47:36 -05:00
Scott González
fb6119e182 Upgrade jQuery to 1.8.3. 2012-11-14 15:22:01 -05:00
Scott González
1b503a237e Tooltip: Handle synthetic focusin events. Fixes #8740 - Tooltip: Does not hide consistently with dynamically loaded content. 2012-11-14 14:14:45 -05:00
Jay Merrifield
eca5abd873 Datepicker: Updated the range tests so you can't navigate past the yearRange. Fixes #7362 - Datepicker allows changing year to something outside yearRange 2012-11-13 21:08:55 -05:00
Felix Nagel
d24e62bade Selectmenu tests: lint fixes 2012-11-13 22:28:10 +01:00
Felix Nagel
2bb459f1b6 Selectmenu tests: lint fixes 2012-11-13 21:58:23 +01:00
Scott González
ff055a0c35 Datepicker tests: Fixed setting of option. 2012-11-13 10:34:31 -05:00
Scott González
608341d20d Tests: Commented out getElementStyles() while its not used. 2012-11-13 09:46:19 -05:00
Scott González
248e632f4d Tests: Temporarily remove style checks in domEqual(). 2012-11-13 09:38:29 -05:00
Ethan Romba
3974b55ba5 Resizable: Update CSS dimensions selectively. Fixes #7605 - Setting width and height when only one is changing 
Resizable: Trigger resize event only when element is resized. Fixes #5545 - Callbacks ignore the grid.

Resizable: Added event tests. Fixes #5817 - resize event reports unconstrained ui.size
 2012-11-12 21:41:22 -05:00
Felix Nagel
daec559c98 Merge branch 'master' into selectmenu 2012-11-12 23:28:24 +01:00
Scott González
902df84fce Tests: Allow async domEqual() tests. 2012-11-12 11:19:20 -05:00
David Petersen
d657538ed5 Accordion: Enhance refresh to allow adding/removing panels. Fixes #4672 - Accordion: ability to add/remove panels 2012-11-11 21:38:21 -05:00
Cory Gackenheimer
8e1ceba717 Button: use _hoverable for hover state management. Fixes #5295 - button doesn't remove hover state if they are disabled 2012-11-11 21:17:05 -05:00
Felix Nagel
7ce8e0515e Merge branch 'master' into selectmenu 2012-11-10 01:40:05 +01:00