Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-28 20:17:45 +01:00
Code Issues Projects Releases Wiki Activity
33,355 Commits 50 Branches 749 Tags 806 MiB
146320744f
Commit Graph

108 Commits

Author SHA1 Message Date
Andrew Ozz
61292620c5 Editor scrolling: 
- Pin the TinyMCE statusbar (elements path) to the bottom.
- Add support for pinning the menu when present.
- Add borders from CSS.
- Optimize getting most elements outerHeight.
Part props avryl, fixes #29293, see #28328.
Built from https://develop.svn.wordpress.org/trunk@29579


git-svn-id: http://core.svn.wordpress.org/trunk@29353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-24 05:11:16 +00:00
Andrew Ozz
c0fef55a47 DFW: revert applying the Visual editor body color and background-color for now. Set the color to #333 and the background to transparent. Fixes #28330. 
Built from https://develop.svn.wordpress.org/trunk@29533


git-svn-id: http://core.svn.wordpress.org/trunk@29309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-18 18:23:16 +00:00
Andrew Ozz
b8198ecf64 Media: improve the media modal at small screen sizes and make it usable on phones, first run. Part-props gcorne, see #27423. 
Built from https://develop.svn.wordpress.org/trunk@29446


git-svn-id: http://core.svn.wordpress.org/trunk@29224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-08 03:46:17 +00:00
Mark Jaquith
61a0551529 Match background color in DFW and adapt the dashed outline color. 
fixes #28330. props avryl, ipstenu.
Built from https://develop.svn.wordpress.org/trunk@29340


git-svn-id: http://core.svn.wordpress.org/trunk@29120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-01 18:10:16 +00:00
Andrew Ozz
77599cd99b wpLink: add keyboard navigation, improve accessibility. Props afercia, fixes #28897. 
Built from https://develop.svn.wordpress.org/trunk@29321


git-svn-id: http://core.svn.wordpress.org/trunk@29102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-29 03:16:17 +00:00
Dominik Schilling
de8961d631 Update the versions of several devDependencies in package.json. 
Run `npm update` in the project root to receive updates.

props mjbanks, jorbin, netweb.
see #27340.
Built from https://develop.svn.wordpress.org/trunk@29270


git-svn-id: http://core.svn.wordpress.org/trunk@29052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-22 20:41:44 +00:00
Andrew Ozz
f43f758197 TinyMCE: better "color preview" for the text color button, props avryl, fixes #28280. 
Built from https://develop.svn.wordpress.org/trunk@29231


git-svn-id: http://core.svn.wordpress.org/trunk@29015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-18 22:15:15 +00:00
Andrew Ozz
a97559bf57 Editor scrolling: better "scroll into view" in the visual editor. Don't override MCE path focus style. Props avryl, see #28328. 
Built from https://develop.svn.wordpress.org/trunk@29186


git-svn-id: http://core.svn.wordpress.org/trunk@28970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-16 04:06:16 +00:00
Helen Hou-Sandí
1a8c136d33 Editor scrolling: 
* Make sure the background color for tools is only applied to the main editor.
* Fix toolbar width for smaller screens.
* Ensure toolbar doesn't end up in a weird place when scrolling down too fast.
* Avoid JS errors for post types that don't support the editor.

props avryl. see #28328.

Built from https://develop.svn.wordpress.org/trunk@29075


git-svn-id: http://core.svn.wordpress.org/trunk@28861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-10 19:36:15 +00:00
Andrew Ozz
5e4a020ff8 Enhance the editor on the Add/Edit Post screens, first run. Props avril, see #28328. 
Built from https://develop.svn.wordpress.org/trunk@29049


git-svn-id: http://core.svn.wordpress.org/trunk@28837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-09 22:06:15 +00:00
Sergey Biryukov
d882dc9782 Fix arrow positioning in "Insert/edit link" modal. 
props avryl, sergej.mueller.
fixes #28096.
Built from https://develop.svn.wordpress.org/trunk@28236


