Commit Graph

167 Commits

Author SHA1 Message Date
Andrew Ozz
4cdddd401a TinyMCE:
- Sanitize and render HTML in captions when showing a gallery preview (wpView).
- Encode/escape HTML entered in the text field in the wpLink dialog.

Props iseulde, kraftbj, jnylen0, shawarkhan.
Fixes #32616.
Built from https://develop.svn.wordpress.org/trunk@35341


git-svn-id: http://core.svn.wordpress.org/trunk@35307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-21 20:38:26 +00:00
Scott Taylor
2f0fc3b97d After [34048], restore the else statement for h (height of video) in wp_underscore_video_template().
See #33798.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-11 18:30:26 +00:00
Scott Taylor
4b4f08c7a0 In [30082], hardcoded heights were removed on the front end for videos rendered via shortcode. These values were not removed from the admin, which was an oversight.
See #33798.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-11 18:27:25 +00:00
Sergey Biryukov
f9e7fb306c Merge two similar strings.
Props dipesh.kakadiya.
Fixes #33777.
Built from https://develop.svn.wordpress.org/trunk@33998


git-svn-id: http://core.svn.wordpress.org/trunk@33967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-10 10:59:27 +00:00
Scott Taylor
767dd35a47 Media:
When inserting an image into a post, the values in `wp.media.controller.Library` should not default to linking the image when no user settings are present.

The default display setting value for `link` is now `none`. User settings persist and will override or confirm this value based on user actions.

Props liljimmi, janhenckens, eherman24, wonderboymusic.
Fixes #31467.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-25 12:13:23 +00:00
Konstantin Obenland
3248497cf3 Site Icon: Add crop preview to the media modal.
* Monkey patches imgAreaSelect library to support touch events.
* Removes Settings version of Site Icon since it would have been the same flow.
* Removes default value for Customizer setting - there is no default favicon.

Fixes #16434.



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


git-svn-id: http://core.svn.wordpress.org/trunk@33301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-20 15:57:25 +00:00
Sergey Biryukov
fa1b659d29 Merge two class attributes in WP_Customize_Media_Control::content_template() and wp_print_media_templates().
props nicholas_io.
fixes #32896.
Built from https://develop.svn.wordpress.org/trunk@33090


git-svn-id: http://core.svn.wordpress.org/trunk@33061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-06 14:19:26 +00:00
Sergey Biryukov
c99db2bc59 Media modal: Use better descriptive text for "Remove" buttons.
props afercia.
fixes #32792.
Built from https://develop.svn.wordpress.org/trunk@32972


git-svn-id: http://core.svn.wordpress.org/trunk@32943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-27 14:51:26 +00:00
Scott Taylor
72bf48f0b9 In Media microtemplates after [32467], use <button> instead of <a> for several more non-links.
Props afercia.
Fixes #26550.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-26 05:01:24 +00:00
Scott Taylor
b30b08fd92 Refresh attachment links in the media modal are unneeded since bringing the image editor into it in [27445].
Props rommelxcastro.
Fixes #32550.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-22 21:33:26 +00:00
Andrew Nacin
a0f4e8e086 Media: Support title fields to be removed from attachments.
props antpb.
fixes #23932.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 20:33:26 +00:00
Scott Taylor
4bf8e158ec Fix doc blocks for media*.php
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-26 19:23:25 +00:00
Helen Hou-Sandí
1e8a787aa1 Media: Visually align upload errors with other admin notices.
props sagarjadhav.
fixes #31874.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-15 16:19:26 +00:00
Scott Taylor
2251a28f1d In media-template.php, change a few <a href="#" class="button">s to <button type="button" class="button" ...>.
See #26550.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-09 06:07:25 +00:00
Andrew Ozz
60706015e1 Revert editing of video embed parameters in the media modal, [31620] and [31626] for now. Plan on revisiting in 4.3.
Props iseulde. Fixes #31139, fixes #32006.
Built from https://develop.svn.wordpress.org/trunk@32258


git-svn-id: http://core.svn.wordpress.org/trunk@32229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 22:41:26 +00:00
Helen Hou-Sandí
42028327a2 Insert from URL: Make sure the link text is actually used.
Turns out there were more pieces to renaming the field.

props iseulde.
fixes #29476.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-06 18:25:27 +00:00
Scott Taylor
3630732523 Remove the JS part of [31619].
Fixes #6820.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-01 16:34:27 +00:00
Helen Hou-Sandí
b6393c9d77 Media: UI tweaks for Insert from URL.
"Title" field is now labeled as "Link Text", to reflect how it's actually used. It's also hidden whenever the embed is updating, to make it clearer that something is happening. Embed dimension fields are shown below the preview, much like image property fields are shown below.

fixes #29476, see #31139.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-06 15:03:25 +00:00
Scott Taylor
cc953717b7 Allow inline editing of width and height parameters while previewing an embed in the media modal:
* Use `wp.shortcode()` instead of manually constructing a shortcode in `views/embed/link`
* Allow a URL to transition to a shortcode (and vice versa) when returning an embed to TinyMCE
* In `WP_Embed`, store the last URL and last set of attributes requested in class properties
* `wp_ajax_parse_embed()`, allow `[embed]`s to have attributes. Return `attr` in the response.

