Commit Graph

44 Commits

Author SHA1 Message Date
Andrew Ozz
34e409ddd8 Fix typo in [30361], see #30147.
git-svn-id: https://develop.svn.wordpress.org/trunk@30362 602fd350-edb4-49c9-b593-d223f7449a82
2014-11-16 23:14:49 +00:00
Andrew Ozz
d2b8163078 TinyMCE: don't show image toolbar for placeholder images. See #30147.
git-svn-id: https://develop.svn.wordpress.org/trunk@30361 602fd350-edb4-49c9-b593-d223f7449a82
2014-11-16 23:11:14 +00:00
Andrew Ozz
307639954a TinyMCE: enhance the inline toolbar for images:
- Add alignment (left, center, right, none) buttons.
- Position the menu above the image when possible, except on iOS.
- Fix selecting images on iOS.
First run, part props avryl. See #30147.

git-svn-id: https://develop.svn.wordpress.org/trunk@30318 602fd350-edb4-49c9-b593-d223f7449a82
2014-11-13 00:55:22 +00:00
Andrew Ozz
a454872630 TinyMCE: update to 4.1.6+. Adds support for cache-busting when auto-loading JS and CSS. Change the tests to run in /build. Changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt.
Fixes #30079

git-svn-id: https://develop.svn.wordpress.org/trunk@29994 602fd350-edb4-49c9-b593-d223f7449a82
2014-10-23 02:07:15 +00:00
Andrew Ozz
1190ed50a8 TinyMCE: fix image captions regexp when wpautop is disabled in wp_editor(). Fixes #29592 for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@29730 602fd350-edb4-49c9-b593-d223f7449a82
2014-09-10 23:02:05 +00:00
Andrew Ozz
197b2c6cdc TinyMCE: fix the keycode check when removing the Edit/Delete toolbar from images on keydown, see #28705
git-svn-id: https://develop.svn.wordpress.org/trunk@29541 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-19 19:13:08 +00:00
Andrew Ozz
885a072da6 Fix typo in the 'wpeditimage' plugin, see #28705
git-svn-id: https://develop.svn.wordpress.org/trunk@29540 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-19 18:42:56 +00:00
Andrew Ozz
ed01241d4b TinyMCE: fix the edit image and wpview buttons on touch screen PCs, fixes #29235.
git-svn-id: https://develop.svn.wordpress.org/trunk@29521 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-17 20:10:16 +00:00
Andrew Ozz
169a5ae561 TinyMCE: fix the 'editimage' plugin for touch devices. Better attempt to hide the onscreen keyboard when the media modal opens and TinyMCE is in focus. See #28595, #29166
git-svn-id: https://develop.svn.wordpress.org/trunk@29471 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-12 04:26:13 +00:00
Andrew Ozz
5b2ae73e18 TinyMCE: update wpview and editimage plugins for 4.1.3. Add show/hide of the Edit and Delete buttons on views and images on 'touchend'. See #28595, #29166
git-svn-id: https://develop.svn.wordpress.org/trunk@29463 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-10 04:21:46 +00:00
Andrew Ozz
0f01ebb037 TinyMCE: add support for class attribute on the caption shortcode. Part props knutsp, kadamwhite, fixes #28951.
git-svn-id: https://develop.svn.wordpress.org/trunk@29380 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-06 00:57:12 +00:00
Andrew Ozz
040ac15f50 TinyMCE: fix alignment buttons when used on image with caption. Remove old/unneeded code. Fixes #28705.
git-svn-id: https://develop.svn.wordpress.org/trunk@29370 602fd350-edb4-49c9-b593-d223f7449a82
2014-08-04 00:51:19 +00:00
Andrew Ozz
6418ba1696 Regex should be non-greedy, see #28389
git-svn-id: https://develop.svn.wordpress.org/trunk@28615 602fd350-edb4-49c9-b593-d223f7449a82
2014-05-29 07:55:17 +00:00
Andrew Ozz
8f5ea4bacd TinyMCE: fix problems with undo/redo after resizing an image several times. Fixes #28389.
git-svn-id: https://develop.svn.wordpress.org/trunk@28614 602fd350-edb4-49c9-b593-d223f7449a82
2014-05-29 07:50:35 +00:00
Andrew Ozz
a6de675d14 TinyMCE: when adding a caption to an image that is in a paragraph with other text, move the caption node above the paragraph instead of below. See #27922, for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@28190 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-23 20:41:59 +00:00
Andrew Ozz
07885ba6c9 Add hooks to the wpeditimage tinymce plugin and to the image details portion of the media modal.
- Add wp.media.events which is intended to be a global media event bus.
- Add a post-render event to the ImageDetails view that third-party code can leverage to add subviews.
- Performance improvement for the initialization of the PostImage model.
- A bit more markup to the image details template to make it easier to add a view to the advanced options.
Props gcorne, fixes #27698