git-svn-id: http://core.svn.wordpress.org/trunk@28064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-01 21:21:15 +00:00
Andrew Nacin
1613157773 Editor: Shrink the font size for the chosen format so it fits in more locales. 
props SergeyBiryukov.
see #27903, for trunk.

Built from https://develop.svn.wordpress.org/trunk@28180


git-svn-id: http://core.svn.wordpress.org/trunk@28011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-22 13:24:15 +00:00
Andrew Ozz
3de93ccba3 DFW: 
- Add background color and remove the top border from the status bar (at the bottom).
- Fix spinner to always be next to the Save button.
- Remove width: auto; from .mce-fixed-width.
Fixes #27709
Built from https://develop.svn.wordpress.org/trunk@28116


git-svn-id: http://core.svn.wordpress.org/trunk@27947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-14 08:15:16 +00:00
Andrew Ozz
dc52e17417 RTL for TinyMCE: 
- Add _dir: 'rtl' to the TinyMCE translation object.
- Fix editor.css for RTL.
- Fix the Edit and Delete buttons position for wpview and images.
- For _mce_set_direction(), update documentation and fix adding the 'ltr' button.
Fixes #27773
Built from https://develop.svn.wordpress.org/trunk@28094


git-svn-id: http://core.svn.wordpress.org/trunk@27925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-13 00:23:15 +00:00
Andrew Ozz
fd0ae7e406 Precommit cleanup for theme.js, editor.css amd wpdialogs/plugin.js, See #27055, #26907, #16284 
Built from https://develop.svn.wordpress.org/trunk@28045


git-svn-id: http://core.svn.wordpress.org/trunk@27875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-08 08:29:14 +00:00
Andrew Ozz
268092761d DFW: 
- Move the word count and "Just Write" to a fixed bar at the bottom.
- Fix responsive mode to 480px. Narrower screens will have a scroll bar.
- Hide the Help button on screens < 480px, move the Save button to the right, make it bigger to match the others, and other responsive mode fixes.
Fixes #26907, see #27709
Built from https://develop.svn.wordpress.org/trunk@28043


git-svn-id: http://core.svn.wordpress.org/trunk@27873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-08 07:49:14 +00:00
Andrew Ozz
a6299d337c TinyMCE: couple more small css tweaks for the menubar and tabs in native modals, see #27279 
Built from https://develop.svn.wordpress.org/trunk@27983


git-svn-id: http://core.svn.wordpress.org/trunk@27813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-07 07:11:15 +00:00
Andrew Ozz
956301ece7 TinyMCE: 
- Tighten up button styles, add :hover for .mce-active buttons.
- Pad only the first toolbar row and remove the padding in both toolbars if the editor doesn't have a DFW mode.
Part props avryl, see #27279
Built from https://develop.svn.wordpress.org/trunk@27978


git-svn-id: http://core.svn.wordpress.org/trunk@27808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-07 01:10:15 +00:00
Andrew Ozz
08770f6b88 wpLink: fix spinners selectors and add some throttling when searching with AJAX while the user is typing, fixes #27615 
Built from https://develop.svn.wordpress.org/trunk@27900


git-svn-id: http://core.svn.wordpress.org/trunk@27731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-02 02:27:16 +00:00
Andrew Ozz
bfaf007e97 Editor: 
- Use standard button styles for the Quicktags buttons.
- Better style for the TinyMCE buttons (hover/focus/active/disabled).
- Move the fullscreen (DFW) button to the right.
- Better style for the Visual/Text buttons in DFW.
Props avryl, see #27279
Built from https://develop.svn.wordpress.org/trunk@27857


git-svn-id: http://core.svn.wordpress.org/trunk@27688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-29 23:58:14 +00:00
Andrew Ozz
aa1505ead2 Fix styling for mce-path (at the bottom of the editor), see #26952 
Built from https://develop.svn.wordpress.org/trunk@27831