This is a first pass to allow broad testing with recent MCE view changes. 

See #31139.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-05 06:00:26 +00:00
Scott Taylor
d3471e9850 Allow attachments to be Detached from their parent in media grid and list modes.
See #6820.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-05 05:35:28 +00:00
Andrew Ozz
b799bd8e33 TinyMCE: wpView improvements:
- Better structure, simpler "view" registration, better extensibility.
- Better inline documentation.
- Don't show a placeholder for pasted link until we know the link is "embeddable'.
And many more improvements. Props iseulde. See #31412.
Built from https://develop.svn.wordpress.org/trunk@31546


git-svn-id: http://core.svn.wordpress.org/trunk@31527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-25 23:13:25 +00:00
Scott Taylor
952a5c9971 Support chromeless Vimeo via MEjs:
* Bump MediaElement script loader versions to 2.16.2 - missed in [30634], oops!
* Add `Froogaloop` to `js/mediaelement` scripts for Vimeo
* Check for Vimeo in the same locations that YouTube is checked
* Dynamically load Froogaloop script in admin when editing a TinyMCE view
* Edit MediaElement to call `mejs.$.extend` instead of `$.extend` in `mejs.HtmlMediaElementShim.createPlugin()`, since `$` is not available via WP's jQuery (I will report this upstream):
6f9a78e008/src/js/me-shim.js (L631)

Fixes #29267.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-31 20:41:24 +00:00
John Blackbourn
e93105ba9a Clarify the text for the 'Edit Selection' link when multiple media items are selected in the media manager.
Props adamsilverstein
See #24325

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


git-svn-id: http://core.svn.wordpress.org/trunk@30675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 04:15:23 +00:00
Scott Taylor
75d347b259 Add size to the UI for Gallery Settings in the media modal. Ensure that the TinyMCE view is refreshed when size changes.
Props richardmtl, noplanman, wonderboymusic.
Fixes #18143.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 03:45:16 +00:00
Sergey Biryukov
10e0807cce Add context for 'Trash' string in media modal.
props pavelevap.
fixes #29739.
Built from https://develop.svn.wordpress.org/trunk@29764


git-svn-id: http://core.svn.wordpress.org/trunk@29536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-24 13:49:20 +00:00
Sergey Biryukov
0113d3457b Avoid PHP notices in media modal caused by orphaned attachments.
fixes #29566 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29724


git-svn-id: http://core.svn.wordpress.org/trunk@29498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-09 10:03:14 +00:00
Sergey Biryukov
092c349443 Don't display Edit links for attachments user cannot edit.
props skaeser.
fixes #29596 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29723


git-svn-id: http://core.svn.wordpress.org/trunk@29497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-09 09:50:15 +00:00
Sergey Biryukov
1eb26d3ff3 Use https for apps.wordpress.org links.
props pento.
fixes #29595 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29721


git-svn-id: http://core.svn.wordpress.org/trunk@29495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-09 06:29:15 +00:00
Andrew Nacin
0b3ba1e405 Media grid details: Load large images instead of originals, if available.
fixes #29498.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 14:38:16 +00:00
Andrew Nacin
00fac0639d Link to apps.wordpress.org instead of wordpress.org/mobile.
props pento.
fixes #29496.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 14:22:15 +00:00
Andrew Nacin
38af73bfab Only media grid (not modal) should show "Uploaded by" and "Uploaded to".
props wonderboymusic.
fixes #29482.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 02:17:18 +00:00
Andrew Ozz
04e28b468c Media modal: fix the progress bar in the attachment thumbnail. Props gcorne, fixes #29367
Built from https://develop.svn.wordpress.org/trunk@29609


git-svn-id: http://core.svn.wordpress.org/trunk@29383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-25 22:45:16 +00:00
Sergey Biryukov
aed104c51b Don't display an empty "Uploaded To" link in the media modal after [29436].
see #28844.
Built from https://develop.svn.wordpress.org/trunk@29537


git-svn-id: http://core.svn.wordpress.org/trunk@29313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-19 07:24:16 +00:00
Dominik Schilling
a28bc71819 Media Modal: Restore to the previous filter and search error message.
fixes #28963.
Built from https://develop.svn.wordpress.org/trunk@29532


git-svn-id: http://core.svn.wordpress.org/trunk@29308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-18 16:28:19 +00:00
Scott Taylor
3736e6b3f9 Media Modal: don't show the "Edit Image" button for attachments that don't have data.sizes set.
Fixes #28038.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-18 02:42:17 +00:00
Scott Taylor
c71437b94b Media Grid: don't try to display images that don't have data.sizes set. Also, don't show the "Edit Image" button.
Props ocean90.
Fixes #29245.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-18 02:35:17 +00:00
Helen Hou-Sandí
92e373eb47 Small screen responsive for attachment details modal. see #28844.
Built from https://develop.svn.wordpress.org/trunk@29496


