Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-04 09:49:37 +01:00
Code Issues Projects Releases Wiki Activity
37,027 Commits 50 Branches 747 Tags 785 MiB
564e13cf30
Commit Graph

101 Commits

Author SHA1 Message Date
Weston Ruter
a979e17e2b Media: Upgrade MediaElement.js to 4.2.5-74e01a40 fixing missing mejs.MediaElement reference. 
ALso fixes:

* Accessibility for volume control
* Progress bar tooltip positioning and dimensions correctly set for media with long duration
* Better codec checking
* Minor CSS fix to avoid flickering effect on volume control

Props rafa8626.
See #39686.
Fixes #41640.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-08-28 19:29:47 +00:00
Weston Ruter
f0ee106d86 Media: Upgrade MediaElement.js from 4.2.3 to 4.2.5. 
Props rafa8626.
See #39686.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-08-12 06:20:44 +00:00
Weston Ruter
7af3b92736 Media: Upgrade MediaElement.js from 2.22.0 to 4.2.3. 
Props rafa8626, grosbouff, westonruter, azaozz, Plastikschnitzer for testing.
See #39686.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-08-01 04:43:51 +00:00
Adam Silverstein
498613ccd7 Media: Fix improper use of jQuery hasClass method. 
The jQuery `hasClass` method accepts a class name without a prefix '.' (period). Remove an errant class name with a '.' in `wp-mediaelement.js` that broke the selector in certain circumstances.

Props kostasx, Presskopp.
Fixes #40354.


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


git-svn-id: http://core.svn.wordpress.org/trunk@40522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-12 20:53:45 +00:00
Andrea Fercia
691d649329 Media: Remove the custom styling for the MediaElementJS controls offscreen text. 
This offscreen text is not meant to be revealed on focus and just acts as fallback
for assistive technologies that don't support `aria-label` and `role="slider"`.
Also, revealing it on focus has proven over time to be very fragile and to cause
unexpected layout issues.

See #30281.
Fixes #40707.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-11 22:29:42 +00:00
Andrea Fercia
d33301821b Buttons: Improve the .button-link CSS class for link-like buttons. 
Updates `.button-link` adding color and underline to make link-like buttons look
like links by default. Introduces `.button-link-delete` as a modifier, stackable
CSS class for red button-links.

Props Cheffheid, afercia.

See #34242.
Fixes #35126.

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


git-svn-id: http://core.svn.wordpress.org/trunk@39989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-02-09 16:47:44 +00:00
Aaron Jorbin
32be6f7bb7 Bump grunt-contrib-uglify from 1.0.1 to 2.0.0 
Sets `screwIE8` to false as it is now enabled by default

Files Changed:
build/wp-admin/js/customize-nav-menus.min.js
build/wp-admin/js/customize-widgets.min.js
build/wp-includes/js/customize-loader.min.js

Changelog:
2016-07-19   v2.0.0   Update uglify-js to v2.7.0. screwIE8 is enabled by default.
2016-07-19   v1.0.2   Update grunt to ^1.0.0. Fix beautify when passed as an object. Fix docs about report values.

See #38199.


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


git-svn-id: http://core.svn.wordpress.org/trunk@39059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-03 05:40:34 +00:00
Dominik Schilling
20f0aeb0f7 External Libraries: Update MediaElement.js to 2.22.0. 
Includes a fix for broken YouTube embeds which are embedded with the `[video]` shortcode. 

Changelog: https://github.com/johndyer/mediaelement/blob/2.22.0/changelog.md
Diff: https://github.com/johndyer/mediaelement/compare/2.21.1...2.22.0

Fixes #37363.
Built from https://develop.svn.wordpress.org/trunk@38088


git-svn-id: http://core.svn.wordpress.org/trunk@38029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-07-18 10:59:30 +00:00
Dominik Schilling
db05059ca0 External Libraries: Update MediaElement.js to 2.21.2. 
Includes a fix for broken YouTube embeds in Firefox.

Changelog: https://github.com/johndyer/mediaelement/blob/2.21.1/changelog.md
Diff: https://github.com/johndyer/mediaelement/compare/2.18.1...2.21.1

Props swissspidy.
Fixes #36759.
Built from https://develop.svn.wordpress.org/trunk@37887


git-svn-id: http://core.svn.wordpress.org/trunk@37828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-28 09:26:28 +00:00
Dominik Schilling
a493dc0ab5 External Libraries: Update MediaElement.js from upstream. 
Built from https://develop.svn.wordpress.org/trunk@37370


git-svn-id: http://core.svn.wordpress.org/trunk@37336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-06 17:51:36 +00:00
Andrea Fercia
a71f14b8d9 Accessibility: Reduce the WordPress shades of grey, Episode 3. 
Also, removes some no more used CSS.

See #35783.
Built from https://develop.svn.wordpress.org/trunk@36904


git-svn-id: http://core.svn.wordpress.org/trunk@36872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-09 19:51:26 +00:00
Dominik Schilling
dc6a3284e8 Media: JSHint for wp-playlist.js. 
File was added to the watchlist in [36780].