git-svn-id: http://core.svn.wordpress.org/trunk@27665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-29 00:19:14 +00:00
Helen Hou-Sandí
a85fd485d4 Allow the fullscreen editor's content area to also be responsive. props avryl. fixes #27569. 
Built from https://develop.svn.wordpress.org/trunk@27821


git-svn-id: http://core.svn.wordpress.org/trunk@27655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-28 17:38:15 +00:00
Andrew Ozz
eb146fd12d Make DFW usable on touch devices: change the toolbar to two rows and keep it and borders visible. See #26907 
Built from https://develop.svn.wordpress.org/trunk@27806


git-svn-id: http://core.svn.wordpress.org/trunk@27640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-28 04:40:14 +00:00
Andrew Ozz
56b7043a90 Set the default font family to inherit (Open Sans) in all TinyMCE modals, change the cursor to pointer when hovering over Quicktags buttons. Props avryl, see #27279 
Built from https://develop.svn.wordpress.org/trunk@27791


git-svn-id: http://core.svn.wordpress.org/trunk@27627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-27 19:19:14 +00:00
Dominik Schilling
4038e52276 Add some missing CSS prefixes. props grunt autoprefixer:core. 
Built from https://develop.svn.wordpress.org/trunk@27790


git-svn-id: http://core.svn.wordpress.org/trunk@27626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-27 19:17:15 +00:00
Andrew Nacin
043bc12b49 TinyMCE: Differentiate active and hover states for toolbar buttons like the kitchen sink. 
This restores 3.8 behavior.

see #27279.

Built from https://develop.svn.wordpress.org/trunk@27778


git-svn-id: http://core.svn.wordpress.org/trunk@27615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-27 07:19:15 +00:00
Helen Hou-Sandí
2406bba954 Match TinyMCE modal form element focus styling to the admin. props paulwilde. see #27173. 
Built from https://develop.svn.wordpress.org/trunk@27771


git-svn-id: http://core.svn.wordpress.org/trunk@27608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-27 02:36:14 +00:00
Helen Hou-Sandí
c3b59e06b8 Better, more consistent styling for plugin details Thickbox and TinyMCE help. 
props avryl. fixes #26952.

Built from https://develop.svn.wordpress.org/trunk@27765


git-svn-id: http://core.svn.wordpress.org/trunk@27602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-27 00:08:15 +00:00
Andrew Ozz
08663710cb TinyMCE: add internal command and shortcut (Alt+Shift+X) for toggling <code>. Define a button that can be added to any toolbar as wp_code. See #6113 
Built from https://develop.svn.wordpress.org/trunk@27545


git-svn-id: http://core.svn.wordpress.org/trunk@27388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-14 22:43:16 +00:00
Andrew Ozz
93ec80e732 Modals: darken all overlays, update all box-shadows and headings, correct thickbox styling, make the link modal narrower and bring back the animation (css transition). Props avryl, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27532


git-svn-id: http://core.svn.wordpress.org/trunk@27375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-14 05:55:16 +00:00
Andrew Ozz
2a7918390b TinyMCE modals: re-enable the Close button in charmap, fix arrows in listboxes, add and position dashicons to the menu (when visible), see #26952 
Built from https://develop.svn.wordpress.org/trunk@27513


git-svn-id: http://core.svn.wordpress.org/trunk@27356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-12 08:19:14 +00:00
Andrew Ozz
d1008b2dfe wpLink: bring back the Cancel link, improve responsive styles, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27510


git-svn-id: http://core.svn.wordpress.org/trunk@27353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-12 03:07:15 +00:00
Andrew Ozz
45bc43515c wpLink: better structural and responsive styles, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27496


git-svn-id: http://core.svn.wordpress.org/trunk@27338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-11 03:36:14 +00:00
Andrew Ozz
36d0458c78 wpLink: set max-height to 500px (like before) and vertically center the modal (except in IE8), see #26952 
Built from https://develop.svn.wordpress.org/trunk@27495


git-svn-id: http://core.svn.wordpress.org/trunk@27337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-11 02:36:14 +00:00
Andrew Ozz
05e23f7506 wpLink: stop using UI dialog, restyle the modal, add better responsive behaviour. 
Fix UI dialog styling to match the rest of the admin styling.
Props avryl, see #26952
Built from https://develop.svn.wordpress.org/trunk@27494