git-svn-id: http://core.svn.wordpress.org/trunk@29274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-15 04:10:16 +00:00
Scott Taylor
df4cc86671 Media Grid, support MEDIA_TRASH:
* Only use the special `trashAttachment` logic when in `edit-metadata` mode.
* Don't support the `trash` filter in the Add Media modal for now.
* Properly toggle trash/untrash logic in the Attachment Details sidebar

See #29145.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-14 18:51:19 +00:00
Scott Taylor
571111022e Media Grid, support MEDIA_TRASH:
* Add a setting to `_wpMediaViewsL10n.settings`: `mediaTrash`
* In the attachment edit modal, properly toggle between Trash/Untrash
* In `media.view.Attachment`, add a method for `untrashAttachment`
* When creating the grid toolbar, switch the setting order of subviews so that `media.view.DeleteSelectedButton` can listen to the instance of `media.view.AttachmentFilters.All` to update the text in its UI.
* Add a new filter to `media.view.AttachmentFilters.All`, `trash`, when `settings.mediaTrash` is true
* Allow the cached queries in `Query.get()` to be flushed when race conditions exist and collections need to be refreshed. This is currently only being used when `MEDIA_TRASH` is set, to refresh the filtered/mirrored collections related to `all`, `trash`, and any already queried filter.
* Cleanup the bootstrapping of `media.view.MediaFrame.Manage`
* Allow `wp_ajax_query_attachments()` to return items from the trash when `MEDIA_TRASH` is `true`
* Allow `wp_ajax_save_attachment()` to set `post_status` when `MEDIA_TRASH` is `true`. It allows `wp_delete_post()` to be called, which will trash the attachment instead of deleting when the flag is set.

Props koop for the knowledge sharing and thought partnership.
See #29145.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-14 18:31:19 +00:00
Scott Taylor
1c93f05e2a Upgrade MediaElement to 2.15.0:
* It is required to set `height` on the parent `.wp-video` wrapper for video
* Fixes the play button hover problem in Chrome
* Includes my pull request: https://github.com/johndyer/mediaelement/pull/1273

All changes:
https://github.com/johndyer/mediaelement/compare/2.14.2...master

See #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-09 20:44:17 +00:00
Scott Taylor
28c22db07d Video:
* Don't set height on responsive `<div>` when generating markup
* Move some CSS rules from the style tag to `.wp-video`
* Use Video Details view event delegation instead of click events delegated from `<body>`
* Fix some CSS rule collision in the grid modal

See #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-09 19:39:15 +00:00
Helen Hou-Sandí
485229bc64 Revert styling changes to the Attachment Details modal from [29289]. fixes #28844.
Built from https://develop.svn.wordpress.org/trunk@29436


git-svn-id: http://core.svn.wordpress.org/trunk@29214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-07 20:32:16 +00:00
Scott Taylor
b053fe2e04 Video: use auto instead of actual height for the responsive wrapper in generated markup.
See #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-07 06:20:15 +00:00
Scott Taylor
b938bfb7d5 MediaElement upgrade: cleanup for generated markup for videos.
See #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-07 05:53:15 +00:00
Scott Taylor
582b5144b2 Media Grid: after [28996], use the same cover size for audio/video files that images use for thumbnails.
See #24716.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-06 19:33:14 +00:00
Andrew Ozz
e6b0d0c9ee Media modal/grid: remove thumbnail resizing from JS, only keep setting number of columns. Props avryl, see #27423.
Built from https://develop.svn.wordpress.org/trunk@29376


git-svn-id: http://core.svn.wordpress.org/trunk@29154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-05 05:20:18 +00:00
Andrew Ozz
a8fd1330ae Media modal: use the same classes to hide the "or" that is above the "Select files" button when no drag-drop support. See #28851.
Built from https://develop.svn.wordpress.org/trunk@29373


git-svn-id: http://core.svn.wordpress.org/trunk@29151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-04 21:17:16 +00:00
Dominik Schilling
e6513fe33b Media Modal: Restore uploader view, when no items are found.
see #28963.
Built from https://develop.svn.wordpress.org/trunk@29364


git-svn-id: http://core.svn.wordpress.org/trunk@29140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-02 20:47:16 +00:00
Sergey Biryukov
3f3395a086 Avoid PHP notices in Media Library if an attachment parent post type no longer exists.
Synchronize the 'edit_post' capability check between the list table and the media grid.

fixes #27446.
Built from https://develop.svn.wordpress.org/trunk@29320


git-svn-id: http://core.svn.wordpress.org/trunk@29101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-29 01:41:16 +00:00
Dominik Schilling
a777a561fa Media Grid: Add context for "or" in [29296].
see #28851.
Built from https://develop.svn.wordpress.org/trunk@29303


git-svn-id: http://core.svn.wordpress.org/trunk@29085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-26 14:37:19 +00:00