git-svn-id: https://develop.svn.wordpress.org/trunk@28095 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-13 04:01:53 +00:00
Andrew Ozz
3396375d47 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

git-svn-id: https://develop.svn.wordpress.org/trunk@28094 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-13 00:22:56 +00:00
Andrew Ozz
ee33326f32 Edit image modal:
- Make the calculation of the aspect ratio more robust.
- Better getting of the image height and width.
Props gcorne, see #27366

git-svn-id: https://develop.svn.wordpress.org/trunk@27942 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-04 01:48:24 +00:00
Andrew Ozz
26391af850 Edit Image modal:
- Fix issue with adding a link to an image that didn't have one previously.
- Adjust the look-and-feel of the advance options toggle so that it becomes a section heading that can be open/closed.
- Add a Custom Size option to the size drop-down that reveals fields for soft-resizing the image inserted into the post.
Props gcorne, and props sdasse for the design help, see #27366

git-svn-id: https://develop.svn.wordpress.org/trunk@27918 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-03 03:20:40 +00:00
Andrew Ozz
d4f99c2142 Edit Image modal:
- Move all advanced options under a single “Show advanced options” toggle that mirrors the behavior and look-and-feel of the wplink modal.
- Switch to using <select> for the Size and Link To.
- Bring back the field for CSS Class for the image, but don’t incorporate the internally managed WordPress classes (size-, wp-image-, etc…).
- On larger screen sizes, float labels to the left. When the width drops below 900px, stack the label above the fields.
- Keep image at top on screen sizes where the two columns are stacked into a single column.
- Don't replace the nodes in the editor DOM so we don't stomp on any custom attributes that the user may have added via the Text editor or some other mechanism.
Props gcorne, see #27366

git-svn-id: https://develop.svn.wordpress.org/trunk@27898 602fd350-edb4-49c9-b593-d223f7449a82
2014-04-02 01:53:56 +00:00
Andrew Ozz
bbe59d0487 Edit Image modal:
- Bring back some of the advanced settings.
- Make the layout two-column for wider screens, remove the sidebar, and shrink the modal a bit.
- The image reflects the size as inserted in the post as long as it doesn't overflow the column and is not too tall. Changing the size to another intermediate will also update the image "preview."
- Rename "Edit Image" to "Edit Original" to try and better communicate that editing the image will modify the media library item not just the image inserted into the post that is being edited.
(updates two PNGs from precommit)
Props gcorne, see #27366

git-svn-id: https://develop.svn.wordpress.org/trunk@27797 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-27 22:40:06 +00:00
Andrew Nacin
c5717f0aa1 Remove the TinyMCE image toolbar when the image is deleted via the keyboard.
props gcorne.
fixes #27527.


git-svn-id: https://develop.svn.wordpress.org/trunk@27786 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-27 18:06:13 +00:00
Helen Hou-Sandi
5db0c45614 MCE view controls:
* Move controls back over to the left, as they were before. Wide images and muscle memory have been causing frustration.
* Improve the experience and unify the UI of media view controls. Audio and video views now require an initial click to select before further interaction.
* CSS clean up and organization.

fixes #27320, #27542.


git-svn-id: https://develop.svn.wordpress.org/trunk@27777 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-27 07:01:38 +00:00
Andrew Ozz
a8fe109dcd Add the 'attachment_' prefix to caption IDs after editing, see #24409
git-svn-id: https://develop.svn.wordpress.org/trunk@27764 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-27 00:06:50 +00:00
Andrew Nacin
6b9eccd1f0 Add an .html4-captions class to the editor when HTML5 captions are not supported, for theme use.
see #26642.


git-svn-id: https://develop.svn.wordpress.org/trunk@27758 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-26 23:12:48 +00:00
Andrew Ozz
a00d98a8c2 TinyMCE: bring back removal of the size-* class when the user soft-resizes an image, see #24409
git-svn-id: https://develop.svn.wordpress.org/trunk@27694 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-25 00:15:37 +00:00
Scott Taylor
98921c5ca0 Let us pass jshint:core.
git-svn-id: https://develop.svn.wordpress.org/trunk@27693 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-24 23:01:15 +00:00
Andrew Nacin
71917873d4 Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.

There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.

As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding. 

The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.

The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.

props obenland, azaozz.
see #26642. also fixes #9066.