See #35984.
Built from https://develop.svn.wordpress.org/trunk@36783


git-svn-id: http://core.svn.wordpress.org/trunk@36750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-02-29 21:50:27 +00:00
Dominik Schilling
7bd910b30d Media: Add support for minified versions of wp-playlist.js, wp-mediaelement.js and wp-mediaelement.css. 
Fixes #35984.
Built from https://develop.svn.wordpress.org/trunk@36780


git-svn-id: http://core.svn.wordpress.org/trunk@36747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-02-29 20:43:26 +00:00
Scott Taylor
cee318ed81 Media: When reusing the initial values from the global MediaElement config object, the config object should first be cloned. Objects in JS are references that will retain any changes. This fixes an issue where player controls could get mixed up between instances when multiple players (namely, single audio and audio playlists, in a certain order) are on the same page. 
Props Fab1en.
Fixes #34152.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-01-20 15:47:28 +00:00
Dominik Schilling
9cd5b76fbd jQuery: Replace $( document ).on( 'ready', fn ) with $( fn ). 
The 'ready' event is deprecated since jQuery 1.8.

See https://github.com/jquery/jquery-migrate/blob/1.3.0/warnings.md#jqmigrate-ready-event-is-deprecated.
See #35380.
Built from https://develop.svn.wordpress.org/trunk@36288


git-svn-id: http://core.svn.wordpress.org/trunk@36255 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-01-13 17:39:25 +00:00
Helen Hou-Sandí
28c77bec72 RIP #21759b, the old WordPress Blue. 
The final lingering instances were all for hidden accessibility helper text.

fixes #34388.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-21 18:36:28 +00:00
Scott Taylor
b20e8dbf69 MediaElement, update wp-mediaelement.js: 
* create a public `initialize` method on the `wp.mediaelement` namespace
* make it idempotent to prevent nasty side-effects caused by initializing media elements more than once

Props bradyvercher.	
Fixes #32423.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-20 03:17:24 +00:00
Scott Taylor
d2578f84d1 MediaElement: apply monkey patch to include a PR which fixes a breaking change made upstream on a public interface: 
ccba8d0b6a

Props bradyvercher.
Fixes #33798.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-20 02:31:24 +00:00
Scott Taylor
fa7bc4fda0 Upgrade MediaElement to 2.18.1 - monkey-patches to allow H264 in Chromium. 
Changelog: https://github.com/johndyer/mediaelement/compare/2.17.0...2.18.1

See #33798.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-11 18:35:26 +00:00
Sergey Biryukov
bffe6a63ba Make curly quotes in playlist item title translatable. 
fixes #33391.
Built from https://develop.svn.wordpress.org/trunk@33844


git-svn-id: http://core.svn.wordpress.org/trunk@33812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-01 13:50:21 +00:00
Scott Taylor
b19bb99853 Playlists, for .wp-playlist-item-title elements: move the curly quotes to CSS pseudo-element content, making them easier to override or remove. 
Fixes #33391.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-19 05:51:25 +00:00
Scott Taylor
9de28a2e04 Monkey patch MediaElement to include a PR that restores responsive videos in Firefox: 
https://github.com/johndyer/mediaelement/pull/1531

Props joemcgill.
Fixes #32722.

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


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

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


git-svn-id: http://core.svn.wordpress.org/trunk@32923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-06-26 05:01:24 +00:00
Scott Taylor
5e1d796cae Ugrade MediaElement to 2.17.0 
Changelog: https://github.com/johndyer/mediaelement/compare/2.16.4...2.17.0

Fixes #32698.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-06-19 20:42:26 +00:00
Helen Hou-Sandí
bfda508c18 Update more instances of default admin blues and grays. 
props hugobaeta.
fixes #31234.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-05 21:20:27 +00:00
Scott Taylor
38df7e5048 For our MediaElement 2.16.4 build + monkey patches, also add from the illustrious dd32: 
https://github.com/johndyer/mediaelement/pull/1423

Props dd32.
See [31444], #31541.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-06 15:47:26 +00:00
Scott Taylor
e4952687f6 Audio previews need top margin on Edit Media screen. 
Fixes #31524.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-05 22:45:26 +00:00
Scott Taylor
cd49531b14 Ugrade to MediaElement 2.16.4: 
https://github.com/johndyer/mediaelement/compare/2.16.2...2.16.4

Includes PRs from WordPress folk:
1a74854abf
f438256f5c
8b9856accd

Monkey-patch MediaElement to restore H264 support to Chromium.

Documented here:
https://core.trac.wordpress.org/ticket/31541#comment:1

See #31541.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-05 16:54:26 +00:00
Scott Taylor
236d8ae9dc After [31016], would be cool if we actually included the froogaloop file to interact with Vimeo. 
Props dimadin.
Fixes #29267.

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


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

