Commit Graph

763 Commits

Author SHA1 Message Date
Drew Jaynes
d4dd02b4ae Remove backticks on $post variables in some short parameter descriptions.
See [28653], [28654].
See #28388.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-03 19:28:14 +00:00
Sergey Biryukov
428a83259e Avoing a PHP warning in media modal if the attached file does not exist.
props kovshenin.
see #24716.
Built from https://develop.svn.wordpress.org/trunk@28959


git-svn-id: http://core.svn.wordpress.org/trunk@28755 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-02 14:37:15 +00:00
Sergey Biryukov
f799048057 Pass $url parameter to wp_embed_defaults() and 'embed_defaults' filter.
props wpsmith, sabreuse, jacobdubail.
fixes #20151.
Built from https://develop.svn.wordpress.org/trunk@28923


git-svn-id: http://core.svn.wordpress.org/trunk@28722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-30 11:16:15 +00:00
Drew Jaynes
6216aa2331 Add documentation for the default playlist shortcode attributes in wp_playlist_shortcode().
Props taylorde.
Fixes #28678.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-29 21:29:17 +00:00
Andrew Ozz
b9fd9db83b Uploader: enable selecting multiple files on mobile devices (still doesn't work on Android). See #28640.
Built from https://develop.svn.wordpress.org/trunk@28847


git-svn-id: http://core.svn.wordpress.org/trunk@28651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-26 04:15:15 +00:00
Scott Taylor
2efb8f8507 When wp_oembed_add_provider() or wp_oembed_remove_provider() is called before the plugins_loaded hook has, store the values statically on the WP_oEmbed object and add them just-in-time when the object is instantiated.
This ensures that all plugins have an accurate provider list when `apply_filters( 'oembed_providers', $providers )` is called. 

Props kovshenin.
Fixes #28284.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-26 02:30:15 +00:00
Helen Hou-Sandí
b5ef672c6b Grid view for the media library, first pass. This is alpha; expect imperfection. We will be iterating further.
props ericlewis, shaunandrews, wonderboymusic.
see #24716.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-05 22:01:18 +00:00
Drew Jaynes
b0877f02a4 Make sure $post is properly documented as optional where applicable.
See #28388.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-03 03:53:17 +00:00
Scott Taylor
91e6a8c017 Because of YouTube's overwhelming dominance in the online video space, we should help our users who paste bad URLs when possible. It is easy to fix http://youtube.com/embed/acb1233 URLs by turning them into http://youtube.com/watch?v=abc1233 embeds using an embed handler (we already have one to fix Google Video embeds).
We should avoid doing this in almost every other case, but it's YouTube, and it's an easy error for a novice to make.

Fixes #24660.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-02 01:22:15 +00:00
Sergey Biryukov
2b6c8462b3 Avoid a PHP notice in adjacent_image_link() if no images were found.
props nabil_kadimi.
see #28361.
Built from https://develop.svn.wordpress.org/trunk@28584


git-svn-id: http://core.svn.wordpress.org/trunk@28409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-27 10:55:16 +00:00
Scott Taylor
dd25ef25d9 $count is set in get_post_galleries() and never used, relic from PFUI RIP.
See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-22 19:13:14 +00:00
Scott Taylor
abff6bf6cf $gallery_div is set twice in gallery_shortcode() before it is used.
See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-22 19:12:14 +00:00
Scott Taylor
e4bc49c244 Because PHP can be configured without --filter, it is not 100% safe to use filter_var(). This is problematic for casting "false" to false, as PHP always casts it to true. FILTER_VALIDATE_BOOLEAN fixes this, but it may not be available.
Add a new function, `wp_validate_boolean()`, to replace `filter_var( $var, FILTER_VALIDATE_BOOLEAN )`.

Fixes #28170.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-22 18:34:15 +00:00
Scott Taylor
dcc6cbc04f Eliminate use of extract() in gallery_shortcode().
See #22400.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-15 03:41:15 +00:00
Drew Jaynes
08824b6529 Add a complete short description to the get_attached_media filter documentation.
See #26869.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-13 04:21:14 +00:00
Scott Taylor
3bbed6ceac audio, video, and playlist shortcodes:
* Convert all instances of variable variables to array properties
* Eradicate use of `extract()`
* Rename `$atts` to `$html_atts` where collision with new `$atts` (shortcode atts holder) var might occur

See #22400, #27881.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-07 17:36:18 +00:00
John Blackbourn
ab041987d3 Remove some unnecessary abstraction introduced in [28191]. See #27985.
Built from https://develop.svn.wordpress.org/trunk@28194


git-svn-id: http://core.svn.wordpress.org/trunk@28024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-24 11:55:22 +00:00
John Blackbourn
d6e03df3c9 Avoid an expensive attachment counting query on the post editing screen. See #27985, for trunk.
Built from https://develop.svn.wordpress.org/trunk@28191


git-svn-id: http://core.svn.wordpress.org/trunk@28021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-23 22:05:16 +00:00
Scott Taylor
55becc0dfd Refinements for asynchronous rendering in wp.mce.media.PlaylistView:
* Add `visibility: hidden` as an inline style to `<audio>` tags, there is a race with the stylesheet which can get enqueued in the body and loaded in the footer.
* When creating new instances of `MediaElementPlayer`, always push them onto a stack. Lone views can be responsible for multiple instances of the same shortcode on render.
* Rename `wp.media.mixin.unsetPlayer()` to `wp.media.mixin.unsetPlayers()` to reflect the above.
* Call `wp.media.mixin.unsetPlayers()` on the view's `unbind()` method, instead of inline in the `render()` method
* Make sure `WPPlaylistView` is instantiated for each editor instance
* Ensure that the `No Items Found` view state is not rendered when attachments actually do exist.

Props gcorne, wonderboymusic.
See #27899.



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


git-svn-id: http://core.svn.wordpress.org/trunk@28013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-22 17:53:16 +00:00
Andrew Nacin
f6387ec25a Properly translate 'Select Poster Image'.
props dimadin.
see #27845, for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-19 18:28:15 +00:00
Andrew Nacin
e3a4c57563 Final about page.
props melchoyce, helen, wonderboymusic, nacin, and the illustrious Michael Pick.
fixes #27713, #27837.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-16 17:40:14 +00:00
Andrew Nacin
e8020e91fd Cast wp_count_attachments() before iterating it to avoid a notice when items exist without a mime type.
props bobbingwide.
fixes #27802.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-16 00:00:15 +00:00
Drew Jaynes
da896b7cf3 Inline documentation for hooks in wp-includes/media.php.
Props scottlee for the initial patch. Props kpdesign, DrewAPicture.
Fixes #27718.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-15 01:36:14 +00:00
Andrew Nacin
bfe44f07a3 Plupload: Restore 3.8 handles and filenames to avoid breaking plugins.
fixes #27763.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-14 00:07:16 +00:00
Andrew Nacin
e8da400c69 Don't show featured images for image attachments. Remove abstractions for now.
fixes #27673.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-08 17:40:28 +00:00
Andrew Nacin
4d6fcfdba1 Escape playlist data in templates.
props wonderboymusic.
fixes #27710.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-08 17:40:14 +00:00
Andrew Nacin
6b41f728d4 Header Images: Add suggested dimensions to the media workflow.
props ehg, gcorne.
see #21785.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-08 01:55:15 +00:00
Scott Taylor
42a66ea424 Make playlist tracks keyboard-accessible.
Fixes #27644.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-07 22:28:16 +00:00
Drew Jaynes
eebf49c180 General PHPDoc improvements in wp-includes/media.php for 3.9 functionality.
See #27700.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-07 20:38:15 +00:00
Scott Taylor
2c88f6e941 [27640] supported a caption for audio and video shortcodes as part of a UX iteration for the related MCE views. These captions have since be excluded, so the extra code should be removed (it was there for this sole reason).
See #27320.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-07 06:13:18 +00:00
Scott Taylor
7689cc4a74 When dynamically instantiating MediaElementPlayer instances in JS, preload="metadata" is extremely wonky. preload="none" lets the file play right away.
This has already been addressed for audio|video shortcodes, but also needs to be the case for playlists. When loading a playlist from a DOM cache or via AJAX, and when the sources match those already pre-loaded, the browser will sometimes donkey-punch the HTTP request for the first cached track selected.

Set `preload="none"` for the empty `<audio|video>` tag for playlists.

See commits related to #26779.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-06 21:33:15 +00:00
Scott Taylor
3238664215 Revert the changes made to data.title in playlist Underscore templates in [27869]. {{ data.title }} causes the title to be double-encoded on the front end.
See #27574.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-05 20:06:16 +00:00
Andrew Nacin
5e79b94d81 Header images: Handle cropping failures.
props ehg.
see #21785.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-04 15:48:16 +00:00
Andrew Nacin
079ddec045 Remove <br> elements for HTML5 galleries.
props obenland.
fixes #27637, see #26697.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-02 21:50:14 +00:00
Scott Taylor
55b61b7a70 Re-instantiate the MediaElementPlayer instance when switching mime types in playlists.
Fixes #27608.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-31 15:35:15 +00:00
Scott Taylor
01d2062af3 Cleanup up the display, escaping, and handling of ID3 data for media. Rename wp_get_relevant_id3_keys() to wp_get_attachment_id3_keys().
Props nacin.
See #27574.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-31 05:16:16 +00:00
Scott Taylor
b6ac65f07f Using percentages for playlist font-sizing was ambitious, but fell prey to editor-style.css in the admin. We have switched to using pixels. The editor styles were also forcing MediaElement players to inherit font-family, which was undesirable. And while we're at it, remove the top and bottom border from the playlist's list of tracks, which adds a dash of lovely to the playlist's default styles.
Props nacin for the addition of `&mdash;` in the playlist track list.
Fixes #27600.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 22:12:16 +00:00
Andrew Nacin
c95f232727 Cleanups for audio/video metadata, see [27862].
see #27574.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 21:08:14 +00:00
Scott Taylor
d947a55495 Metadata for audio and video files:
* Make attachment metadata for audio files editable by providing a metabox on the Edit Media page
* Standardize on using the attachment title everywhere
* Label the Caption and Description fields for audio and video appropriately
* Make the playlist Underscore templates more straightforward

See #27574.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 19:28:16 +00:00
Scott Taylor
c3a2635dc8 Return the default mime icon for playlist items that don't have a featured image in wp_prepare_attachment_for_js().
See [27640].


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


git-svn-id: http://core.svn.wordpress.org/trunk@27647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 12:50:14 +00:00
Andrew Nacin
e0e8203af0 Galleries: Avoid doubling up clearing br elements.
props drozdz.
fixes #25537.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 02:41:15 +00:00
Scott Taylor
26773541ab Make sure Playlist states that are audio are marked as such with proper localized strings.
See #27554.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27625 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-27 18:37:17 +00:00
Scott Taylor
ff6c0731fa Move counting of attachments for audio/video to the backend, instead of using a reduce function in JS.
See #27554.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-27 18:16:16 +00:00
Scott Taylor
4f868ad882 There is no more video-playlist shortcode. To use video, it is now [playlist type="video" ....]. Also deleting core playlist styles. The style attribute is still supported, defaulting to light. Our core style support was 4-5 CSS rules.
See #27552. Leaving open for comments and potential bugs.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-27 17:58:15 +00:00
Scott Taylor
3171da9986 Pass the default mime-type icon as the image for a track when a featured image is not selected for an item in a playlist. Image display in general can be toggled on/off in the modal via Playlist Settings.
Fixes #27525.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 12:45:15 +00:00
Scott Taylor
eddc48def7 Don't make mce-view a dependency for media-audiovideo. Make media-audiovideo and wp-playlist dependencies for mce-view and only enqueue mce-view in the admin in wp_enqueue_media(). MCE views don't need to be included when media is loaded on the front end.
Fixes #27509.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 12:11:14 +00:00
Helen Hou-Sandí
52d2920891 Use Dashicon-style images for mime type icons. Actually moving to Dashicons via the font can be explored later, but has theme/plugin implications and requires too many changes to make it for 3.9. props melchoyce for the icons. fixes #26650.
Built from https://develop.svn.wordpress.org/trunk@27726


git-svn-id: http://core.svn.wordpress.org/trunk@27563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-25 21:10:15 +00:00
Andrew Nacin
60676ee282 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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-24 02:05:14 +00:00
Andrew Ozz
69b74a75cd Plupload: switch to urlstream upload method when the 'flash' runtime is used in non IE browsers. This ensures cookies are sent but limits the maximum file size that flash can handle.
By default only IE9 and older use flash so this change is mostly for completeness. It would affect only the (extremely rare) cases where a plugin disables the html5 runtime.
Built from https://develop.svn.wordpress.org/trunk@27662


git-svn-id: http://core.svn.wordpress.org/trunk@27505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 23:45:19 +00:00
Scott Taylor
38d1fb971f Turn on thumbnail support for attachment:audio and attachment:video. Change conditionals to check for theme OR post type support when determining whether to turn on the Featured Image UI pieces in the admin.
Fixes #27460.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 02:35:14 +00:00
Scott Taylor
410646fc52 General code cleanup and improving video sizing in the admin:
* Abstract the setting of a primary button and its callback in `wp.media.view.MediaFrame.MediaDetails`
* Account for the existence or non-existence of `$content_width` in the TinyMCE views for video
* Make sure video models always have dimensions, even if they are the defaults
* For browsers that are not Firefox, don't use a timeout when setting the `MediaElementPlayer` instance in TinyMCE views

See #27320.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-22 23:26:17 +00:00
Scott Taylor
615dd5331b Unifying media controls and supporting playlists in the editor:
* Support a `caption` attribute for audio and video shortcodes
* In `wp.media.audio|video`, rename `update` to `shortcode` to allow these models to share the same mixins as `wp.media.collection` subclasses
* When sending an audio or video shortcode to the editor, create a default caption if the user hasn't entered one. This currently only displays in the editor, not on the front end. Captions aren't tied to a specific attachment here because external sources are supported.
* In the `wp.mce.media` mixin, in the `edit` method, read `attr` instead of `data` when attempting to parse the encoded shortcode. `data` does not automatically update when the attribute changes. This was a blessing to debug.
* Add `wp.mce.media.PlaylistView` to support playlist views in TinyMCE
* Expose `WPPlaylistView` to global scope and suppress auto-parsing of playlist nodes when in the admin. Allow `WPPlaylistView` to be passed `metadata` on creation instead of requiring a JSON blob to be parsed.
* Remove all of the playlist logic from the `wpgallery` TinyMCE plugin.
* In `wp_prepare_attachment_for_js()` return more data for audio/video so that playlists can have parity in the admin/front end.

See #27320.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-20 13:33:14 +00:00
Andrew Nacin
30fd56b3dc Only enqueue the image editor in the media modal in the admin.
props gcorne.
see #21811.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 21:16:14 +00:00
Andrew Nacin
deb8779af5 More translation cleanups.
Affects widgets (see #27112), custom headers (see #21785), theme installer (see #27055, reverts [27614]), and some media stuff. Untranslates some complicated strings that need additional study.

see #27453.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 08:18:14 +00:00
Scott Taylor
a17dd704c4 Create a new file, media-audiovideo.js, to house all of the audio and video JS code in core.
UX Changes:
* Don't add a menu item for "Add Audio|Video Source"
* In the Audio|Video Details modal, add buttons and some suggestive text for adding alternate playback sources
* Don't show "Create Audio|Video Playlist" menu items until the user has uploaded audio or video files

See #27437.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 05:31:15 +00:00
Scott Taylor
be70cf26fe Account for preload="metadata" in audio and video shortcodes when multiple versions of the same <source> appear on the page by appending a query arg to "cache-bust" passed sources. The query arg is used to make the sources "unique." They will still be cached by the browser and won't bust the cache on every request.
Fixes #26779.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 03:42:14 +00:00
Scott Taylor
48e05e607c Change string "Create Playlist" to "Create Audio Playlist." Open new tickets for individual issues.
Fixes #26631. 


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


git-svn-id: http://core.svn.wordpress.org/trunk@27355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-12 04:40:16 +00:00
Andrew Nacin
a589d9d757 Add header image uploads with cropping to the customizer.
props mcsf, ehg, gcorne.
see #21785.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 04:13:16 +00:00
Scott Taylor
d2c0cdc5de Add a filter and document it: playlist_styles. Allows users to roll their own playlist themes.
Props DrewAPicture for the docs.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 23:37:15 +00:00
Scott Taylor
6c3e050724 Playlists:
* Add an action, `wp_playlist_scripts`, where a user can turn off all default script and style loading for playlists and roll their own.
* Move the script and style loading for playlists to a function, `wp_playlist_scripts( $type )`, that hooks into `wp_playlist_scripts`.
* Make the `<noscript>` playlist output an `<ol>`, instead of a list of links with no surrounding markup.

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 22:45:14 +00:00
Scott Taylor
f078f3e10e Video editing in the media modal:
* Add a state: `Add Subititles`
* Add `text/vtt` to the list of allowed mime-types, files end in `.vtt`. `.srt` files are served as `text/plain`.
* The content body of a video shortcode should be used for adding `<track>` elements only. This happens dynamically in the modal. If added by hand, they can still be parsed and managed.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 10:32:15 +00:00
Scott Taylor
f7af18e1d6 Audio/Video shortcodes in the media modal:
* Make a generic model, `wp.media.model.PostMedia`, which replaces `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Make a generic library, `wp.media.controller.MediaLibrary`, which replaces `wp.media.controller.ReplaceVideo` and `wp.media.controller.ReplaceAudio`
* `wp.media.controller.MediaLibrary` is used to create new states that want to load a library filtered by type, making it incredibly simple to add states to frames. See `wp.media.view.MediaFrame.VideoDetails` and `wp.media.view.MediaFrame.AudioDetails`.

UX changes:

* Add the ability to manage HTML5 fallbacks - add additional `<source>`s or remove specific `<source>`s
* In the Video Details state, add the ability to select a poster image

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 05:25:15 +00:00
Scott Taylor
dc00fc7e7f Audio/Video shortcodes in the media modal:
* Add `embedMimes` to `_wpMediaViewsL10n`
* Use `escape` instead of `interpolate` when setting attributes in Underscore templates
* When creating the `<audio>` and `<video>` tags dynamically, set inner `<source>` nodes instead of the `src` attribute and properly set the mime-type per source as the `type` attribute. This is also drastically reduces the amount of code used to generate the tags.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 01:01:14 +00:00
Andrew Nacin
fabb6d4898 Allow $crop in add_image_size() to receive crop anchors (top, left, right, bottom, center).
This also applies to set_post_thumbnail_size() and image_resize_dimensions().

props bradt, wonderboymusic, DH-Shredder.
fixes #19393.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-08 06:14:15 +00:00
Helen Hou-Sandí
4bb7e03548 At long last, a first pass at bringing the image editor into the media modal. props gcorne, DH-Shredder, tomauger. see #21811.
Built from https://develop.svn.wordpress.org/trunk@27445


git-svn-id: http://core.svn.wordpress.org/trunk@27292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 22:55:14 +00:00
Scott Taylor
ff8844deae Add TinyMCE placeholders for audio and video shortcodes.
* Add `wp.media.mixin`.
* Add `wp.media.audio` and `wp.media.video`.
* Add `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Add `wp.media.controller.AudioDetails` and `wp.media.controller.VideoDetails`.
* Add `wp.media.controller.ReplaceAudio` and `wp.media.controller.ReplaceVideo`.
* Add `wp.media.view.MediaFrame.AudioDetails` and `wp.media.view.MediaFrame.VideoDetails`.
* Add `wp.media.view.AudioDetails` and `wp.media.view.VideoDetails`.
* Update the `wpgallery` TinyMCE plugin.
* Display audio and video players in the media modal when shortcode is clicked.
* Provide a UI to edit shortcode attributes in the media modal.
* Provide a UI to replace the `src` media file in an `audio` or `video` shortcode.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 15:06:14 +00:00
Helen Hou-Sandí
886a8e9549 Add a class attribute to the caption shortcode to allow for additional classes on the caption container. props rhyswynne, mcadwell. fixes #25295.
Built from https://develop.svn.wordpress.org/trunk@27404


git-svn-id: http://core.svn.wordpress.org/trunk@27251 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 04:54:15 +00:00
Andrew Nacin
0422c70fdb Rename maybe_regenerate_attachment_metadata() to wp_maybe_generate_attachment_metadata(), to match wp_generate_attachment_metadata().
fixes #26825.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-04 20:07:14 +00:00
Andrew Nacin
978e394248 Do not output default gallery styles if the theme has opted into HTML5 galleries.
fixes #27045. see #26697.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-04 18:53:13 +00:00
Scott Taylor
e92770ba93 * Videos should always render at the same aspect ratio.
* Don't force a pseudo-mime-type for `.m4v` files
* Uniformly adapt to `$content_width` when setting video dimensions on the front end
* Add the `height` attribute to the initial `<video>` in the video playlist JS template
* Add some defensive/responsive CSS for a/v on the Edit Media page

See #27243.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-28 21:28:14 +00:00
Scott Taylor
db1a8785b5 Some playlist cleanup:
* Check properties against the `window` object when using `_.isUndefined()` on globals
* Fix a typo for `$safe_type` introduced in [27311]

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 21:38:17 +00:00
Andrew Ozz
21b74a037d Remove debugging cruft, see #25663
Built from https://develop.svn.wordpress.org/trunk@27318


git-svn-id: http://core.svn.wordpress.org/trunk@27170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 20:15:16 +00:00
Andrew Ozz
d896fa2487 Upgrade Plupload to 2.1.1, props kovshenin, see #25663
Built from https://develop.svn.wordpress.org/trunk@27316


git-svn-id: http://core.svn.wordpress.org/trunk@27168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 20:01:16 +00:00
Scott Taylor
f931929905 In the tracklist for playlist, fall back to title if there is no caption.
Props bassgang.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 15:22:13 +00:00
Scott Taylor
7d57ca6c2c Add some security hardening to passed playlist attributes.
Props xknown.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27164 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 15:20:14 +00:00
Andrew Nacin
e8819fc636 Introduce HTML5 gallery support.
When a theme supports HTML5 galleries via add_theme_support( 'html5', 'gallery' ), figure and figcaption will be used instead of definition list markup.

props obenland.
fixes #26697.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-26 22:20:31 +00:00
Scott Taylor
c4cd842c29 Make sure data.meta always exists when rendering tracklists. Use $theme_width when rendering media tag in playlist template instead of recalculating.
Props helen.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 19:30:14 +00:00
Scott Taylor
d5c0574c94 Get the proper image size for an item's thumb in playlist JSON.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 21:10:12 +00:00
Scott Taylor
d393e38624 Supply mime-type instead of extension for an item's type property in playlist JSON.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 21:05:16 +00:00
Drew Jaynes
de43247d4c Inline documentation improvements for wp_get_playlist().
* Adds a missing `@param` description in the PHPDoc.
* Adds hook documentation for the `post_playlist` filter.
* Other comment cleanup.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 19:42:13 +00:00
Scott Taylor
943f295d2e Add core support for Playlists and Video Playlists.
* Playlists operate like galleries in the admin. 
* Provide default UI and JS support in themes using MediaElement and Backbone. 
* The shortcodes are clickable, editable, and configurable using the media modal. 
* Playlists support images for each item, whether or not the current theme supports images for `attachment:audio` and `attachment:video`
* Playlists respond to `$content_width` and resize videos accordingly.
* All playlist data is included inline, using a script tag with `type="application/json"`, allowing anyone to unenqueue the WP playlist JS and roll their own.
* Playlist styles are minimal and work out of the box in the last 5 default themes. They inherit and adapt to the current theme's font styles, and their rules are easily overrideable.

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 18:08:16 +00:00
Scott Taylor
7ff83d46aa Allow pseudo post types attachment:audio and attachment:video to get the media modal on Edit Media when they support featured images.
Introduces `post_supports_thumbnails( $post )` and `theme_supports_thumbnails( $post )` to cut down on duplicated code everytime this needs to be checked. There will be more cases forthcoming.

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 17:50:13 +00:00
Andrew Nacin
65f4497766 has_image_size()'s parameter should be required. see [27139], see #26951.
Built from https://develop.svn.wordpress.org/trunk@27140


git-svn-id: http://core.svn.wordpress.org/trunk@27007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-08 23:53:12 +00:00
Drew Jaynes
127907a85b Inline documentation tweaks for has_image_size() and remove_image_size().
See #26951.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-08 22:55:11 +00:00
Andrew Nacin
53867f3081 Add remove_image_size() and tests for it and has_image_size(), added in [27128].
props mordauk, markoheijnen.
fixes #26768. see #26951.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-08 00:41:13 +00:00
Scott Taylor
2610e6d4ff Introduce has_image_size( $name ), a utility function that helps avoid loading the $_wp_additional_image_sizes global.
Props mordauk.
Fixes #26951.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-08 00:20:13 +00:00
Scott Taylor
03dda3b273 Introduce maybe_regenerate_attachment_metadata( $attachment ). On the Edit Media screen, call it for Audio and Video files.
The functions checks if the item is lacking metadata altogether. If a video or audio file was uploaded prior to 3.6, it does not have any metadata. This tries to fix it. Implements locking via a transient to protect against this running in parallel with another request.

This is the minimum viable product for #26825, but leaving the ticket open unless this function needs to be called in other places.

See #26825.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-07 22:41:12 +00:00
Scott Taylor
228fc639b9 When a video shortcode has content in its body, append it as inner HTML in the resulting <video>.
Reverts [27096].
Fixes #26628.
See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-05 01:43:12 +00:00
Scott Taylor
84911b9707 Let the video shortcode accept a YouTube URL as the value of its src attribute, as MediaElement.js supports Chromeless YouTube videos by using a pseudo-mime-type video/youtube.
HTTP and HTTPS www, non-www, and short url fronts are supported:
http://www.youtube.com/watch 
https://www.youtube.com/watch
http://youtube.com/watch
https://youtube.com/watch
http://youtu.be
https://youtu.be

Fixes #24764.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-31 18:59:13 +00:00
Scott Taylor
e1759d668a 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.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 23:21:13 +00:00
Andrew Ozz
33eedc570b 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.
Built from https://develop.svn.wordpress.org/trunk@27050


git-svn-id: http://core.svn.wordpress.org/trunk@26924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 21:17:12 +00:00
John Blackbourn
e6da4eebe9 Inline documentation for core shortcode attributes.
Props DrewAPicture, johnbillion.
Fixes #25661.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-07 16:07:12 +00:00
Andrew Nacin
b04d321fb9 Allow wp_enqueue_media() to "just work" in a customizer control.
props westonruter.
fixes #25618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-03 20:54:11 +00:00
Scott Taylor
e86b10131b Add a wp-video class to the div that wraps video shortcode output. It was previously hard to target.
Props nofearinc.
Fixes #25896.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 16:32:10 +00:00
Andrew Nacin
5361a8abca Spell out duplicate hook locations.
props DrewAPicture.
fixes #25658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:59:20 +00:00
Andrew Nacin
8ae8e01b67 Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone.
see #27704.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:53:14 +00:00
Andrew Nacin
74488bdcb0 Spell out duplicate hook locations.
props DrewAPicture.
fixes #25658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-22 17:22:11 +00:00
Andrew Nacin
f0eb99952c Make sure when resizing an image according to ratio we do not end up with a zero-pixel width or height.
props plocha.
fixes #25038.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-09 19:07:17 +00:00
Dominik Schilling
51ff617278 Allow to filter the link attribute via shortcode_atts_gallery. props iworks. fixes #24979.
Built from https://develop.svn.wordpress.org/trunk@25665


git-svn-id: http://core.svn.wordpress.org/trunk@25581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-02 20:46:09 +00:00
Sergey Biryukov
7c5d11d671 Make the arguments of 'wp_audio_shortcode_override' and 'wp_video_shortcode_override' more consistent with the ones of 'img_caption_shortcode' and 'post_gallery' filters.
see #25313.
Built from https://develop.svn.wordpress.org/trunk@25485


git-svn-id: http://core.svn.wordpress.org/trunk@25406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-18 22:06:09 +00:00
Sergey Biryukov
dd6e39bfb1 Replace non-functional 'wp_audio_shortcode_handler' and 'wp_video_shortcode_handler' filters with 'wp_audio_shortcode_override' and 'wp_video_shortcode_override'.
props ericlewis, SergeyBiryukov.
fixes #25313.
Built from https://develop.svn.wordpress.org/trunk@25484


git-svn-id: http://core.svn.wordpress.org/trunk@25405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-18 21:20:09 +00:00
Andrew Nacin
031576d79e Introduce a img_caption_shortcode_width filter for controlling the inline style of the image caption shortcode.
props iandunn for the initial patch.
fixes #14380.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-14 20:45:09 +00:00
Sergey Biryukov
045f93f3b2 Ignore case differences when checking file extension in wp_audio_shortcode() and wp_video_shortcode(). props nofearinc, bhengh. fixes #25140.
Built from https://develop.svn.wordpress.org/trunk@25128


git-svn-id: http://core.svn.wordpress.org/trunk@25108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-26 19:21:10 +00:00
Andrew Nacin
6861353737 Set audio player to width: 100% and avoid breaking the layout in iOS when we fall back to a link.
props markjaquith, davidjlaietta.
fixes #24896.



git-svn-id: http://core.svn.wordpress.org/trunk@24948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-01 14:48:39 +00:00
Andrew Nacin
7d53482cee Use wp_get_mime_types() when calling wp_check_filetype() in the audio and video shortcodes. fixes #24911.
git-svn-id: http://core.svn.wordpress.org/trunk@24944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-01 13:33:15 +00:00
Andrew Nacin
bd1d854f10 When rendering an audio or video shortcode in IE 6-8, call document.createElement() as a poor man's HTML5 shiv. see #24902.
git-svn-id: http://core.svn.wordpress.org/trunk@24931 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-31 20:36:47 +00:00
Andrew Nacin
70109f6202 Update HTML classes in the audio and video shortcodes. props rfair404. fixes #24820.
git-svn-id: http://core.svn.wordpress.org/trunk@24857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-29 06:51:46 +00:00
Mark Jaquith
0a2ca92b33 Fix a variable typo in get_post_gallery_images().
props rodrigosprimo. Fixes #24202 for trunk.

git-svn-id: http://core.svn.wordpress.org/trunk@24837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-29 00:52:31 +00:00
Mark Jaquith
48eefd5240 Oops. Forgot that we support a PHP version from 2007. Either that or I've been doing a lot of JS.
Props kovshenin. See [24789].

git-svn-id: http://core.svn.wordpress.org/trunk@24792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-24 06:36:29 +00:00
Mark Jaquith
290d61138c Fix some sizing issues with video embeds, and improve video/audio embed shortcode flexibility.
* `loop`, `autoplay`, and `preload` are now available via the shortcode. Use them non-annoyingly, please!
* Attributes that pass through the filters are now proper key/value pairs, not an array of `key="value"` strings.
* `preload` defaults to `metadata` for videos. This fixes the vertical video preview and Safari ogv/webm playback issues.
* Wrap a div around video embeds to combat a ME.js issue with responsive width=100% themes. Props kovshenin.

Fixes #24134, #24798.

git-svn-id: http://core.svn.wordpress.org/trunk@24789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-24 05:52:49 +00:00
Andrew Nacin
2c67dea9bc Media: Add awareness to Attachment Display Settings that audio and video can be embedded.
Also:
 * Add file length metadata to Attachment Details.
 * Round the kb/s bitrate on post.php.

fixes #24449.



git-svn-id: http://core.svn.wordpress.org/trunk@24777 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-23 05:39:08 +00:00
Andrew Nacin
769e3e9b5d Drop get_images_in_content() and get_image_in_content(), until recently get_content_image(s)(). fixes #24202.
git-svn-id: http://core.svn.wordpress.org/trunk@24685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-12 20:34:07 +00:00
Andrew Nacin
75ab12808b Add types parameter to get_media_embedded_in_content(). props aaroncampbell. see #24202.
git-svn-id: http://core.svn.wordpress.org/trunk@24684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-12 19:51:59 +00:00
Andrew Nacin
4a1e326c1f Simplify and reduce the new media/content extraction functions.
The URL extraction function is now get_url_in_content(). For more, see #24202.

Also adds filters to get_post_galleries() and get_post_gallery(). fixes #24309.



git-svn-id: http://core.svn.wordpress.org/trunk@24682 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-12 19:34:59 +00:00
Andrew Nacin
44abe2e502 Use wp_basename() in newer media code for filenames to avoid encoding issues on display. props SergeyBiryukov, fixes #23267.
git-svn-id: http://core.svn.wordpress.org/trunk@24585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-08 13:55:50 +00:00
Mark Jaquith
86c7950173 Make sure get_post_gallery() doesn't ever return an array when asked for a string.
props kovshenin, wonderboymusic, ocean90. fixes #24270.

git-svn-id: http://core.svn.wordpress.org/trunk@24572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 20:54:46 +00:00
Mark Jaquith
5da392a62f Drop some wrapper functions
* `get_attached_audio()` (use `get_attached_media( 'audio' )`)
* `get_attached_images()` (use `get_attached_media( 'image' )`)
* `get_attached_videos()` (use `get_attached_media( 'video' )`)

props wonderboymusic. fixes #23843.

git-svn-id: http://core.svn.wordpress.org/trunk@24571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 20:41:49 +00:00
Dominik Schilling
8c9c035d94 Remove the_post_format_gallery(). see #24452.
git-svn-id: http://core.svn.wordpress.org/trunk@24570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 20:37:12 +00:00
Dominik Schilling
26873abe38 Remove img_html_to_post_id(). It's unused since [24555]. fixes #24610.
git-svn-id: http://core.svn.wordpress.org/trunk@24569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 18:45:41 +00:00
Mark Jaquith
d0d6e4aa51 Remove some more post format functions.
props wonderboymusic. fixes #24610.

git-svn-id: http://core.svn.wordpress.org/trunk@24555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-04 06:57:00 +00:00
Dominik Schilling
6ba7413fbd Lose content removal and splitting from get_content_url(). And remove unneeded lines from [24400].
fixes #24484.

git-svn-id: http://core.svn.wordpress.org/trunk@24554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-03 22:36:13 +00:00
Andrew Nacin
66054d7ffe Allow gallery to be inserted with no links on the images. props chipbennett, helgatheviking, aaroncampbell, wonderboymusic. fixes #18178.
git-svn-id: http://core.svn.wordpress.org/trunk@24550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-03 20:43:19 +00:00
Andrew Nacin
98832852dc Remove attachment_url_to_postid(). props kovshenin, wonderboymusic. see #24458.
git-svn-id: http://core.svn.wordpress.org/trunk@24548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-03 20:23:48 +00:00
Andrew Nacin
6500a24719 Call shortcode functions directly. props kovshenin, fixes #24505.
git-svn-id: http://core.svn.wordpress.org/trunk@24547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-03 20:19:00 +00:00
Mark Jaquith
28e3c51dab Lose content removal and splitting from the media extraction functions.
see #24484

git-svn-id: http://core.svn.wordpress.org/trunk@24400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-03 19:27:58 +00:00
Andrew Nacin
c5033c96f5 No need for a pass-by-reference here. props sunnyratilal, fixes #24433.
git-svn-id: http://core.svn.wordpress.org/trunk@24376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-27 15:47:46 +00:00
Sergey Biryukov
5f05c95014 Add @return for get_the_post_format_image(). Make sure the function always returns a string. props tollmanz. fixes #24414. see #24348.
git-svn-id: http://core.svn.wordpress.org/trunk@24352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-24 23:56:00 +00:00
Jon Cave
94a56f3bbf Properly escape source parameter in audio/video shortcodes. See #23282.
git-svn-id: http://core.svn.wordpress.org/trunk@24334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-23 17:45:59 +00:00
Sergey Biryukov
71b6d68ad5 Switch to a CSS comment in gallery_shortcode() to avoid breaking markup when the shortcode is used inside an HTML comment. props mark-k, aaroncampbell. fixes #23787.
git-svn-id: http://core.svn.wordpress.org/trunk@24329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-22 22:27:53 +00:00
Ryan Boren
f14b0c3e13 Remove redundant post ID validation.
Props SergeyBiryukov
fixes #24199


git-svn-id: http://core.svn.wordpress.org/trunk@24249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-14 13:57:59 +00:00
Mark Jaquith
74c6071b9d Improve regular expressions by using a backreference to match right quote of quote pair when matching attributes.
props kovshenin. see #24225.

git-svn-id: http://core.svn.wordpress.org/trunk@24241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-10 22:54:33 +00:00
Mark Jaquith
34455bbbd8 Return the requested image size in get_the_post_format_image()
props kovshenin. fixes #24188.

git-svn-id: http://core.svn.wordpress.org/trunk@24240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-10 22:49:24 +00:00
Ryan Boren
bb51b4e239 Avoid warning in gallery_shortcode() when called outside of post context.
Props kovshenin
fixes #24272


git-svn-id: http://core.svn.wordpress.org/trunk@24198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-08 16:57:58 +00:00
Andrew Nacin
3139a0451e Variables passed by reference do not need to be set first.
props kovshenin.
see #24222.



git-svn-id: http://core.svn.wordpress.org/trunk@24129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-29 14:48:31 +00:00
Sergey Biryukov
93b0b5c32c Remove extraneous function parameters in wp_video_shortcode(). props rlerdorf. see #24210.
git-svn-id: http://core.svn.wordpress.org/trunk@24122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-29 00:56:27 +00:00
Sergey Biryukov
d1966150dc Fix typo in get_the_post_format_image(). props rlerdorf. see #23964. see #24210.
git-svn-id: http://core.svn.wordpress.org/trunk@24118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-28 06:36:39 +00:00
Mark Jaquith
e2fbad7ee0 the_post_format_gallery() (and Twenty Thirteen using it).
fixes #24126. props obenland, wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@24093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 07:42:59 +00:00
Mark Jaquith
3f231a1758 Smarter structured post format caching.
fixes #24002. props kovshenin, wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@24091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 07:10:35 +00:00
Mark Jaquith
254ea5ad54 Fix issue with [embed] in post_format_compat.
props kovshenin. fixes #24070.

git-svn-id: http://core.svn.wordpress.org/trunk@24083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 03:52:05 +00:00
Mark Jaquith
d9d5c5eb03 Allow the_post_format_image() to choose an image size late in the game.
props davidwilliamson, SergeyBiryukov. fixes #23945.

git-svn-id: http://core.svn.wordpress.org/trunk@24079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 02:28:30 +00:00
Mark Jaquith
cd0bbd830c Fix mangled image output in compat function.
props wonderboymusic. see #24175.

git-svn-id: http://core.svn.wordpress.org/trunk@24078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 02:18:49 +00:00
Mark Jaquith
0a49442e35 Multiple improvements to image post format insertion and display.
* get_tag_regex() altered based on Unit Tests.
* Changes to post-formats.js to provide size and link context during image selection.
* Captions are now output in the_post_format_image() when present.
* The meta value for url is respected for the image post format when the HTML in the image meta doesn't include a link

props wonderboymusic. fixes #23965, #23964. see #24147, #24046.

git-svn-id: http://core.svn.wordpress.org/trunk@24066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-22 22:11:42 +00:00
Mark Jaquith
412161de03 Standardize post format postmeta keys around the ones already used by the Crowd Favorite plugin.
props wonderboymusic. fixes #24010.

git-svn-id: http://core.svn.wordpress.org/trunk@24021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-17 20:57:44 +00:00
Mark Jaquith
56d5d62a19 New Post Format UI chooser treatment in response to testing.
* Bigger icons
* Format description under each
* UI hides after choice
* Saving without choosing implies "Standard"
* Helpful text, with "Change format" link

see #24046. props lessbloat, wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@24006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-17 04:08:46 +00:00
Mark Jaquith
b6ae99abdb Make get_the_post_format_image() work when intermediate_image_sizes is empty.
props lancewillett. fixes #24060.

git-svn-id: http://core.svn.wordpress.org/trunk@24003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-16 21:31:37 +00:00
Sergey Biryukov
508cbd464b * Add start/end markers to the regex patterns in audio and video embed handlers.
* Move the handler functions registration to wp_maybe_load_embeds().
* Rename both functions to match the wp_embed_handler_* pattern.
* Move the functions closer to wp_embed_handler_googlevideo().

props kovshenin. fixes #24092.

git-svn-id: http://core.svn.wordpress.org/trunk@24000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-16 11:06:31 +00:00
Mark Jaquith
df5e61ad54 Link post format images if a URL is provided. Make the URL available via get_the_post_format_url().
props wonderboymusic, obenland. fixes #23964.

git-svn-id: http://core.svn.wordpress.org/trunk@23992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-14 16:59:52 +00:00
Mark Jaquith
de45c749df Constrain large videos from rendering bigger than $content_width on both frontend and backend.
props wonderboymusic. fixes #23955.

git-svn-id: http://core.svn.wordpress.org/trunk@23989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-14 16:43:26 +00:00
Dominik Schilling
f715505934 Don't print links for unsupported file types in wp_video_shortcode()/wp_audio_shortcode(). Return them instead.
props SergeyBiryukov. fixes #24075.

git-svn-id: http://core.svn.wordpress.org/trunk@23988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-14 10:33:44 +00:00
Mark Jaquith
697bf3d70e Only remove ONE piece of media from the content in setup_postdata().
props wonderboymusic. fixes #24052.

git-svn-id: http://core.svn.wordpress.org/trunk@23984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-14 01:11:44 +00:00
Mark Jaquith
4a3ced1433 Enforce video dimensions.
props wonderboymusic. see #23831.

git-svn-id: http://core.svn.wordpress.org/trunk@23969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-11 22:34:05 +00:00
Sergey Biryukov
09317ba345 Use the function argument instead of the $post global in get_the_post_format_image(). props kovshenin. fixes #24003.
git-svn-id: http://core.svn.wordpress.org/trunk@23938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-09 16:28:09 +00:00
Sergey Biryukov
0cf4b02a4f Consistently use the function argument instead of the $post global in get_the_post_format_media(). props kovshenin. fixes #24003.
git-svn-id: http://core.svn.wordpress.org/trunk@23937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-09 13:42:53 +00:00
Andrew Nacin
47b7e15f2a Third parameter for shortcode_atts() for audio and video shortcodes. props obenland, see #23282.
git-svn-id: http://core.svn.wordpress.org/trunk@23921 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-05 17:46:31 +00:00
Mark Jaquith
15dc5a3718 Standardize the post format theme API functions with the_post_format_THING() and get_the_post_format_THING().
fixes #23927

git-svn-id: http://core.svn.wordpress.org/trunk@23899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-04 08:09:02 +00:00
Mark Jaquith
fec4b66f5b Sanity checks on image metadata to avoid warnings, etc.
fixes #23733. props wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@23873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-29 20:51:35 +00:00
Sergey Biryukov
c254787f0c Make a copy of post content to avoid changing it in get_the_image(). Remove unnecessary assignment from get_the_media(). props wonderboymusic for initial patch. fixes #23888.
git-svn-id: http://core.svn.wordpress.org/trunk@23869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-29 19:10:31 +00:00
Mark Jaquith
22b45b2fbb Add compat code for 'image' post format.
see #19570. props wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@23847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-29 05:21:23 +00:00
Mark Jaquith
c93e0231af Post Format UI.
* Icons
* Selection
* Prompt text
* Special fields
* Styling
* Sparkles

This is going to need testing, polish, and love.

see #19570. props melchoyce, helen, wonderboymusic, lessbloat, rachelbaker, aaroncampbell, DrewAPicture, ryelle.

git-svn-id: http://core.svn.wordpress.org/trunk@23843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-29 03:35:41 +00:00
Mark Jaquith
60073bb5a4 Move the "look for the first media attachment" code below the "look
in the post content for media" code, so that it is the method of last
resort. This way, if you attach AND embed media, you won't get duplication.

fixes #23879

git-svn-id: http://core.svn.wordpress.org/trunk@23840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-28 07:28:27 +00:00
Mark Jaquith
2a45fd4453 Add some filters to the image extraction-from-post bits so people with
existing postmeta-based flows can hook in and make magic happen.

props wonderboymusic. fixes #22960.

git-svn-id: http://core.svn.wordpress.org/trunk@23821 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-27 19:07:58 +00:00
Mark Jaquith
1b83157127 Give themers tangible, user-friendly template functions to take full advantage of structured post formats.
* the_audio()
* the_video()
* the_image()
* get_the_media()

Also introduces:

* get_the_extra_content()
* the_extra_content()

Those two functions are like their non-extra versions, except that they
will have any post-format bits extracted. e.g. It's an image post, for
which the_image() will extract an <img /> tag. the_extra_content() will
output the content *without* that image.

props wonderboymusic. Herculean effort. fixes #23572

git-svn-id: http://core.svn.wordpress.org/trunk@23819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-27 18:34:59 +00:00
Helen Hou-Sandí
b2f0b89062 Add a generic get_attached_media() function and use it in get_attached_audio|video|images. Add filters for the query args and resulting array. fixes #23843.
git-svn-id: http://core.svn.wordpress.org/trunk@23776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-22 08:08:46 +00:00
Mark Jaquith
026d8847b4 Add functions to parse audio or video data out of arbitrary content or a post
props wonderboymusic. see #23572

git-svn-id: http://core.svn.wordpress.org/trunk@23774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-22 05:55:08 +00:00
Mark Jaquith
6966294e55 Add functions to extract images from posts in various forms
props wonderboymusic. fixes #22960

git-svn-id: http://core.svn.wordpress.org/trunk@23772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-22 05:20:38 +00:00
Mark Jaquith
53d12e91bc Introduce [audio] and [video] shortcodes, and use MediaElement.js to play them.
props wonderboymusic. see #23282.

git-svn-id: http://core.svn.wordpress.org/trunk@23729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-16 05:25:44 +00:00
Sergey Biryukov
11229adad7 Add phpdoc for $attr argument of wp_get_attachment_image(). props GaryJ. fixes #23791.
git-svn-id: http://core.svn.wordpress.org/trunk@23714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-15 17:19:10 +00:00
Sergey Biryukov
2e4d128fe0 Add orientation information to gallery items. props obenland. fixes #23695.
git-svn-id: http://core.svn.wordpress.org/trunk@23649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-08 16:13:15 +00:00
Andrew Nacin
c3a174becd Add shortcode_atts_$shortcode filter for when the name of the shortcode is passed to shortcode_atts(). props coffee2code. fixes #15155.
git-svn-id: http://core.svn.wordpress.org/trunk@23626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-06 20:07:40 +00:00
Sergey Biryukov
bc2ff9d342 Deprecate wp_convert_bytes_to_hr() in favor of size_format(). props F J Kaiser. fixes #19067.
git-svn-id: http://core.svn.wordpress.org/trunk@23439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-16 03:07:56 +00:00
Sergey Biryukov
6bcd1665eb Add missing inline descriptions. see #19067.
git-svn-id: http://core.svn.wordpress.org/trunk@23437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-16 02:52:57 +00:00
Sergey Biryukov
3d3a2a7692 Return from image_downsize() earlier if a custom resize function is used. props anatolbroder. fixes #23392.
git-svn-id: http://core.svn.wordpress.org/trunk@23410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-14 04:30:55 +00:00
Andrew Nacin
bd7b6a52b1 Verify tags used in the gallery shortcode.
git-svn-id: http://core.svn.wordpress.org/trunk@23316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-22 15:36:57 +00:00
Andrew Nacin
2428b370a2 Media: Pass thumbnail and medium sizes to image_constrain_size_for_editor() to force constraints based on the current DB options for those sizes. History: see #22598, #22738.
props jond3r.
see #23102.
for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@23264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-04 08:52:18 +00:00
Andrew Nacin
c95ff91fe7 Media: Restore 3.4 behavior by consulting the old-school DB options for default align, size, and link properties.
This restores linking to media files as the default, over attachment pages. This 'default' cannot currently be changed by a user setting (per 3.4 behavior), due to the default database schema.

see #22841, for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@23262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-04 08:02:16 +00:00
Andrew Nacin
61bfa78509 Limit the execution of wp_enqueue_media() to once per page. Prevents multiple _wpMediaViewsL10n variables. see #22843.
git-svn-id: http://core.svn.wordpress.org/trunk@23214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-27 16:07:12 +00:00
Helen Hou-Sandí
c8db0f0777 Correct phpdoc @since for wp_oembed_remove_provider(). props hebbet. fixes #22788.
git-svn-id: http://core.svn.wordpress.org/trunk@23186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-20 15:22:21 +00:00
Ryan Boren
fe8a8c9af4 Introduce previous_image_link and next_image_link filters. Allows customizing the gallery display order.
Props nacin
fixes #22829 for trunk


git-svn-id: http://core.svn.wordpress.org/trunk@23139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-09 19:54:23 +00:00
Andrew Nacin
c665bf6ff3 A neditor is a curious multi-celled organism found deep in the Content Management System "WordPress". It generally subsides on good content. It has an obsession with retina-quality graphical elements, and also has a strong affinity for puns. Occasionally, ACCIDENTAL CAPS LOCK occurs. Some organisms carry British accents; these are prone to changing state but then reverting to their previous state soon after. One has shown superior sleuthing abilities, despite having hardly left its Uni laboratory. Organisms from Australia are usually found deeper in the Content Management System, most of its energy spent on locomotion.
The attitude of a neditor is best described as cranky optimism. Younger organisms are more eager, but quickly tire after working on little sleep. They eventually evolve into the cranky optimism stage in a process that generally takes three to five months.



git-svn-id: http://core.svn.wordpress.org/trunk@23105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 09:01:11 +00:00
Andrew Nacin
34e2ed377a Break wp_print_media_templates() into wp-includes/media-template.php and lazy-load that file through wp_enqueue_media(). fixes #22778.
git-svn-id: http://core.svn.wordpress.org/trunk@23101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 07:10:20 +00:00
Mark Jaquith
1aca97360e Remove the "Describe this ___" string on captions in the attachment details view. WP <3 patches with net red. props helenyhou. fixes #22777
git-svn-id: http://core.svn.wordpress.org/trunk@23097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 06:35:13 +00:00
Mark Jaquith
d5eafd1b1f Present the correct downsized image dimensions in the Media modal when inserting. Introduces a context parameter for image_constrain_size_for_editor() instead of relying on is_admin(). props jond3r, nacin. fixes #22738
git-svn-id: http://core.svn.wordpress.org/trunk@23096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 06:25:39 +00:00
Mark Jaquith
1419b404a8 Add the ability to click "Edit" and kick out to the advanced image editor from within the Media modal. New window, with "Refresh" offered on your return. fixes #22743. props koopersmith, nacin, helenyhou.
git-svn-id: http://core.svn.wordpress.org/trunk@23095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 05:52:19 +00:00
Andrew Nacin
e09094434e Restore captions for non-image attachments. see #22759.
git-svn-id: http://core.svn.wordpress.org/trunk@23087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 03:36:17 +00:00
Andrew Nacin
173806d7a1 Restore the Description field to the media UI in 3.5.
We tried in vain -- a noble but ultimately failed effort -- to reduce the number of fields for attachments from four (title, caption, alt, description) to one (caption for images, title otherwise). Alternative text needed to stay for accessibility reasons, of course.

Eventually title returned due to heavy plugin reliance. Description is too used by too many plugins (often times incorrectly -- the caption is more likely the proper field), hence its less-than-triumphant return today.

Version 3.5 has tried to streamline media in a number of ways. Removing fields may have been too much at once, as it forced not only a user interface change, but a paradigm change as well.

Finally, on upload we populate the description field with IPTC/EXIF captions, rather than the caption field. See #22768, this should be fixed. For now, Description stays.

This commit also restores 'Title' attribute editing to the main tab of the Edit Image dialog. The "Title" field no longer populates title attributes for <img> tags by design (for accessibility and other purposes, see #18984). So, here is a more obvious 'workaround' for the tooltip community.

Finally, this:
 * Cleans up the post.php attachment editor, including by showing a prettier form of the mime type.
 * Enables plugins to specifically hide attachment_fields_to_edit from either post.php (where you can create meta boxes) or the modal (which you may not want to clutter), for compatibility reasons.
 * Hides the 'Describe this file...' placeholder when a field is read-only in the modal.

props nacin, helenyhou.
fixes #22759.



git-svn-id: http://core.svn.wordpress.org/trunk@23083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 00:41:06 +00:00
Andrew Nacin
88f61468b3 Media: Final names for the actions in the dialog sidebar: "Insert from URL" and "Set Featured Image" to go with "Insert Media" and "Create Gallery".
Longer strings (such as a translation) looks excellent when it wraps to another line.

props markjaquith, fixes #22753.



git-svn-id: http://core.svn.wordpress.org/trunk@23076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 19:07:48 +00:00
Andrew Nacin
c42ae7acb6 Media: Use '%d selected' for the selection string, and offer a comment to translators to help them find a workable solution with this would-be plural string. fixes #22749. see #22229.
git-svn-id: http://core.svn.wordpress.org/trunk@23075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 19:03:38 +00:00
Mark Jaquith
bc8ddb3e64 Intelligently make media fields readonly when the user cannot update or do anything with them. props koopersmith, helenyhou, nacin. fixes #22613
git-svn-id: http://core.svn.wordpress.org/trunk@23072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 10:29:24 +00:00
Andrew Nacin
49fd122391 Media IE7 fixes. props azaozz, lessbloat. fixes #22732.
git-svn-id: http://core.svn.wordpress.org/trunk@23061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 03:15:53 +00:00
Andrew Nacin
b20c0a5bd5 Image editor doc fixes. props DH-Shredder. see #6821.
git-svn-id: http://core.svn.wordpress.org/trunk@23038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 19:42:28 +00:00
Ryan Boren
a200c702e0 Only show Delete in media modal if the user can delete.
Props nacin, koopersmith
fixes #22711


git-svn-id: http://core.svn.wordpress.org/trunk@23032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:33:51 +00:00
Andrew Nacin
f2f9551287 Add context to the 'Random' string. It is now used in two places: gallery order and the links widget. props pavelevap, fixes #22724.
git-svn-id: http://core.svn.wordpress.org/trunk@23021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 14:49:44 +00:00
Andrew Nacin
6b1a66ac22 Media: Remove four unused strings. props dimadin. fixes #22688.
git-svn-id: http://core.svn.wordpress.org/trunk@23011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 04:16:56 +00:00
Andrew Nacin
156c5fef0f Media: When an image does not have all image sizes available, make sure we insert the requested size into the editor. props koopersmith. fixes #22693.
git-svn-id: http://core.svn.wordpress.org/trunk@23008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 04:04:45 +00:00
Ryan Boren
61a9471024 Final round of media UX improvements.
Props koopersmith
fixes #21390 #22502


git-svn-id: http://core.svn.wordpress.org/trunk@23006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 01:26:03 +00:00
Ryan Boren
63662a9b7b In the QuickPress media modal, use the new post id when a post is published.
Props nacin, koopersmith
fixes #22673


git-svn-id: http://core.svn.wordpress.org/trunk@22994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 07:17:10 +00:00
Ryan Boren
c06ffe745f Show a spinner when attachment details are saved.
Props koopersmith
see #22613


git-svn-id: http://core.svn.wordpress.org/trunk@22991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 06:37:49 +00:00
Ryan Boren
23ed804180 Add random and reverse sorting options to gallery settings.
Props koopersmith
fixes #22637


git-svn-id: http://core.svn.wordpress.org/trunk@22987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 05:32:25 +00:00
Andrew Nacin
db0ef72326 Media: Prevent the compat view from wrapping around the attachment details. Allow the filename to break-word. props koopersmith, SergeyBiryukov. fixes #22667.
git-svn-id: http://core.svn.wordpress.org/trunk@22983 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 04:15:32 +00:00
Andrew Nacin
5d0933d884 Bring Featured Images back into the main media dialog.
Most users don't realize that the Featured Image meta box exists; if they do, few use it.

Restores the old meta box UI, including the admin_post_thumbnail_html filter. If a plugin is using _wp_post_thumbnail_html() in conjunction with Thickbox elsewhere, it will also magically still work.

Specific underlying changes:
 * Converts the modal view to use the view manager, which means that a call to open() will automatically call render and attach if necessary.
 * Doesn't automatically set a state in wp.media, to allow code to customize the states to be added before activation.

props koopersmith.
fixes #21776.



git-svn-id: http://core.svn.wordpress.org/trunk@22979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 02:38:10 +00:00
Daryl Koopersmith
336feff008 Prevent small thumbnails from being upscaled. props helenyhou. fixes #22681.
git-svn-id: http://core.svn.wordpress.org/trunk@22978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 00:42:26 +00:00
Andrew Nacin
36dedb38d1 Media templates: Make sure we have a width and height before printing dimensions. We don't calculate dimensions for icons. fixes #22680.
git-svn-id: http://core.svn.wordpress.org/trunk@22976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 21:53:45 +00:00
Andrew Nacin
1fd29d4b4c Add wp_enqueue_media action to the function of the same name. props koopersmith, fixes #22678.
git-svn-id: http://core.svn.wordpress.org/trunk@22969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:33:20 +00:00
Andrew Nacin
27bf82201b Allow the 'Uploaded to this post' view to be sorted, saving the resulting order as menu_order.
This functionality is designed to be backwards compatible with manual querying for attachments by menu_order.

props koopersmith.
see #22607.



git-svn-id: http://core.svn.wordpress.org/trunk@22967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:06:31 +00:00
Ryan Boren
d4abd95449 Scope button classes so they can be used on the frontend without interfering with theme styles.
Props helenyhou, koopersmith
fixes #22644


git-svn-id: http://core.svn.wordpress.org/trunk@22948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 13:40:59 +00:00
Ryan Boren
27d943786b Introduce API to add back the description field in the new media popup.
Props nacin
fixes #22642


git-svn-id: http://core.svn.wordpress.org/trunk@22929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 23:52:30 +00:00
Ryan Boren
ce2c38fda6 Icons for select, deselect, and window close in the media modal.
Props JerrySarcastic, helenyhou, ocean90, lessbloat
fixes #22610


git-svn-id: http://core.svn.wordpress.org/trunk@22920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 14:36:12 +00:00
Ryan Boren
ea0d28db29 Route uploads through async-upload.php instead of admin-ajax.php.
Props nacin, koopersmith
fixes #22622


git-svn-id: http://core.svn.wordpress.org/trunk@22902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 20:17:57 +00:00
Andrew Nacin
38b46e44ea Media: Rename the dialog to 'Add Media' from 'Insert Media' to match the button. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 17:18:50 +00:00
Andrew Nacin
09d59a0255 In the gallery shortcode, handle mapping of "ids" to include and orderby before the post_gallery filter. see #21816. fixes #22617.
git-svn-id: http://core.svn.wordpress.org/trunk@22891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 03:51:27 +00:00
Andrew Nacin
32c57c6b6a Media: Remove the link to the browser uploader. The only need for it is large files (> 100MB) in certain browsers (IE, Opera), so we will show the link then only. fixes #22604.
git-svn-id: http://core.svn.wordpress.org/trunk@22889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 02:28:10 +00:00
Andrew Nacin
52701f831a wp_print_media_templates() does not take an argument.
git-svn-id: http://core.svn.wordpress.org/trunk@22884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 23:50:26 +00:00
Andrew Nacin
dd3cd96bac When editing a plain, legacy [gallery] shortcode, ensure we are sorting its contents using menu_order.
When attachments are sorted, we convert the shortcode to [gallery ids=""], as before.

props koopersmith.
fixes #22608.



git-svn-id: http://core.svn.wordpress.org/trunk@22882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 23:20:12 +00:00
Ryan Boren
cc9b248937 Always send nocache_headers() for admin-ajax.php. This prevents iOS from caching ajax calls. http://stackoverflow.com/questions/12506897/is-safari-on-ios-6-caching-ajax-results
Turn off multi selection uploads for mobile devices. Currently Plupload cannot upload multiple files in iOS Safari. Only the first file makes it to the queue. 

Empty wp on unload to work around caching in iOS Safari.

Props azaozz, miqrogroove, nacin

fixes #22552


git-svn-id: http://core.svn.wordpress.org/trunk@22872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 16:17:53 +00:00
Ryan Boren
374bf89c49 Fix overflow of long filenames in the media modal.
Props koopersmith, GregLone
fixes #22554


git-svn-id: http://core.svn.wordpress.org/trunk@22870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 15:58:47 +00:00
Ryan Boren
939a47ba48 Add a delete link to the media modal.
Props merty, nacin, koopersmith
fixes #22524


git-svn-id: http://core.svn.wordpress.org/trunk@22869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 15:50:59 +00:00
Ryan Boren
2c1d52526a Don't use "embed" when referring to inserting from URL.
Props nacin
fixes #22603


git-svn-id: http://core.svn.wordpress.org/trunk@22868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 15:35:36 +00:00
Andrew Nacin
1c617a0752 Remove wp_image_editor_class filter. wp_image_editors is sufficient. props scribu. fixes #22538.
git-svn-id: http://core.svn.wordpress.org/trunk@22859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 02:27:11 +00:00
Ryan Boren
e4c8ceca1e Make wp_prepare_attachment_for_js() compatible with plugins that disable all intermediate image sizes (so no images are created on upload), and then create them on the fly using the image_downsize filter (say, with a URL that can dynamically create images on the fly).
Props nacin
fixes #22598


git-svn-id: http://core.svn.wordpress.org/trunk@22850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 22:46:56 +00:00
Ryan Boren
5b94b6b43e In media_buttons(), consult global post_ID if get_post() comes up with nothing.
Default postID to 0 in wp_enqueue_media().

Props nacin
fixes #22085


git-svn-id: http://core.svn.wordpress.org/trunk@22846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 22:03:37 +00:00
Daryl Koopersmith
b5b821c523 Add print_media_templates action to allow custom templates to be added. props ocean90. fixes #22565, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-25 21:45:30 +00:00
Ryan Boren
7a0852c31c Handle attachments that have an empty mime type or a mime type without a subtype.
Props SergeyBiryukov
fixes #22532


git-svn-id: http://core.svn.wordpress.org/trunk@22830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-23 16:32:21 +00:00
Daryl Koopersmith
5f25155408 Media: Use a full uploader status view in the inline uploader. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 12:54:49 +00:00
Daryl Koopersmith
27e8de7e3a Media: Add uploader error detection to the inline uploader view as well. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 12:35:05 +00:00
Daryl Koopersmith
440ec7ef3d Media: Make friends with media_upload_form. Adds notices for browser incompatibility, upload limits, maximum file size, and large file issues to the uploader. fixes #22243, see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22821 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 11:46:03 +00:00
Daryl Koopersmith
54efdbbff7 Media: Make the pre-upload-ui hooks share an element with the post-upload-ui hooks. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 10:57:43 +00:00
Daryl Koopersmith
688b8de348 Media: Display WordPress and plupload error messages whenever an upload fails. see #22243, #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 10:56:10 +00:00
Andrew Nacin
9120cf3375 WP_Image_Editor: the last stand.
* Have wp_get_image_editor() rather than WP_Image_Editor::get_instance(). Having static factory methods would be less confusing if there weren't also static methods tied to individual editor implementations.
 * Lazy-load the WP_Image_Editor base class and editor implementations.
 * Have WP_Image_Editor_GD::supports_mime_type() actually check which types it supports.
 * Deprecate gd_edit_image_support() in favor of wp_image_editor_supports().

props DH-Shredder, scribu, markoheijnen. fixes #22356. see #6821.



git-svn-id: http://core.svn.wordpress.org/trunk@22817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 09:52:16 +00:00
Daryl Koopersmith
1e472d8974 Media: Add global upload progress to the sidebar. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 09:32:21 +00:00
Daryl Koopersmith
e63ef3a443 Media: Move sidebar from the frame view to the attachment browser view. Prevents juggling sidebar visibility state, and makes managing sidebar contents more reasonable. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 06:30:25 +00:00
Daryl Koopersmith
1923278143 Media: Make the window-wide uploader a subview of the frame view.
Allows the uploader to leverage the ready event to know when it has been attached to the page.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 20:27:49 +00:00
Andrew Nacin
55a6c62e76 Support attachment_fields_to_save and attachment_fields_to_edit for attachments going through post.php. see #22186. see #21391.
git-svn-id: http://core.svn.wordpress.org/trunk@22783 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 18:53:00 +00:00
Daryl Koopersmith
cfdea9673b Media: Move the new sections of media-upload.js to media-editor.js to allow the media modal to be used on the front end and prevent dependency conflicts with older themes and plugins. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 16:46:32 +00:00
Daryl Koopersmith
bfc8690006 Media: Backwards compatibility for the many send_to_editor filters. props nacin. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 16:02:20 +00:00
Daryl Koopersmith
e0ebe09802 Media: Backwards compatibility for the disable_captions filter. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 14:27:22 +00:00
Andrew Nacin
8f3a9e1907 Stop inserting title attributes for images inserted into the editor by modifying get_image_send_to_editor(), not the generic get_image_tag().
see #18984, [22409].



git-svn-id: http://core.svn.wordpress.org/trunk@22747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 11:50:30 +00:00
Daryl Koopersmith
5b11aea8f5 Media: Dynamically generate attachment filters using get_post_mime_types().
Moves `get_post_mime_types()` from `wp-admin/includes/post.php` to `wp-includes/post.php`.

fixes #22514, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 10:18:59 +00:00
Andrew Nacin
418c9985f7 Media: For pages, use 'Insert into page' rather than 'Insert into post'.
Custom post types can use the media_view_strings filter. No new post type "labels" for now.

see #22712. see #21092 (and #19696).



git-svn-id: http://core.svn.wordpress.org/trunk@22735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 23:22:03 +00:00
Daryl Koopersmith
6fb316b1fb Media: Add filters to the media library. fixes #22514, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 13:49:35 +00:00
Daryl Koopersmith
220a5175d5 Media: Attachment checkboxes now function as such. fixes #22462, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:10:04 +00:00
Andrew Nacin
3ac8cab666 Add media_view_settings and media_view_strings hooks. fixes #21092 for 3.5. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:58:33 +00:00
Andrew Nacin
f7aa3ab067 Revert [22675]. wp_mime_type_icon() is more accurate when given a post ID, rather than a mime type. The "speed" mostly comes down to the ordering of cache hits, rather than any performance issues like #22503. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22677 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:44:37 +00:00
Andrew Nacin
d9d0f9a714 wp_mime_type_icon() is faster when given a mime type, rather than a post ID. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:39:14 +00:00
Daryl Koopersmith
549b5f61ae Media: Only show the alignment setting when viewing an image. fixes #21836, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 07:24:47 +00:00
Daryl Koopersmith
ff204257db Media: Remove unused batch edit states and strings. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 03:11:48 +00:00
Daryl Koopersmith
4256ba0b48 Media: Add a base view class.
* Centralizes view and subview management, unifying several disjointed constructs.
* Utilizes the `dispose` functionality found in Backbone master, providing a standard method for memory management.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22648 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:36:47 +00:00
Daryl Koopersmith
c5dc0117c3 Media: Wrap the embed screen's alignment setting in a div instead of a label to avoid default browser selection behavior. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 01:49:11 +00:00
Daryl Koopersmith
b19d48e7fe Media: Update in-grid captions.
* Use input fields instead of textboxes (which provide better handling for smaller attachments).
* Provide `data-setting` properties to properly sync the changes.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:53:06 +00:00
Daryl Koopersmith
79c74bbe1e Media: Enter batch insert workflow by editing the selection instead of having an explicit button. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:36:06 +00:00
Daryl Koopersmith
8227b30046 Media: Improve image size-related UI and code.
* Add dimensions to the "sizes" dropdown.
* Ensure a `full` size is generated in `wp_prepare_attachment_for_js()`.
* Print the dimensions for the full size in the attachment summary (instead of those for the current size).
* When generating the attachment view's template, map `imageSize()` to the `size` property instead of overriding the default data.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:08:02 +00:00
Daryl Koopersmith
cf50d92087 Media: Convert templates to use a data variable instead of with statements. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 21:51:41 +00:00
Daryl Koopersmith
fd6b847330 Media: Make edit gallery button use new media. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:06:10 +00:00
Daryl Koopersmith
0188fc3e52 Media: Add support for applicable *-upload-ui hooks.
Supports pre-upload-ui, pre-plupload-upload-ui, post-plupload-upload-ui, post-upload-ui.

see #22186, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 01:50:08 +00:00
Daryl Koopersmith
65e35e3d76 Media: Improve backwards compatibility for image_size_names_choose filter. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 01:23:18 +00:00
Daryl Koopersmith
8c73f531b9 Media: Add an "upload more files" button to upload states. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 23:52:17 +00:00
Daryl Koopersmith
2d87f983ad Media: Add Embed from URL tab.
Note: There is a bug that currently blocks adding several successive embeds.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 05:57:12 +00:00
Daryl Koopersmith
498e4c1366 Media: Ensure variables in the attachment details template have defined defaults.
* Adds styling to the upload progress bar in the attachment details template.
* Defines the `filename` attribute when Plupload creates the client-side `Attachment` model.

fixes #22410, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 05:16:41 +00:00
Daryl Koopersmith
82213846c3 Media: Add backwards compatibility for attachment_fields_to_edit and attachment_fields_to_save. see #22186.
git-svn-id: http://core.svn.wordpress.org/trunk@22541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 01:26:42 +00:00
Daryl Koopersmith
790464193d Media: Add custom URL as an option to attachment display properties. see #21390, #22206.
git-svn-id: http://core.svn.wordpress.org/trunk@22537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 20:36:46 +00:00
Daryl Koopersmith
30e0a600bf Media: Add title, caption, and alt text, and attachment info to sidebar.
* Improve sidebar styles.
* Separate the hybrid title/caption field.
* Improve the sidebar image thumbnail.
* Remove filenames from inside the non-image icon thumbnail.
* Properly sync title/caption/alt.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:25:04 +00:00
Daryl Koopersmith
9c20d148b9 Media: Add instructions to drag and drop to reorder images on gallery and batch edit pages.
Removes search boxes from these pages as well.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 09:11:33 +00:00
Andrew Nacin
14b13a0935 Don't unnecessarily translate media upload tab strings. see #22186.
git-svn-id: http://core.svn.wordpress.org/trunk@22524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:56:17 +00:00
Daryl Koopersmith
bed08350f4 Media: Backwards compatibility for media_upload_tabs.
* Adds `createIframeStates()` to the `MediaFrame` view. It creates states and bindings for the `media_upload_tabs` output, and is included on `MediaFrame.Post` by default.
* Hijacks `tb_remove()` when the media modal is open to ensure the modal closes correctly.
* Adds a `chromeless` parameter to thickbox media tab URLs to render the UI without the old row of tabs.

see #22186, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:51:37 +00:00
Daryl Koopersmith
ef1889a89b Media: Relocate localization to wp_enqueue_media(). see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 00:37:13 +00:00
Daryl Koopersmith
76b23b3d48 Media: Add size dropdown to attachment display settings in the media modal. fixes #22206, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 06:15:25 +00:00
Daryl Koopersmith
0a67c025e5 Media: Add wp_enqueue_media to easily include all media dependencies.
Also, media templates now print on `wp_footer`.

props sushkov. fixes #22060, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 04:57:25 +00:00
Andrew Nacin
57db888420 Allow wp_plupload_default_settings() to be called multiple times without doubling up the output. see #22060.
git-svn-id: http://core.svn.wordpress.org/trunk@22488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 04:51:25 +00:00
Daryl Koopersmith
ef0774026b Media: Improve sidebar handling and make attachment display properties attachment-specific.
`wp.mce.media`
* Watch all workflows for the `insert` event and attempt to insert the current state's `selection` if it exists.
* Fetch and pass attachment display properties through to `wp.media.string.image()`.

`wp.media.controller.Region`
* Separate the concept of events and modes.
* All events triggered on a `Region` trigger both `event` and `event:mode` callbacks.
* When a mode is deactivated, `deactivate` and `deactivate:mode` events are fired.
* When a mode is activated, `activate` and `activate:mode` events are fired.

`wp.media.controller.Library`
* Remove the `details()`, `buildDetails()`, and `clearDetails()` methods that juggled sidebar views. Instead, handle the sidebar views using modes.

`wp.media.controller.Gallery`
* Shift the overloaded `sidebar()` method to use modes.

`wp.media.view.MediaFrame.Post`
* Declare `activate:mode` event bindings using an nested object to reduce repetition.
* Update sidebar activation callbacks.

`wp.media.view.Settings`
* Refactor to leverage HTML data attributes and implicit values (instead of setting the fallback whenever an object was created). This has the additional benefit that gallery shortcode parameters are not output when the user has left them set to the default.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-08 14:15:09 +00:00
Daryl Koopersmith
90781c9e83 Media: Integrate the gallery workflow with the media menu.
`wp.media.model.Query.more()`
* If a request has already been sent out for more attachments, return that request object instead of creating another.

`wp.media.controller.Region`
* A region allows views to be swapped in and out of a section of the page without either view having to know about the other.
* Application components can use the same callbacks and resources by leveraging `Region.mode()`, which triggers a set of callbacks to create or transform the current view, but only if necessary.

`wp.media.view.Frame`
* Leverage `Region` controllers instead of forcing states to swap view objects, which causes states to fit more comfortably in the controller-camp.
* Add `previous()`, a method to fetch the previous state `id`.
* Separate out the default settings over several objects (so blank frames can be instantiated).

`wp.media.view.MediaFrame`
* The base `Frame` used for media management: handles integration with the `Modal` and `UploaderWindow` views.

`wp.media.view.MediaFrame.Post`
* Includes all default media states and callbacks necessary for inserting media into a post.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 20:14:41 +00:00
Daryl Koopersmith
9329d742cb Use Mustache-insipired template tags.
Underscore's default ERB-style templates are incompatible with PHP when asp_tags is enabled. As a result, we've settled on an alternative syntax that should be familiar to devs: Mustache-inspired for interpolating and escaping content, and ERB-inspired for execution.

	`{{{a}}}` - interpolating
	`{{ a }}` - escaping
	`<# a #>` - execution

props rmccue. fixes #22344, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 08:41:17 +00:00
Andrew Nacin
224a21db80 Stop adding title attributes to images (in the old media uploader). props martythornley. fixes #18984.
git-svn-id: http://core.svn.wordpress.org/trunk@22409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 23:23:03 +00:00
Daryl Koopersmith
92823b8635 Streamlining media, part I.
The main goal here is to rearrange the media components in a modularized structure to support more linear workflows. This is that structure using the pre-existing workflows, which will be improved over the course of the next few commits.

This leaves a few pieces a bit rough around the edges: namely gallery editing and selecting a featured image.

The fine print follows.

----

'''Styles'''
* Tightened padding around the modal to optimize for a smaller default screen size.
* Added a light dashed line surrounding the modal to provide a subtle cue for the persistent dropzone (which is evolving into a power user feature since we now have a dedicated `upload` state).
* Add a size for `hero` buttons.
* Remove transitions from frame subviews (e.g. menu, content, sidebar, toolbar).

----

'''Code'''

`wp.media.controller.StateManager`
* Don't fire `activate` and `deactivate` if attempting to switch to the current state.

`wp.media.controller.State`
* Add a base state class to bind default methods (as not all states will inherit from the `Library` state).
* On `activate`, fire `activate()`, `menu()`, `content()`, `sidebar()`, and `toolbar()`.
* The menu view is often a shared object (as its most common use case is switching between states). Assign the view to the state's `menu` attribute.
* `menu()` automatically fetches the state's `menu` attribute, attaches the menu view to the frame, and attempts to select a menu item that matches the state's `id`.

`wp.media.controller.Library`
* Now inherits from `wp.media.controller.State`.

`wp.media.controller.Upload`
* A new state to improve the upload experience.
* Displays a large dropzone when empty (a `UploaderInline` view).
* When attachments are uploaded, displays management interface (a `library` state restricted to attachments uploaded during the current session).

`wp.media.view.Frame`
* In `menu()`, `content()`, `sidebar()`, and `toolbar()`, only change the view if it differs from the current view. Also, ensure `hide-*` classes are properly removed.
*

`wp.media.view.PriorityList`
* A new container view used to sort and render child views by the `priority` property.
* Used by `wp.media.view.Sidebar` and `wp.media.view.Menu`.
* Next step: Use two instances to power `wp.media.view.Toolbar`.

`wp.media.view.Menu` and `wp.media.view.MenuItem`
* A new `PriorityList` view that renders a list of views used to switch between states.
* `MenuItem` instances have `id` attributes that are tied directly to states.
* Separators can be added as plain `Backbone.View` instances with the `separator` class.
* Supports any type of `Backbone.View`.

`media.view.Menu.Landing`
* The landing menu for the 'insert media' workflow.
* Includes an inactive link to an "Embed from URL" state.
* Next steps: only use in select cases to allot for other workflows (such as featured images).

`wp.media.view.AttachmentsBrowser`
* A container to render an `Attachments` view with accompanying UI controls (similar to what the `Attachments` view was when it contained the `$list` property).
* Currently only renders a `Search` view as a control.
* Next steps: Add optional view counts (e.g. "21 images"), upload buttons, and collection filter UI.

`wp.media.view.Attachments`
* If the `Attachments` scroll buffer is not filled with `Attachment` views, continue loading more attachments.
* Use `this.model` instead of `this.controller.state()` to allow `Attachments` views to have differing `edge` and `gutter` properties.
* Add `edge()`, a method used to calculate the optimal dimensions for an attachment based on the current width of the `Attachments` container element.
* `edge()` is currently only enabled on resize, as the relative positioning and CSS transforms used to center thumbnails are suboptimal when coupled with frequent resizing.
* Next steps: For infinite scroll performance improvements, look into absolutely positioning attachment views and paging groups of attachment views.

`wp.media.view.UploaderWindow`
* Now generates a `$browser` element as the browse button (instead of a full `UploaderInline` view). Using a portable browse button prevents us from having to create a new `wp.Uploader` instance every time we want access to a browse button.

`wp.media.view.UploaderInline`
* No longer directly linked to the `UploaderWindow` view or its `wp.Uploader` instance.
* Used as the default `upload` state view.

`wp.media.view.Selection`
* An interactive representation of the selected `Attachments`.
* Based on the improved workflows, this is likely overkill. For simplicity's sake, will probably remove this in favor of `SelectionPreview`.

----

see #21390.



git-svn-id: http://core.svn.wordpress.org/trunk@22362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-04 22:59:12 +00:00
Daryl Koopersmith
41c2935278 Media: Reduce button size for the link gallery setting. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 21:03:27 +00:00
Daryl Koopersmith
c419700f93 Fix positioning of attachment thumbnail overlays.
Prevents the overlay from blocking buttons inside the attachment preview, such as the remove button in the gallery editor.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22343 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 20:34:50 +00:00
Daryl Koopersmith
632cc5ced6 Add gallery settings to the media modal.
* Abstracts `wp.media.view.AttachmentDisplaySettings` into `wp.media.view.Settings` for managing lists of settings with button groups and select boxes. Settings can optionally be tied to a user setting (i.e. using `getUserSetting`).
* Adds `wp.media.view.Settings.AttachmentDisplay`.
* Adds `wp.media.view.Settings.Gallery`.

see #21390, #21815.


git-svn-id: http://core.svn.wordpress.org/trunk@22340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 19:22:25 +00:00
Daryl Koopersmith
c0bc7a7903 Add dynamic attachment view sizing. Removes the attachment view zooming in the process. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 18:05:03 +00:00
Daryl Koopersmith
16c1011cdb Add attachment details to the media sidebar.
* Also moves most of the `Frame` view's `createSelection` method to a real `Selection` model (which inherits from the `Attachments` model).
* Properly assigns the library within the `Gallery` state, allowing for the `Gallery` state to inherit from the `Library` state.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 15:13:02 +00:00
Daryl Koopersmith
aa52a02dd1 Add inline uploader UI to media modal sidebar. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 07:38:13 +00:00
Daryl Koopersmith
f7c1aaf26d Add a sidebar to the media modal.
* Adds `wp.media.view.Sidebar`, to aid in rendering the sidebar.
* Removes the `directions` from the `Attachments` view and shifts search into a separate view (`wp.mce.view.Search`) that can be relocated at will. This also serves to simplify the `Attachments` view by removing the nested `list` and `$list` parameters.
* Show the toolbar on the featured image workflow, effectively requiring confirmation before closing the dialog.

see #21390, #21776, #21808.


git-svn-id: http://core.svn.wordpress.org/trunk@22321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 06:56:23 +00:00
Daryl Koopersmith
53ccb09bce Give media a heart transplant.
Revises the concept of the media controller and workspace views (i.e. two central points of control) to be more granular. The main media object is now the `Frame`, which is a hybrid view and state machine.

The state machine is a collection of states, which are just generic instances of `Backbone.Model`. This circumvents the problem of juggling global parameters when changing states. Each state contains its own event loop. All events are also forwarded to the frame itself (as is the case in all model/collection relationships).

The frame view contains several regions, each of which can be overridden without harming or re-rendering the other regions. These work well when used in conjunction with the state machine events.

This removes the upload sidebar (don't worry, visible upload UI will return). Drag and drop uploading still works. The ability to upload has been abstracted into its own view (instead of being attached to the central workspace view).

Editing galleries is temporarily broken — the gallery creation and editing experiences will be unified in a future patch.

Adds events to detect dragging changes in `wp.Uploader` and adds methods to detect and leverage browser support for CSS3 transitions.

see #21390, #21809.


git-svn-id: http://core.svn.wordpress.org/trunk@22320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-28 23:29:17 +00:00
Daryl Koopersmith
74cea87b2c Add attachment display settings to the media modal.
* Add a media view for button groups.
* Add button dropdown containers.
* Add a dropdown property to the button media model.

fixes #22206, #21814, see #21390, #21813, #21598.


git-svn-id: http://core.svn.wordpress.org/trunk@22247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-16 19:25:17 +00:00
Andrew Nacin
6f2f139645 Fix typo and don't always return false from image_make_intermediate_size(). props gandham, see #22181.
git-svn-id: http://core.svn.wordpress.org/trunk@22225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-13 06:46:17 +00:00
Ryan Boren
da8d7a347a Check for WP_Error return from WP_Image_Editor::get_instance().
Props markoheijnen
see #6821


git-svn-id: http://core.svn.wordpress.org/trunk@22192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 18:59:41 +00:00
Daryl Koopersmith
6a8cccc226 Media Modal: Improve attachment remove button styles. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 04:11:47 +00:00
Daryl Koopersmith
22ad35710b Media Modal: Show progress bars for uploading images, and adjust progress bar styles to compensate for the darker attachment background. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 00:36:42 +00:00
Daryl Koopersmith
1daa774b27 Caption editing in the media modal library.
* Adds a `describe` option to the workflow controller to support inline caption editing.
* For images, descriptions are mapped to the `caption` attribute.
* For other media items, descriptions are mapped to the `title` attribute.
* Descriptions are saved when the textarea's `change` event fires (i.e. when the textarea is blurred).

fixes #21807, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 23:32:48 +00:00
Daryl Koopersmith
d8cd26095a Correctly insert non-image attachments as links.
* Adds `wp.media.string.link( attachment )` for printing attachment links.
* Adds the `link` attribute to `Attachment` models that corresponds to the link to the attachment post.

see #21390, #21836.


git-svn-id: http://core.svn.wordpress.org/trunk@22170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 21:54:21 +00:00
Daryl Koopersmith
ebe800de42 Media JS: Ensure the subtype key has a default set.
Prevents undefined JS errors in the attachments view template.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 10:08:43 +00:00
Daryl Koopersmith
38b0a99f26 Show filenames for non-image attachments in the new media modal.
Also passes all attachment model attributes to the attachment view template by default (instead of selecting specific values).

see #21390, #21836.


git-svn-id: http://core.svn.wordpress.org/trunk@22159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 09:55:47 +00:00
Daryl Koopersmith
2a3859aced Media JS: Improve markup and CSS of the modal view's title.
Also improves the accuracy of closing the modal when the backdrop is clicked (which became error-prone around the title bar in [22144]).

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 09:40:22 +00:00
Daryl Koopersmith
b2c3153b90 When editing a gallery, images can now be added from the media library.
Enables the "Add images from media library" button when editing. The UX has room for improvement, but it's a start.

see #21390, #21809.


git-svn-id: http://core.svn.wordpress.org/trunk@22157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 09:30:22 +00:00
Daryl Koopersmith
24d9eefa46 Improve styling and markup for gallery and attachment MCE views.
Attachment views can now inherit from the theme's `editor-style.css` — just have any rules that apply to the `img` tag apply to `.editor-attachment` as well.

Adds a non-functional edit button to gallery views.

see #21390, #21813, #21815.


git-svn-id: http://core.svn.wordpress.org/trunk@22154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 06:47:22 +00:00
Daryl Koopersmith
fed20bc298 Improve media modal title bar styling. props helenyhou, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 02:56:39 +00:00
Daryl Koopersmith
108b0feaed Remove the attachment quick-insert button from the media modal. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 00:21:52 +00:00
Daryl Koopersmith
aa19c0d66c Better thumbnail previews in the image editor.
* Images are auto-cropped, then fit to the preview on hover (with a slight delay). This is an experiment; we'll see how it turns out.
* Various style changes.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-08 23:20:04 +00:00
Daryl Koopersmith
1deab58658 Use the new media modal to insert galleries into TinyMCE and the text editor.
'''Galleries'''

* Gallery insertion from the new media modal (into TinyMCE, the text editor, etc).
* Gallery previews in TinyMCE now use the `wp.mce.views` API.
* Disables the TinyMCE `wpgallery` plugin.
* Gallery previews consist of the first image of the gallery and the appearance of a stack. This will later be fleshed out to include more images/functionality (including editing the gallery, gallery properties, and showing the number of images in the gallery).
* Multiple galleries can be added to a single post.
* The gallery MCE view provides a bridge between the `wp.shortcode` and `Attachments` representation of a gallery, which allows the existing collection to persist when a gallery is initially created (preventing a request to the server for the query).


'''Shortcodes'''

* Renames `wp.shortcode.Match` to `wp.shortcode` to better expose the shortcode constructor.
* The `wp.shortcode` constructor now accepts an object of options instead of a `wp.shortcode.regexp()` match.
* A `wp.shortcode` instance can be created from a `wp.shortcode.regexp()` match by calling `wp.shortcode.fromMatch( match )`.
* Adds `wp.shortcode.string()`, which takes a set of shortcode parameters and converts them into a string.* Renames `wp.shortcode.prototype.text()` to `wp.shortcode.prototype.string()`.
* Adds an additional capture group to `wp.shortcode.regexp()` that records whether or not the shortcode has a closing tag. This allows us to improve the accuracy of the syntax used when transforming a shortcode object back into a string.

'''Media Models'''

* Prevents media `Query` models from observing the central `Attachments.all` object when query args without corresponding filters are set (otherwise, queries quickly amass false positives).
* Adds `post__in`, `post__not_in`, and `post_parent` as acceptable JS attachment `Query` args.
* `Attachments.more()` always returns a `$.promise` object.

see #21390, #21809, #21812, #21815, #21817.


git-svn-id: http://core.svn.wordpress.org/trunk@22120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-05 04:23:59 +00:00
Ryan Boren
b4d0be2d1a Introduce WP_Image_Editor, WP_Image_Editor_Imagick, and WP_Image_Editor_GD. Abstracts image editing API and adds support for ImageMagick.
Props DH-Shredder, kurtpayne, markoheijnen
see #6821


git-svn-id: http://core.svn.wordpress.org/trunk@22094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-01 20:59:06 +00:00
Daryl Koopersmith
eb54ac6373 Move wp_max_upload_size and dependencies to wp-includes. props johnjamesjacoby. see #21390, fixes #21867.
git-svn-id: http://core.svn.wordpress.org/trunk@22073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 20:59:57 +00:00
Daryl Koopersmith
3cf9d9d905 Add quick insert buttons to attachment views in the library and remove buttons to attachment views in the gallery editor. see #21390, #21809.
git-svn-id: http://core.svn.wordpress.org/trunk@22053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 07:45:26 +00:00
Daryl Koopersmith
45c255a6a9 Use the attachment id to look up the mime type icon instead of the raw mime type string, as wp_mime_type_icon() runs a broader search when using an id. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 06:07:56 +00:00
Daryl Koopersmith
67708a3d8b First pass on TinyMCE attachment in-editor UI.
* Adds in-editor UI for image attachments. Most of this UI should be able to migrate to all images in a future commit.
* Removes the wpeditimage TinyMCE plugin from the default plugins array.
* Add `wp.media.fit`, a helper method to constrain dimensions based upon a maximum width and/or height.
* Add html attribute parsing and string generation utilities (currently stored in mce-views).
* Calling `remove` on a TinyMCE views now ensures that the the parent and references are removed as well.
* Fixes a bug where we weren't sending the full array of results to matches in wp.mce.view.

see #21390, #21812, #21813.



git-svn-id: http://core.svn.wordpress.org/trunk@22012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-26 14:12:54 +00:00
Andrew Nacin
4e0c89c236 Move WP_Embed into its own file. props ocean90. fixes #20533.
git-svn-id: http://core.svn.wordpress.org/trunk@21999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-25 08:39:26 +00:00
Andrew Nacin
a6c93e2f65 Always attempt to embed URLs in content, removing the Auto-embeds (autoembed_urls) option.
Remove the UI for setting the default width and height for embeds. Width was confusing as it
was blank by default (inheriting the content width from the theme, or 500px). The height is
now calculated as 1.5x the content width, or 1000px, whichever is smaller.

The [embed] shortcode can still receive manual height and width attributes. This just removes
the global settings.

props wonderboymusic. see #21719.



git-svn-id: http://core.svn.wordpress.org/trunk@21998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-25 07:10:09 +00:00
Andrew Nacin
33af30eb7f Use the regular post type UI for editing single media items (attachments).
* Attachments now go through post.php, edit_post(), the like, and have show_ui set to true.
 * Taxonomies attached to the media library now appear in the admin menu (if show_ui).
 * Editing, cropping, uploading, etc. is still very rough, but mostly functional.

API-wise:
 * New function: get_taxonomies_for_attachments(). Like get_taxonomies(), for taxonomies specifically registered against attachments.
 * Brings taxonomy support from the posts list table to the media list table. Expect them to converge soon.
 * wp_insert_attachment() now handles taxonomies like wp_insert_post(). Also expect them to converge soon.
 * New edit_form_after_title hook.

props helenyhou, ocean90. see #21391.



git-svn-id: http://core.svn.wordpress.org/trunk@21948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-21 22:52:54 +00:00
Daryl Koopersmith
f7ae81b15d Rename the attachment-thumbnail class in the media modal Attachment view to prevent conflicts with wp_get_attachment_image(). see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@21909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-19 01:10:17 +00:00
Andrew Nacin
f69fdb6198 Don't sanitize include and exclude in gallery_shortcode(), as this is handled further down the stack, and better. props SergeyBiryukov, TobiasBg. fixes #21827.
git-svn-id: http://core.svn.wordpress.org/trunk@21833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-13 17:06:25 +00:00
Andrew Nacin
58e1e69c4b oEmbed uses author_can(), not current_user_can(). props DrewAPicture, fixes #21880.
git-svn-id: http://core.svn.wordpress.org/trunk@21830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-13 16:42:43 +00:00
Daryl Koopersmith
2f5090bfb8 Prevent img elements in the media modal from being draggable. see #21390.
Browsers natively support dragging img elements, which would then set off the drop zone in the modal. We disable this by setting the draggable attribute to false.



git-svn-id: http://core.svn.wordpress.org/trunk@21785 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-07 22:09:40 +00:00
Daryl Koopersmith
fee99ba9b4 Use icons for non-image attachments in the new media modal. see #21836, #21390, #21808.
git-svn-id: http://core.svn.wordpress.org/trunk@21784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-07 21:27:07 +00:00
Mark Jaquith
a282823b17 use 'ids' parameter for explicit attachment ordering in [gallery] shortcodes. fixes #21816
git-svn-id: http://core.svn.wordpress.org/trunk@21778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-06 19:19:56 +00:00
Daryl Koopersmith
8763c79698 Add checks for attachment metadata when formatting attachments for JS.
Prevents notices from causing malformed ajax responses.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@21772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-06 09:50:41 +00:00
Daryl Koopersmith
43fc38330a Adds UI for media modal toolbars, buttons, and the selected item(s) status.
Currently uses actions for inserting media into a post as an example (hence the raw text). To test a workflow that supports multiple selection, run the following in your browser's JavaScript console:

	wp.media({ multiple: true });

see #21390, #21808.



git-svn-id: http://core.svn.wordpress.org/trunk@21769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-06 07:46:15 +00:00
Ryan Boren
cfb35a9d85 Use get_post() instead of global $post.
Make the $post argument to get_post() optional, defaulting to the current post in The Loop.

Props nacin
see #21309


git-svn-id: http://core.svn.wordpress.org/trunk@21735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-04 16:29:28 +00:00
Daryl Koopersmith
da9864c82a Media: Use numeric timestamps instead of string-based timestamps when preparing an attachment for js.
We use the 'date' attribute to create Javascript Date objects. The Date() constructor has better cross-browser compatibility when numeric arguments are passed to the constructor.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@21691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 19:14:43 +00:00
Daryl Koopersmith
c217397faa Add new media workflow scripts, styles, and templates.
Please note that this commit does not integrate media into the existing UI. If you would like to see the new UI, navigate to the post editor and run the following in your browser's Javascript console:

	new wp.media.controller.Workflow().render().modal.open();


The Javascript is broken up into two files, with the slugs media-models and media-views.

* media-models: The models are UI agnostic, and can be used independent of the views. If you'd like to create custom UIs, this is the script for you.

* media-views: This is the Media Experience. The views (and controllers) depend on the models (which are listed as a dependency and will automatically be included thanks to wp_enqueue_script). The views also require the media templates, media-view styles, and the plupload bridge settings. Perhaps we should create a function to include the whole shebang, but in the meantime...

To include media-views in the admin, run the following PHP in or after 'admin_enqueue_scripts':

	wp_enqueue_script( 'media-views' );
	wp_enqueue_style( 'media-views' );
	wp_plupload_default_settings();
	add_action( 'admin_footer', 'wp_print_media_templates' );

see #21390.



git-svn-id: http://core.svn.wordpress.org/trunk@21683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 04:54:23 +00:00
Andrew Nacin
5546df59d3 Introduce wp_prepare_attachment_for_js(). Prepares an attachment post object to be JSON-encoded and fitted into an Attachment model, for 3.5 media.
props koopersmith. see #21390.



git-svn-id: http://core.svn.wordpress.org/trunk@21680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 02:04:40 +00:00
Ryan Boren
f56d8278bb Remove return ref from all calls to get_post()
Return WP_Post from get_default_post_to_edit()
Replace all calls to get_page() with get_post()
see #21309


git-svn-id: http://core.svn.wordpress.org/trunk@21597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 20:01:10 +00:00
ryan
c390c3afb0 Introduce wp_oembed_remove_provider(). Props r-a-y. fixes #16327
git-svn-id: http://core.svn.wordpress.org/trunk@21351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-26 20:18:27 +00:00
koopersmith
14f04132af Theme Customizer: Fix scrolling on iOS and Kindle Fire. props azaozz, helenyhou. fixes #20805.
Also fixes uploader UIs on iOS and Kindle Fire by improving wp.Uploader.
Adds mobile viewport specifications.
Moves scrollbar back to fixed positioning.


git-svn-id: http://core.svn.wordpress.org/trunk@21014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-06-06 21:45:17 +00:00
nacin
06c86f519d In image_resize(), do not force the destination filename to *.jpg when we are dealing with a *.jpeg.
props SergeyBiryukov.
fixes #16458.



git-svn-id: http://core.svn.wordpress.org/trunk@20701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-02 20:58:57 +00:00
nacin
fbea58a1b7 Add filter to image_resize_dimensions() so plugins can perform this calculation on their own. props ebababi. fixes #15989.
git-svn-id: http://core.svn.wordpress.org/trunk@20694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-02 20:15:44 +00:00
azaozz
e8beafd57b Change the image caption shortcode format to [caption ...]<a><img /></a> caption text + html[/caption]. That way HTML tags in captions are better supported and the shortcode wouldn't break when using the wrong quotes. Props sushkov, nacin, fixes #18311
git-svn-id: http://core.svn.wordpress.org/trunk@20679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-02 01:14:52 +00:00
duck_
3fdd4ee29f wp_oembed_get() returns false on failure. Props SergeyBiryukov. Fixes #20355.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-22 11:19:56 +00:00
nacin
f665eb6a26 Remove enqueue of wp_plupload_default_settings() from admin_enqueue_scripts(). For now, it needs to be enqueued selectively when needed. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-21 03:21:07 +00:00
koopersmith
9ef7cbbdd8 Theme Customizer: Bind wp_plupload_default_settings() to the customize_controls_enqueue_scripts hook. Fixes JS errors. see #19910, [20189].
git-svn-id: http://svn.automattic.com/wordpress/trunk@20197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-15 19:46:15 +00:00
nacin
ae6bf5bd80 Move wp_plupload_default_settings() to the admin_enqueue_scripts hook to prevent fatal errors when admin_init is run outside of normal admin-header execution, like admin-ajax. see #19910. fixes #20240.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-15 12:53:39 +00:00
nacin
4bd9f4f9f2 URL to admin-ajax.php should be relative. see #19910. see #18952.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20188 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-15 12:52:23 +00:00
nacin
5aba8d043c Ensure no nonce or multipart_params get passed to the plupload_default_settings filter. see #19910.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-15 12:50:18 +00:00
koopersmith
c06576d410 Theme Customizer: First pass for upload controls, using background image as an example. Add a wrapper for Plupload that allows for custom upload UIs. see #19910.
wp.Uploader is a wrapper that provides a simple way to upload an attachment (using the wp_ajax_upload_attachment handler). It is intentionally decoupled from the UI. When an upload succeeds, it will receive the attachment information (id, url, meta, etc) as a JSON response. If the upload fails, the wrapper handles both WordPress and plupload errors through a single handler.

As todos, we should add drag classes for the uploader dropzone and account for the rough 100mb filesize limit in most browsers. The UI for the customizer upload controls could be improved as well.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-15 04:14:05 +00:00
nacin
bfeb575df9 Use relative paths for admin-ajax.php to avoid cross-domain issues with IDN domains in IE and Opera. props SergeyBiryukov, fixes #18952.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-08 16:12:11 +00:00
ryan
e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
ryan
07ff8b216b Use one space, not two, after trailing punctuation. fixes #19537
git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-13 23:45:31 +00:00
ryan
32e25b6aec phpdoc typo and readability fixes. Props SergeyBiryukov. fixes #18560
git-svn-id: http://svn.automattic.com/wordpress/trunk@18827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-29 22:57:43 +00:00
duck_
2f51b9be0d Fix typos in documentation (wp-includes/[i-z]). See #18560.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-05 19:08:15 +00:00
ryan
19c3608dcc Remove unused global. Props ocean90. fixes #18484
git-svn-id: http://svn.automattic.com/wordpress/trunk@18605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-25 19:35:22 +00:00
nbachiyski
abe8b47351 Explicitly globalize some variables, so that unit tests can run WordPress inside a function. Fixes #17749
git-svn-id: http://svn.automattic.com/wordpress/trunk@18532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-11 04:45:14 +00:00
nacin
59446cff1d Remove default-embeds.php. fixes #17112.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-28 17:03:23 +00:00
westi
80f4e83a8c Introduce WP_MAX_MEMORY_LIMIT constant for the high memory limit we set when image processing and unzipping.
Ensure it is always filterable by plugins as well as configurable in wp-config
Fixes #13847 props hakre


git-svn-id: http://svn.automattic.com/wordpress/trunk@17749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-28 16:25:36 +00:00
ryan
4e09dfc8fb Remove PHP4 constructor. Props Jayjdk. see #16768
git-svn-id: http://svn.automattic.com/wordpress/trunk@17631 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-11 18:57:34 +00:00
nacin
bd6fe3c99c Document that the size parameter in image_downsize() can also be an array. props scribu, fixes #16263.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-23 18:46:38 +00:00
nacin
96b5c58ec2 use_default_gallery_style boolean filter and new gallery-columns-* class. see #15103.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-10 19:15:37 +00:00
nacin
951549bf93 wp-caption-text class for the gallery shortcode caption. props chipbennett, fixes #14411.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-10 19:05:50 +00:00
markjaquith
7290e527e7 Pass post ID to embed_oembed_html filter to avoid global variable incantations. props filosofo. fixes #15491
git-svn-id: http://svn.automattic.com/wordpress/trunk@16740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-06 03:38:27 +00:00
nacin
d0098e51bb Unescape ampersands before making an oEmbed request. props Viper007Bond, fixes #14514, see #11311.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-05 02:23:17 +00:00
nacin
69b3167678 Revert [15688], [15689], [15691]. Try again in 3.2. see #14966.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-22 17:17:26 +00:00
scribu
7640c5748b Add colon after Upload/Insert. Fixes #14810
git-svn-id: http://svn.automattic.com/wordpress/trunk@16358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-13 22:52:51 +00:00
scribu
fdd3556806 Introduce wp_basename() and use it for media handling. See #11887
git-svn-id: http://svn.automattic.com/wordpress/trunk@16154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-02 17:19:55 +00:00
nacin
d1093ac706 More pedantry.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 00:33:29 +00:00
nacin
054e18cb05 Docs and breathing room for get_media_buttons() and friends. see #14966.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-03 03:08:39 +00:00
nacin
4e666d5d44 Move some post and taxonomy functions from admin/includes to wp-includes in preparation for QuickPress template tag. Moves get_tags_to_edit, get_terms_to_edit, get_default_post_to_edit, media_buttons, _media_button, get_upload_iframe_src. Also introduce get_media_buttons as a wrapper for media_buttons. props jorbin, see #14966.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-03 02:58:59 +00:00