Commit Graph

533 Commits

Author SHA1 Message Date
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
nacin
5a20c05d27 Phpdoc argument/@param cleanups. props duck_, see #14783.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 11:21:11 +00:00
markjaquith
7944bd5d82 These are not verbs. http://notaverb.com/badbad_verbs
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-27 18:02:45 +00:00
markjaquith
4a1321c8ee Initialize instead of using isset(). props nacin. see #13556
git-svn-id: http://svn.automattic.com/wordpress/trunk@15003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-27 20:41:36 +00:00
markjaquith
2ac2f215b2 Tweaks to wp_constrain_dimensions() for better fits and consistency. fixes #13556
git-svn-id: http://svn.automattic.com/wordpress/trunk@15002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-27 20:37:42 +00:00
nacin
4de1c8edf4 Add some educational tips. Suggest using add_image_size() in the inline docs for image_get_intermediate_size() and wp_get_attachment_image(). props jorbin. see #13556.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-27 05:03:46 +00:00
markjaquith
6655fa6bc7 Use the correct array members of image_resize_dimensions() result when calculating best match for dynamic HTML image resize. fixes #13556
git-svn-id: http://svn.automattic.com/wordpress/trunk@14979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-27 04:40:14 +00:00
nacin
4d7c88f4a4 Introduce is_rtl(). Use it in core. It only becomes defined when locale is loaded, so it's impossible to use it too early. Deprecate the get_bloginfo('text_direction') call. fixes #13206.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 05:49:19 +00:00
dd32
f7e764312b Fix invalid paths in requires. See r14139. See #12594
git-svn-id: http://svn.automattic.com/wordpress/trunk@14151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-18 09:51:19 +00:00
dd32
3eec9dd73f Use Alt Text for Image alt caption (Falling back to Caption, and finally title) in wp_get_attachment_image() and subsequently, WordPress Galleries. Props kallewangstedt for initial patch. Fixes #11846
git-svn-id: http://svn.automattic.com/wordpress/trunk@14145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-18 08:52:18 +00:00
nacin
6ec7cb4540 Use relative paths when including files, avoiding include_path. fixes #12594, props sorich87.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-18 06:14:45 +00:00
nacin
207a1d6958 Consistently return WP_Error on failure in image_resize. props filosofo, fixes #12268
git-svn-id: http://svn.automattic.com/wordpress/trunk@14105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-16 13:53:22 +00:00
nacin
c29313ab4d Register a dummy [media] shortcode for strip_shortcodes et al. props belg4mit, Viper007Bond. fixes #12505
git-svn-id: http://svn.automattic.com/wordpress/trunk@14035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-08 02:16:21 +00:00
dd32
bf6510abd1 Fix image_resize() dependencies by moving wp_load_image() from admin includes to wp-includes. Fixes #7279
git-svn-id: http://svn.automattic.com/wordpress/trunk@13860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-28 03:39:00 +00:00
dd32
47c064b890 Check if function exists before using it. imageistruecolor() requires PHP 4.3.2, WordPress requires 4.3.0 at this stage. Fixes #12297
git-svn-id: http://svn.automattic.com/wordpress/trunk@13857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-28 02:57:09 +00:00
nacin
a7feaed0e6 Change @since 3.0 to @since 3.0.0.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-26 19:13:36 +00:00
nacin
8c8bf5039f Remove unnecessary ternary operators such as (expr) ? true : false.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-19 21:15:00 +00:00
nacin
8bcc5969dc Spelling and grammar fun. Fixes #11875 props cnorris23
git-svn-id: http://svn.automattic.com/wordpress/trunk@13382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 20:13:23 +00:00
ryan
9ab7306993 Remove author tags. fixes #12366
git-svn-id: http://svn.automattic.com/wordpress/trunk@13377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 19:07:21 +00:00
markjaquith
3284d920c0 Skip intermediate sizes of a different aspect ratio than the original image when considering which image to use in image_get_intermediate_size(). fixes #12218
git-svn-id: http://svn.automattic.com/wordpress/trunk@13145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-14 08:21:07 +00:00
markjaquith
e4283aed00 Revert r13103 and merely restrict \$content_width obeying to is_admin(). fixes #12146
git-svn-id: http://svn.automattic.com/wordpress/trunk@13140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-14 06:34:47 +00:00
markjaquith
b5652f0df3 Do not limit thumbnails by the content_width. props Viper007Bond. fixes #12146
git-svn-id: http://svn.automattic.com/wordpress/trunk@13103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-13 09:40:04 +00:00
ryan
8fbdf18a6b Respect maximum embed height. Props Viper007Bond. fixes #11980
git-svn-id: http://svn.automattic.com/wordpress/trunk@12875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-27 14:38:48 +00:00
ryan
a7c1b164f6 Deprecate wp_shrink_dimension(), add wp-admin/includes/deprecated.php. Props filosofo. fixes #11967
git-svn-id: http://svn.automattic.com/wordpress/trunk@12823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-25 18:50:01 +00:00
ryan
6da55f7792 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@12733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-15 22:11:12 +00:00
westi
cc30f8ad98 Introduce a single function for getting all the intermediate image sizes to be used both when adding attachements and deleting. Fixes #10263 props scribu.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-08 08:51:12 +00:00
ryan
9b6bd6bf87 Retunr WP_Error from wp_crop_image() and image_resize(). Props mdwaffe. fixes #9922
git-svn-id: http://svn.automattic.com/wordpress/trunk@12524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-23 18:39:31 +00:00
ryan
4aca3ca146 Remove oEmbed discovery option. Add hook so plugins can enable it. see #10337
git-svn-id: http://svn.automattic.com/wordpress/trunk@12411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-15 21:16:00 +00:00
azaozz
e07bea12f8 Typecast to int the return of image_resize_dimensions(), fixes #7748
git-svn-id: http://svn.automattic.com/wordpress/trunk@12381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-12 08:06:24 +00:00
markjaquith
bf264bb66d Post/Page Image was too generic a name. Post/Page Thumbnail is more clear, even if you can create very large thumbnail images if you so choose.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-10 06:14:36 +00:00
markjaquith
dc8492b9f5 Introducing set_post_image_size(w, h, crop) so themes can register their special size/crop for canonical post images. WP will create this size/crop upon upload, so your canonical post images fit your space exactly!
git-svn-id: http://svn.automattic.com/wordpress/trunk@12342 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-08 21:08:19 +00:00