git-svn-id: http://core.svn.wordpress.org/trunk@27336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-11 00:04:14 +00:00
Andrew Ozz
a8a20f4bb7 Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27460


git-svn-id: http://core.svn.wordpress.org/trunk@27305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-08 00:41:16 +00:00
Andrew Ozz
9c77339681 TinyMCE: revert style for the blocks drop-down in the toolbar, limit the styles imported for the same drop-down, make the menu highlight color grey. Part props avryl, see #26952 
Built from https://develop.svn.wordpress.org/trunk@27193


git-svn-id: http://core.svn.wordpress.org/trunk@27052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-19 03:51:15 +00:00
Andrew Ozz
d7db798635 TinyMCE: style the modals to match WordPress admin (first-run). Fix couple of IE problems in tiny_mce_popup.js. Props avryl, see #26952, see #24067 
Built from https://develop.svn.wordpress.org/trunk@27190


git-svn-id: http://core.svn.wordpress.org/trunk@27049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-18 06:32:14 +00:00
Andrew Ozz
1bce8d5b7e TinyMCE: wrap the toolbars buttons on narrow screens, props mikemanger, fixes #26882 
Built from https://develop.svn.wordpress.org/trunk@27182


git-svn-id: http://core.svn.wordpress.org/trunk@27043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-17 02:13:13 +00:00
Andrew Nacin
11c3695c77 Dev/build tools: Use grunt-autoprefixer for CSS vendor prefixes. 
We'll be using it for two distinct tasks:
 * Core CSS files will keep prefixes. `grunt autoprefixer:core` will update files directly in src/ as a pre-commit step, rather than doing it on build.
 * Color CSS files will receive prefixes when they are built.

This commit:
 * Adds prefixes we were missing to core CSS.
 * Removes prefixes that we no longer need from core CSS.
 * Removes all prefixes from colors CSS.

props ocean90.
fixes #27078.

Built from https://develop.svn.wordpress.org/trunk@27174


git-svn-id: http://core.svn.wordpress.org/trunk@27038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-13 08:30:17 +00:00
Andrew Ozz
20fe8f026e TinyMCE: fix styling in the Charmap modal so the click targets are as large as the table cells. Remove the "Close" button and close the modal after inserting the special char. Fixes #27107. 
Built from https://develop.svn.wordpress.org/trunk@27165


git-svn-id: http://core.svn.wordpress.org/trunk@27031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-11 23:33:14 +00:00
Andrew Ozz
7e7723f1de Editor: add :focus style for the Quicktags buttons, fixes #26932 
Built from https://develop.svn.wordpress.org/trunk@27078


git-svn-id: http://core.svn.wordpress.org/trunk@26951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-02 22:38:12 +00:00
Andrew Ozz
ede5c4d01c TinyMCE: add outline when a button is focused. Fixes #26931, see #24067. 
Built from https://develop.svn.wordpress.org/trunk@27058


git-svn-id: http://core.svn.wordpress.org/trunk@26931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-29 18:14:13 +00:00
Scott Taylor
0347a8944e Update the versions of several devDependencies in package.json. grunt-cssjanus has been updated to 0.2.2, we no longer need the fork. Run npm install to receive updates for node_modules in the project root. 
Props yoavf, TobiasBg.
Fixes #26073.


Built from https://develop.svn.wordpress.org/trunk@27053


git-svn-id: http://core.svn.wordpress.org/trunk@26927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-29 04:43:30 +00:00
Andrew Ozz
544116e76a TinyMCE: add dashicon for the "wp_page" button, see #24067. 
Built from https://develop.svn.wordpress.org/trunk@27044


git-svn-id: http://core.svn.wordpress.org/trunk@26918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-27 15:06:32 +00:00
Andrew Ozz
87c75ab93a DFW: fix buttons and the title width, make the fade out/in when opening and closing a bit faster. See #24067. 
Built from https://develop.svn.wordpress.org/trunk@26896