git-svn-id: https://develop.svn.wordpress.org/trunk@27668 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-24 02:04:56 +00:00
Helen Hou-Sandi
d80da6c3f4 Further unify and refine media and view control styling. see #27320.
git-svn-id: https://develop.svn.wordpress.org/trunk@27628 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-20 00:47:21 +00:00
Andrew Ozz
30a83e48e2 TinyMCE: move the caption and gallery toolbars to the right, fix selected gallery border/outline, see #27320
git-svn-id: https://develop.svn.wordpress.org/trunk@27579 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-18 02:29:45 +00:00
Andrew Ozz
20eabd30ef TinyMCE:
- Update the styling of the image caption and gallery toolbars.
- Fix issue where the hidden clipboard div in wpView.
- Switch to using the pencil dashicon for Edit.
- Add `max-width: 100%;` to images in the gallery preview and adjust column widths.
Props cramdesign, mattheu, gcorne, melchoyce, see #27320, fixes #27376, fixes #27354


git-svn-id: https://develop.svn.wordpress.org/trunk@27578 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-18 00:19:17 +00:00
Andrew Ozz
5e5caca113 TinyMCE editimage: show the toolbar on mouseup to avoid accidental clicks on the buttons, fixes #24409
git-svn-id: https://develop.svn.wordpress.org/trunk@27451 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-07 06:33:06 +00:00
Andrew Ozz
e3b214f047 TinyMCE: when parsing [caption] and the width attribute is missing, recreate it from the image tag width, fixes #23103
git-svn-id: https://develop.svn.wordpress.org/trunk@27426 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-06 00:12:08 +00:00
Andrew Ozz
5e8787d0de When closing the various "edit" media modals, remove the related views elements from the DOM. Props gcorne, fixes #27204.
git-svn-id: https://develop.svn.wordpress.org/trunk@27276 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-25 21:02:22 +00:00
Andrew Ozz
fd19c371d1 Edit image in TinyMCE:
- Add a "toolbar" at the top of the image with two buttons: Edit and Delete.
- Don't open the edit modal on second click on the image. Makes the "edit" button somewhat pointless and can sometimes trigger after resizing the image.
- When the image has caption: attempt to prevent IE11 from making the caption element resizable and wrapping it in thick border.
- When the caret is inside a caption next to the image, pressing Enter will create a new <p> tag above the caption.
- Hide the image toolbar on drag, cut, align.
Props gcorne, see #24409.

git-svn-id: https://develop.svn.wordpress.org/trunk@27159 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-10 23:47:34 +00:00
Andrew Ozz
5a3fb502cb TinyMCE: set the proper caption width when clicking image resize handle on image with caption. Props gcorne, fixes #27009, see #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@27098 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-05 02:06:10 +00:00
Scott Taylor
031414171e For starters, [27050] is rad. This just cleans up some extra new lines that were littered about, updates *some* of the inline docs (needs more), moves wp.media.controller.ImageDetails closer to its parent class, and de-dupes some code in media-template.php.
See #24409.



git-svn-id: https://develop.svn.wordpress.org/trunk@27051 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-28 23:20:04 +00:00
Andrew Ozz
20f89d7c4b Introduce Edit Image (single mode) in the media modal and use it to edit images inserted in the editor. Adds new feature: replace an image in the editor. Props gcorne, see #24409.
git-svn-id: https://develop.svn.wordpress.org/trunk@27050 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-28 21:16:42 +00:00
Andrew Ozz
e18603ce49 TinyMCE: add/remove the 'alignnone' class when aligning images without captions. See #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@26942 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-14 05:51:41 +00:00
Andrew Ozz
1e3460cea3 TinyMCE: re-enable soft resizing of images inside the editor. See #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@26934 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-13 01:12:20 +00:00
Andrew Ozz
a18943fd1b TinyMCE: 'wpdialogs' plugin, don't add the (external) UI dialogs element to the internal windows array, fix .close(). See #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@26900 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-04 01:27:59 +00:00
Andrew Ozz
83509b3969 TinyMCE:
- Fix removing leftovers from broken captions.
- Better filter for line breaks and <br> tags when editing captions.
See #24067.

git-svn-id: https://develop.svn.wordpress.org/trunk@26882 602fd350-edb4-49c9-b593-d223f7449a82
2013-12-31 03:09:34 +00:00
Andrew Ozz
c37a101100 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@26880 602fd350-edb4-49c9-b593-d223f7449a82
2013-12-30 01:53:25 +00:00
Andrew Ozz
14ace125ee 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@26876 602fd350-edb4-49c9-b593-d223f7449a82
2013-12-28 23:52:04 +00:00