Fixes #29267.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-12-31 20:41:24 +00:00
Scott Taylor
f492a8f7dc In response to regressions on .com, fix MEjs styles for screen reader text and overflow on the volume slider. 
Props obenland.
See #30281.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-12-16 15:13:24 +00:00
Scott Taylor
a702c60e9d Incorporate https://github.com/johndyer/mediaelement/pull/1385 into our custom build of MediaElement 2.16.2. 
Props bradyvercher.
Fixes #30281.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-12-07 23:59:23 +00:00
Scott Taylor
8b1b1a10ed Monkey-patch MediaElement to restore H264 support to Chromium. 
Documented here:
https://core.trac.wordpress.org/ticket/30281#comment:9

See #30281.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-12-04 00:59:23 +00:00
Scott Taylor
68f0690aa4 Upgrade to MediaElement 2.16.2 
https://github.com/johndyer/mediaelement/compare/2.15.1...2.16.2

Fixes #30281.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-30 05:58:24 +00:00
Scott Taylor
6142a650b7 Allow developers to override the settings.success callback for MediaElement players. 
Props nofearinc.
Fixes #30029.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-29 01:21:24 +00:00
Scott Taylor
3d8e31fb82 Don't hardcode height for videos - this was a workaround for MediaElement internals causing problems. Responsive videos now work properly and don't cause extra whitespace. 
Fixes MediaElement by hand in the interim: https://github.com/johndyer/mediaelement/pull/1337
Video playlists were completely broken by this.

Fixes #30078.


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


git-svn-id: http://core.svn.wordpress.org/trunk@30082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-29 00:47:24 +00:00
Scott Taylor
067feb9691 Remember when we added the style attribute to playlists? Fix dark. 
Props karpstrucking.
Fixes #29530.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-02 05:28:16 +00:00
Scott Taylor
293e344490 Upgrade MediaElement to 2.15.1. 
Changes from 2.15.0:
https://github.com/johndyer/mediaelement/compare/2.15.0...2.15.1

Continues to revert upstream commit b7f82b4 to restore the status quo for Chromium support.

See [29688].
Fixes #29620 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-11 17:44:15 +00:00
Andrew Nacin
4d6697aaa6 MediaElement: Revert upstream commit b7f82b4 to restore the status quo for Chromium support. 
fixes #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-03 06:32:15 +00:00
Andrew Ozz
703b625820 Media: add a class to the <script> tag for the JSON encoded playlist data so it can be easily selected in WPPlaylistView. Props SergeyBiryukov, fixes #29383 
Built from https://develop.svn.wordpress.org/trunk@29660


git-svn-id: http://core.svn.wordpress.org/trunk@29434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-01 19:55:18 +00:00
Scott Taylor
149346ff6e MCE View sandboxes: 
* Use a `MutationObserver` to listen to the `body` class of the parent editor frame.
* In `wpview_media_sandbox_styles()`, only return the MEjs stylesheets.
* In `wp_ajax_parse_media_shortcode()` and `wp_ajax_parse_embed()`, return an object instead of an HTML blob to allow passing `body` and `head` separately	

Props avryl, azaozz.
Fixes #29048.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-26 04:46:15 +00:00
Scott Taylor
d6213d64a5 After [29543], the iframe sandboxes for media need to load Open Sans. Playlists look aggressively bad without it. Adds font styles for the body. 
See #29048.

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


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

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

See #29110.

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


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

See #29110.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-08-09 19:39:15 +00:00
Scott Taylor
cb2d88a092 After [29179], remove the last instance of this.isCompatibleSrc(). 
Props kovshenin.
See #28905.


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


git-svn-id: http://core.svn.wordpress.org/trunk@29059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-23 17:54:15 +00:00
Scott Taylor
75d3fe3e65 Cleanup after [29179]: 
* Cleanup players when the editor is hidden - window scope is unique to each frame
* Add the editor body class to each iframe sandbox
* Remove unneeded code from `wp-mediaelement.js`

See #28905.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-16 16:14:14 +00:00
Scott Taylor
93fdff3581 Simplify creation of audio, video, and playlist MCE views by placing them in iframe sandboxes. 
Wins:
* Eliminates duplication of code between PHP and JS
* Views can load JS without messing with TinyMCE and scope
* MEjs doesn't break when it loads a file plugin-mode. This allows any file type the MEjs supports to play in MCE views.
* YouTube now works as the source for video.
* Users can still style the views, editor stylesheets are included in these sandboxes.
* Audio and Video URLs and `[embed]`s are no longer broken.
* Remove the crazy compat code necessary to determine what file types play in what browser.
* Remove unneeded Underscore templates.
* Remove the compat code for playlists.

See #28905.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-07-15 22:18:14 +00:00
Scott Taylor
4ad56ce548 Make sure the audio player's time tooltip is visible in the media modal for Audio Details. 
Fixes #28453.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-06-26 20:29:14 +00:00
Scott Taylor
17271702ca In the spirit of [27622], add a few CSS rules to ensure that videos will be responsive, regardless of theme. 
Props Funkatronic.
Fixes #28414.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-06-02 00:40:15 +00:00
Scott Taylor
4fd5ffe994 In WPPlaylistView::ended(), at the end of a playlist, set the index to 0 and call ->setCurrent() instead of ->loadCurrent() so that the first track is properly highlighted. 
Fixes #28428.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28467 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-06-02 00:27:18 +00:00