git-svn-id: http://core.svn.wordpress.org/trunk@26779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-02 04:18:10 +00:00
Andrew Ozz
a16cc19790 TinyMCE: 
- Fix toolbar icons in IE9.
- Remove background gradients in IE < 10.
- Lint our plugins.
- Add draggable attribute to the caption wrapper and make the captioned images non-draggable in Chrome.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26880


git-svn-id: http://core.svn.wordpress.org/trunk@26763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-30 01:54:11 +00:00
Andrew Ozz
855889f7aa TinyMCE 4.0.12, first run. 
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876


git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-28 23:53:15 +00:00
Andrew Ozz
448a401f77 Make older mobile browsers and IE7 usable: 
- Text labels in the toolbar.
- Image icons in the visual editor.
- Some IE7 structural css fixes.
Fixes #26369.
Built from https://develop.svn.wordpress.org/trunk@26819


git-svn-id: http://core.svn.wordpress.org/trunk@26706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-09 02:41:10 +00:00
Andrew Nacin
1154c059ef RTL font-family overrides. (Tahoma generally, and Arial for Hebrew.) 
props yoavf.
fixes #24977.

Built from https://develop.svn.wordpress.org/trunk@26816


git-svn-id: http://core.svn.wordpress.org/trunk@26703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-09 01:31:11 +00:00
Andrew Nacin
9b45d73073 Add icon to the help button in distraction-free writing. 
props ocean90.
fixes #26450.

Built from https://develop.svn.wordpress.org/trunk@26722


git-svn-id: http://core.svn.wordpress.org/trunk@26611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-06 14:11:10 +00:00
Matt Thomas
8d6aa0ab25 Updating .wp-dialog styling to match the new admin design. Fixes #26328, props SergeyBiryukov, Ocean90. 
Built from https://develop.svn.wordpress.org/trunk@26528


git-svn-id: http://core.svn.wordpress.org/trunk@26421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-02 17:59:10 +00:00
Andrew Ozz
89d464d9e5 TinyMCE: fix editor.css. 
- Re-enable the default images for buttons not used in WordPress.
- Remove redundant styles for the old buttons sprite.
Fixes #26294.
Built from https://develop.svn.wordpress.org/trunk@26446


git-svn-id: http://core.svn.wordpress.org/trunk@26344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-28 00:53:09 +00:00
Matt Thomas
6a61711d24 Better alignment of Visual and Text tabs with editor, better alignment of word count container with editor, eliminate gap between tabs and editor on Press This. Fixes #26238, props mattheu. 
Built from https://develop.svn.wordpress.org/trunk@26411


git-svn-id: http://core.svn.wordpress.org/trunk@26311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-26 17:48:09 +00:00
Andrew Ozz
146abf4cde TinyMCE: use CSS classes instead of instance specific IDs for styling, props mattheu, fixes #26197. 
Built from https://develop.svn.wordpress.org/trunk@26364


git-svn-id: http://core.svn.wordpress.org/trunk@26265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-24 21:47:10 +00:00
Andrew Ozz
7efd903498 Fix the editor switching tabs position on small screens, props ryelle, fixes #26151. 
Built from https://develop.svn.wordpress.org/trunk@26315


git-svn-id: http://core.svn.wordpress.org/trunk@26219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-22 02:23:09 +00:00
Andrew Ozz
7276f56681 MP6: remove left-over plugin reference, see #25858 
Built from https://develop.svn.wordpress.org/trunk@26290


git-svn-id: http://core.svn.wordpress.org/trunk@26195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-20 19:24:10 +00:00
Andrew Nacin
fb69ea9028 Stop using .rtl classes, instead relying on flipping LTR CSS to RTL. 
props yoavf.
fixes #24977.

Built from https://develop.svn.wordpress.org/trunk@26243


git-svn-id: http://core.svn.wordpress.org/trunk@26150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-17 16:18:11 +00:00