Commit Graph

1670 Commits

Author SHA1 Message Date
Andrew Ozz
9b691a21b0 Heartbeat API: add nopriv actions, add JS 'heartbeat-send' event, see #23216
git-svn-id: https://develop.svn.wordpress.org/trunk@23481 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-25 02:32:22 +00:00
Andrew Nacin
0c89805886 jQuery UI 1.10.1.
props ocean90. see #23370.



git-svn-id: https://develop.svn.wordpress.org/trunk@23442 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-16 17:40:37 +00:00
Mark Jaquith
ead92fb39d "LGPL License" is redundant.
props wonderboymusic, jakub.tyrcha. fixes #15585

git-svn-id: https://develop.svn.wordpress.org/trunk@23425 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-15 16:26:46 +00:00
Andrew Nacin
d9e2f14dca jQuery UI 1.10.0.
Some lingering issues with the edit/insert link dialog.

props ocean90.
see #23370.



git-svn-id: https://develop.svn.wordpress.org/trunk@23423 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-15 16:13:26 +00:00
Andrew Nacin
88b8e29f0d jQuery 1.9.1 and jQuery Migrate 1.1.0.
Remains uncompressed for now, until we work out all 1.9.x issues.
Fixes custom fields.

props ocean90, wonderboymusic. see #22975.



git-svn-id: https://develop.svn.wordpress.org/trunk@23421 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-15 16:09:04 +00:00
bumpbot
42926ca699 Compress scripts/styles: 3.6-alpha-23403. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23403 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-12 22:58:43 +00:00
Andrew Ozz
6d0ee4dc7d TinyMCE: include cd84a63d4a to fix backspace and line breaks issues in WebKit, see #23337
git-svn-id: https://develop.svn.wordpress.org/trunk@23402 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-12 02:04:09 +00:00
Mark Jaquith
e3a1266c0c Revert [23375] until we can get Media fixed to work with newer versions of Backbone. see #23262
git-svn-id: https://develop.svn.wordpress.org/trunk@23390 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-08 03:15:22 +00:00
Andrew Ozz
b38675a65a Heartbeat API: fix error in IE < 9, props SergeyBiryukov, don't attempt to bind events to cross-domain iframes, see #23216
git-svn-id: https://develop.svn.wordpress.org/trunk@23389 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-06 07:10:04 +00:00
bumpbot
68360b40ab Compress scripts/styles: 3.6-alpha-23386.
git-svn-id: https://develop.svn.wordpress.org/trunk@23386 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-04 14:38:03 +00:00
Mark Jaquith
bd80d92a89 Update Underscore to version 1.4.4. see #23262
git-svn-id: https://develop.svn.wordpress.org/trunk@23383 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-04 06:40:21 +00:00
Andrew Ozz
682b66b560 Heartbeat API: throttle down when the window looses focus or when the user is inactive, always send 'screen_id', change the interval settings to 'fast' (5sec), 'standard' (15sec) and 'slow' (60sec), the interval can be changed from PHP, see #23216
git-svn-id: https://develop.svn.wordpress.org/trunk@23382 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-03 07:03:27 +00:00
Andrew Nacin
faa884032e Update Backbone.js to 0.9.10. props aaronholbrook, fixes #23262.
git-svn-id: https://develop.svn.wordpress.org/trunk@23375 602fd350-edb4-49c9-b593-d223f7449a82
2013-02-02 02:02:53 +00:00
Andrew Ozz
23ef0e4e0b Remove BOM from jquery.query.js, fixes #23315
git-svn-id: https://develop.svn.wordpress.org/trunk@23356 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-29 20:52:32 +00:00
Andrew Ozz
5edc6b2711 Heartbeat API: first run, see #23216
git-svn-id: https://develop.svn.wordpress.org/trunk@23355 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-29 06:15:25 +00:00
Andrew Ozz
995de61c9d Update Plupload to 1.5.5, fixes #23277 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@23339 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-23 20:54:42 +00:00
bumpbot
5d2f7a3a4d Compress scripts/styles: 3.6-alpha-23334. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23334 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-22 22:57:24 +00:00
Andrew Ozz
f8a254ec56 Autop: <samp> is not a block tag, props toscho, fixes #18807
git-svn-id: https://develop.svn.wordpress.org/trunk@23327 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-22 19:05:21 +00:00
Andrew Nacin
77cdc0ce65 jQuery 1.9 final. jQuery Migrate 1.0. Uncompressed for now, while we iron out kinks.
props jorbin. see #22975.



git-svn-id: https://develop.svn.wordpress.org/trunk@23301 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-15 17:52:42 +00:00
Andrew Ozz
84827c87dc Media: when copying from "caption" (textarea) to "alt" (text input) also remove line breaks, props kovshenin, fixes #23176 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@23298 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-14 17:34:45 +00:00
bumpbot
ae63b07abd Compress scripts/styles: 3.6-alpha-23288.
git-svn-id: https://develop.svn.wordpress.org/trunk@23288 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-05 02:33:20 +00:00
Andrew Nacin
2d12f38ad1 Don't unnecessarily re-render the attachment details view when editing the title and caption. Re-rendering causes issues with tabbing and focus, and is only necessary for other views (such as "Caption this image..." when editing a gallery).
props koopersmith.
fixes #23054.
for trunk.



git-svn-id: https://develop.svn.wordpress.org/trunk@23283 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 23:29:20 +00:00
bumpbot
f6e22d011c Compress scripts/styles: 3.6-alpha-23266.
git-svn-id: https://develop.svn.wordpress.org/trunk@23266 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 17:39:23 +00:00
Daryl Koopersmith
0221f597b4 Media: Properly reset the "add to gallery" library to ensure it accurately reflects the current gallery. see #22815.
git-svn-id: https://develop.svn.wordpress.org/trunk@23263 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 08:28:12 +00:00
Andrew Nacin
dec369d6c8 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: https://develop.svn.wordpress.org/trunk@23262 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 08:02:16 +00:00
Daryl Koopersmith
e73a323a16 Media: Do not update attachment display user settings when a single attachment is inserted.
This is consistent with 3.4 behavior.

see #22841.


git-svn-id: https://develop.svn.wordpress.org/trunk@23261 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 08:01:19 +00:00
Daryl Koopersmith
2b5612e266 Media: Check that a router region exists before attempting to access its child views. Add relevant documentation. see #22930.
git-svn-id: https://develop.svn.wordpress.org/trunk@23260 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 07:08:37 +00:00
Daryl Koopersmith
45d01dad51 Media: Automatically select uploading attachments in single-select workflows.
The code now automatically selects uploading attachments in all workflows. In a workflow that selects multiple attachments, all attachments added to the upload queue are selected. In a workflow that selects a single attachment (e.g. selecting a featured image), the last attachment added to the upload queue is selected.

see #22817.


git-svn-id: https://develop.svn.wordpress.org/trunk@23259 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-04 06:44:21 +00:00
bumpbot
46e1c12b98 Compress scripts/styles: 3.6-alpha-23257.
git-svn-id: https://develop.svn.wordpress.org/trunk@23257 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-03 22:58:37 +00:00
Daryl Koopersmith
cc68dcede3 Don't include the default columns="3" in a gallery shortcode.
Shortcode attributes are strings; fix a variable type error in wp.media.gallery defaults.
props adamsilverstein.

see #22919.


git-svn-id: https://develop.svn.wordpress.org/trunk@23247 602fd350-edb4-49c9-b593-d223f7449a82
2013-01-03 06:09:09 +00:00
bumpbot
140881a378 Compress scripts/styles: 3.6-alpha-23223. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23223 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-27 22:58:50 +00:00
Andrew Ozz
c6d566d726 TinyMCE: don't remove empty <i>, <b>, <em> and <strong> matching the behavior in WordPress 3.4/TinyMCE 3.4.9, see #22477 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@23222 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-27 22:44:10 +00:00
Andrew Ozz
d0a1164c15 TinyMCE: prevent <a> from wrapping block elements, fixes #22888 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@23219 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-27 21:01:56 +00:00
bumpbot
5999474328 Compress scripts/styles: 3.6-alpha-23193. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23193 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-21 18:52:36 +00:00
Andrew Ozz
349efcf8cb TinyMCE: update to latest source including the WebKit backspace fix, see #23010
git-svn-id: https://develop.svn.wordpress.org/trunk@23192 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-21 18:18:58 +00:00
Helen Hou-Sandi
1303e7377a its <=> it's in documentation, along with a rogue the, The, and looses. props trepmal. fixes #22665.
git-svn-id: https://develop.svn.wordpress.org/trunk@23191 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-20 15:55:32 +00:00
Andrew Nacin
eb3fc35a3d Update jQuery Migrate plugin to latest, fixing .toggle(boolean) usage. see #22975.
git-svn-id: https://develop.svn.wordpress.org/trunk@23182 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-17 20:08:08 +00:00
Andrew Nacin
5eb6ded111 Update to jQuery 1.9 Beta 1 in trunk (3.6-alpha).
Temporarily includes jQuery in original, unminified form, for ease of testing and bug reporting.

jQuery 1.9 introduces a "migrate" script for deprecated and removed behavior. Warnings are issued for methods we should not be using, and should be fixed in core. These warnings are sent to the JavaScript console and are collected in `jQuery.migrateWarnings`.

See http://blog.jquery.com/2012/12/17/jquery-1-9-beta-1-released/ for more.

props ocean90, see #22975.



git-svn-id: https://develop.svn.wordpress.org/trunk@23180 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-17 17:29:40 +00:00
Andrew Nacin
90f71fd703 3.5-RC6-23166
git-svn-id: https://develop.svn.wordpress.org/trunk@23166 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 23:32:04 +00:00
Andrew Nacin
b386a936e1 Makes sure attachment sizes are correctly deselected in IE. Fixes size selections on insert in IE9. props koopersmith. fixes #22851.
git-svn-id: https://develop.svn.wordpress.org/trunk@23163 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 23:15:53 +00:00
Mark Jaquith
b7a4314cbc Ignore failed uploads. props koopersmith. fixes #22849
git-svn-id: https://develop.svn.wordpress.org/trunk@23162 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 22:58:28 +00:00
bumpbot
2359d3397c Compress scripts/styles: 3.5-RC5-23155. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23155 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 10:15:13 +00:00
Andrew Nacin
4c3c22af1e Restore the duck punch of TinyMCE's schema from [23120], along with updated rules for all HTML5 elements, as painstakingly audited against the HTML5 spec.
Remove conflicting and unnecessary code in the WP TinyMCE plugin.

Fixes all known regressions when working with the embed, object, video, audio, source, and param elements in TinyMCE.

props markjaquith, koopersmith.
fixes #22790, #22842.
fixes #22842.



git-svn-id: https://develop.svn.wordpress.org/trunk@23153 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 10:10:12 +00:00
Andrew Nacin
a01fafb7c1 Add TinyMCE's Schema.js to prepare for patching it. see #22790. see #22842. for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@23151 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 10:01:24 +00:00
Andrew Nacin
003a8e9c65 Delete the patch of TinyMCE's schema; new attempt. see #22790. see #22842. for the 3.5 branch.
git-svn-id: https://develop.svn.wordpress.org/trunk@23149 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 09:56:31 +00:00
bumpbot
63dbb2f4e4 Compress scripts/styles: 3.5-RC5-23145. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23145 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 02:41:15 +00:00
Andrew Nacin
9857a5d028 TinyMCE: Use the correct syntax for allowing an embed element to be a valid child of an object element.
Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
see #22790.
for trunk.
... with the right patch this time. [23142] was done in error.



git-svn-id: https://develop.svn.wordpress.org/trunk@23144 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 02:40:16 +00:00
bumpbot
bf247694cb Compress scripts/styles: 3.5-RC5-23143. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23143 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 02:38:50 +00:00
Andrew Nacin
b8a5aca5eb TinyMCE: Use the correct syntax for allowing an embed element to be a valid child of an object element.
Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
see #22790.
for trunk.



git-svn-id: https://develop.svn.wordpress.org/trunk@23142 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-10 02:37:50 +00:00
bumpbot
168fdca8e2 Compress scripts/styles: 3.5-RC4-23127.
git-svn-id: https://develop.svn.wordpress.org/trunk@23127 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 21:00:25 +00:00
Daryl Koopersmith
c5eee310f4 Trailing commas make IE7 cry. fixes #22819.
git-svn-id: https://develop.svn.wordpress.org/trunk@23124 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 20:42:10 +00:00
bumpbot
be03cb514b Compress scripts/styles: 3.5-RC4-23121. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23121 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 11:41:16 +00:00
Andrew Nacin
66f1a19089 Add a sane, inclusive HTML element/attribute schema to TinyMCE.
TinyMCE 3.4.x (shipped with WordPress 3.4.x) had an HTML4-based schema definition, with HTML5 elements added to it. TinyMCE 3.5.x (shipping, again coincidentally, with WordPress 3.5) allows for HTML5 schema support, which also provides for full HTML5 attribute support. The problem is its HTML5 schema excludes all HTML4 elements and attributes that were dropped in the HTML5 spec, which is unacceptable behavior.

This "duck punch" of TinyMCE's Schema.js file creates a new, sane schema. It is TinyMCE's HTML4 and HTML5 schema definitions recursively merged.

Objects are not whitelisted in either schema to allow for embed elements as child nodes, so object, param, and embed remain separately whitelisted in the WordPress TinyMCE plugin. Our attempts to add other attributes in said plugin is now superceded.

props koopersmith, azaozz.
fixes #22790.



git-svn-id: https://develop.svn.wordpress.org/trunk@23120 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 11:26:25 +00:00
Andrew Nacin
35edf3665d Add TinyMCE 3.5.8's Schema.js file in preparation for monkey patching it. see #22790.
git-svn-id: https://develop.svn.wordpress.org/trunk@23119 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 11:12:51 +00:00
bumpbot
77d453ddea Compress scripts/styles: 3.5-RC4-23115.
git-svn-id: https://develop.svn.wordpress.org/trunk@23115 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 01:15:44 +00:00
Andrew Nacin
844c3f322d Remove trailing comma from JS. props koopersmith, fixes #22800.
git-svn-id: https://develop.svn.wordpress.org/trunk@23114 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 01:13:04 +00:00
bumpbot
412a605ecf Compress scripts/styles: 3.5-RC4-23113. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23113 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 00:07:33 +00:00
Ryan Boren
ce2720984b Extend allowed elements for object and embed.
Props azaozz
fixes #22790


git-svn-id: https://develop.svn.wordpress.org/trunk@23112 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-07 00:05:54 +00:00
bumpbot
01259734c2 Compress scripts/styles: 3.5-RC4-23111.
git-svn-id: https://develop.svn.wordpress.org/trunk@23111 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 23:17:49 +00:00
Ryan Boren
a0a13a3fc4 When inserting from URL in the media modal, retain query params and properly insert the caption code.
Props koopersmith
fixes #22796


git-svn-id: https://develop.svn.wordpress.org/trunk@23110 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 23:12:59 +00:00
bumpbot
789be95446 Compress scripts/styles: 3.5-RC3-23104.
git-svn-id: https://develop.svn.wordpress.org/trunk@23104 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 08:13:44 +00:00
Andrew Nacin
3403c1d157 Properly apply CSS and an ID attribute to the select files container. props koopersmith. fixes #22780. see #22762.
git-svn-id: https://develop.svn.wordpress.org/trunk@23100 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 07:00:41 +00:00
bumpbot
66f7523e43 Compress scripts/styles: 3.5-RC3-23099.
git-svn-id: https://develop.svn.wordpress.org/trunk@23099 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 06:58:33 +00:00
Andrew Nacin
b186d63721 Media: When the attachment details view changes to another view or attachment, save compat fields on destroy. (We already do this for non-compat fields.) props koopersmith. fixes #22776.
git-svn-id: https://develop.svn.wordpress.org/trunk@23098 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 06:56:06 +00:00
Mark Jaquith
e0f5f47c57 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: https://develop.svn.wordpress.org/trunk@23095 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 05:52:19 +00:00
bumpbot
40dad409f4 Compress scripts/styles: 3.5-RC3-23093.
git-svn-id: https://develop.svn.wordpress.org/trunk@23093 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 05:26:39 +00:00
Daryl Koopersmith
a4f2112fd3 Add a canonical location for media frames, an alias to fetch attachments, and frame caching to custom header. fixes #22775.
git-svn-id: https://develop.svn.wordpress.org/trunk@23092 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 05:06:49 +00:00
bumpbot
21f933625f Compress scripts/styles: 3.5-RC3-23091. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23091 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 04:58:34 +00:00
Andrew Ozz
b0cd25962e Upgrade to TinyMCE 3.5.8, fixes #22755
git-svn-id: https://develop.svn.wordpress.org/trunk@23090 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 04:50:31 +00:00
Mark Jaquith
d801545ff6 New method of managing media selections. There is now a "master" selection in the background. props koopersmith. fixes #22725
* This especially helps when you switch between insert/gallery and have non-images selected (as galleries don't support non-images).
* The views now act as filters on the "master" selection, instead of having their own selections that get passed around.

git-svn-id: https://develop.svn.wordpress.org/trunk@23089 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 03:55:37 +00:00
Andrew Nacin
dc3a34b19b Restore captions for non-image attachments. see #22759.
git-svn-id: https://develop.svn.wordpress.org/trunk@23087 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 03:36:17 +00:00
Daryl Koopersmith
977deb7d63 Do not alter the body's overflow attribute when the media modal is opened. Fix image insertion in the visual editor in Firefox. props azaozz. fixes #22765.
git-svn-id: https://develop.svn.wordpress.org/trunk@23085 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 03:15:39 +00:00
bumpbot
2255750962 Compress scripts/styles: 3.5-RC3-23084.
git-svn-id: https://develop.svn.wordpress.org/trunk@23084 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 00:42:44 +00:00
Andrew Nacin
1cc12103f5 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: https://develop.svn.wordpress.org/trunk@23083 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-06 00:41:06 +00:00
bumpbot
bee0035c66 Compress scripts/styles: 3.5-RC3-23080.
git-svn-id: https://develop.svn.wordpress.org/trunk@23080 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 21:22:59 +00:00
Ryan Boren
f549a8baa6 Fix uploads in IE9
Props koopersmith
fixes #22762


git-svn-id: https://develop.svn.wordpress.org/trunk@23079 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 21:21:17 +00:00
bumpbot
c936792bbb Compress scripts/styles: 3.5-RC3-23078.
git-svn-id: https://develop.svn.wordpress.org/trunk@23078 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 19:22:54 +00:00
Andrew Nacin
0d7c64c9fd 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: https://develop.svn.wordpress.org/trunk@23076 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 19:07:48 +00:00
Andrew Nacin
bdba526d83 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: https://develop.svn.wordpress.org/trunk@23075 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 19:03:38 +00:00
bumpbot
c3b88709fd Compress scripts/styles: 3.5-RC3-23073.
git-svn-id: https://develop.svn.wordpress.org/trunk@23073 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 10:58:32 +00:00
Mark Jaquith
92793b6ec2 Intelligently make media fields readonly when the user cannot update or do anything with them. props koopersmith, helenyhou, nacin. fixes #22613
git-svn-id: https://develop.svn.wordpress.org/trunk@23072 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 10:29:24 +00:00
Mark Jaquith
d767e74ae9 Implement tabbing between fields in the media modal. props lessbloat, koopersmith. fixes #22659
git-svn-id: https://develop.svn.wordpress.org/trunk@23070 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 09:57:58 +00:00
Mark Jaquith
81bdf1b5d1 When setting the featured image from the dedicated meta box, only show the featured image section in the media chooser. props koopersmith. fixes #22731
* Less distracting
* Some of these sections won't apply for CPTs without an editor

git-svn-id: https://develop.svn.wordpress.org/trunk@23069 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 09:43:10 +00:00
Mark Jaquith
189d4da5de Fix the "Uploaded to this post" filter in the "Add to gallery" state. fixes #22723
Also, use "images" wording instead of generic "media items" when in a gallery (images-only) context. fixes #22722

Both are props koopersmith

git-svn-id: https://develop.svn.wordpress.org/trunk@23068 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 09:25:17 +00:00
Mark Jaquith
aabaa0fb8e Use data on the ui.item to transport the original Sortable index for the update() function. This way extensions can set/access this info in their own custom Sortable functions. see #22696
git-svn-id: https://develop.svn.wordpress.org/trunk@23067 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 09:04:19 +00:00
bumpbot
fc3c9a8004 Compress scripts/styles: 3.5-RC3-23066.
git-svn-id: https://develop.svn.wordpress.org/trunk@23066 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 04:58:33 +00:00
Ryan Boren
86203fa6bf Clear the From URL view in the media modal after inserting an image. Improve button enable checks.
Props koopersmith
fixes #22740


git-svn-id: https://develop.svn.wordpress.org/trunk@23065 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 04:43:51 +00:00
Mark Jaquith
4413c9514b Allow a sortable options hash to be passed in, so you can override the defaults. props koopersmith. see #22696
git-svn-id: https://develop.svn.wordpress.org/trunk@23064 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 04:11:49 +00:00
bumpbot
6b81fd778d Compress scripts/styles: 3.5-RC3-23059.
git-svn-id: https://develop.svn.wordpress.org/trunk@23059 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 02:58:34 +00:00
Andrew Nacin
bc8f994e7b Media models: Trac and ignore deleted attachments.
Treat an admin-ajax response of 1 as successful for backwards compatibility with existing handlers.

props koopersmith. fixes #22750.



git-svn-id: https://develop.svn.wordpress.org/trunk@23057 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 02:31:41 +00:00
Andrew Nacin
01e7e10bf7 Media: Don't try to resize the bottom selection UI. props koopersmith. fixes #22748.
git-svn-id: https://develop.svn.wordpress.org/trunk@23056 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 01:38:44 +00:00
Andrew Nacin
426eb50936 Fix inserting of multiple attachments with captions when the first attachment does not have a caption. props azaozz. fixes #22720.
git-svn-id: https://develop.svn.wordpress.org/trunk@23055 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 00:59:25 +00:00
bumpbot
25337c050c Compress scripts/styles: 3.5-RC3-23054.
git-svn-id: https://develop.svn.wordpress.org/trunk@23054 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 00:58:31 +00:00
Daryl Koopersmith
eae68af55c Toggle display of plupload overlays when the select files button is hidden. see #22732.
git-svn-id: https://develop.svn.wordpress.org/trunk@23053 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 00:45:21 +00:00
Andrew Nacin
3fd91ed4cf Media: Return to the library when the editing a selection and all items get de-selected. props koopersmith. fixes #22715.
git-svn-id: https://develop.svn.wordpress.org/trunk@23051 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 00:22:11 +00:00
Ryan Boren
e13e333569 When inserting an image From URL, show the fields only if it looks like we have a valid image.
Props koopersmith
fixes #22740


git-svn-id: https://develop.svn.wordpress.org/trunk@23048 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 23:07:41 +00:00
bumpbot
2e35cea2fa Compress scripts/styles: 3.5-RC3-23047. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@23047 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 22:44:27 +00:00
Ryan Boren
52b234de11 When deleting an image in the editor with the delete or backspace keys, hide the edit and delete popup buttons.
Props azaozz, lessbloat
fixes #22717


git-svn-id: https://develop.svn.wordpress.org/trunk@23046 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 22:42:26 +00:00
Ryan Boren
b5fdf3753f In the media modal, clear attachment details when clearing the selection.
Props koopersmith
fixes #22718


git-svn-id: https://develop.svn.wordpress.org/trunk@23045 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 22:19:08 +00:00
bumpbot
db2e7dc099 Compress scripts/styles: 3.5-RC3-23043.
git-svn-id: https://develop.svn.wordpress.org/trunk@23043 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 20:58:33 +00:00
Andrew Nacin
d1c428faed Media: When doing a multiple-insert into the editor, separate each inserted item with two line breaks. props tar.gz. see #22720.
git-svn-id: https://develop.svn.wordpress.org/trunk@23042 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 20:52:58 +00:00
Andrew Nacin
6d580e34db When adding images to a gallery, use "Images" as the filter name, rather than "All media items". props koopersmith. fixes #22722.
git-svn-id: https://develop.svn.wordpress.org/trunk@23041 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 20:51:37 +00:00
bumpbot
60b3adaa09 Compress scripts/styles: 3.5-RC3-23040.
git-svn-id: https://develop.svn.wordpress.org/trunk@23040 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 19:56:16 +00:00
Andrew Ozz
4f4e7e5cec RTL: properly align the demo image in the Edit Image popup, props nacin, fixes #22733
git-svn-id: https://develop.svn.wordpress.org/trunk@23039 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 19:51:35 +00:00
Andrew Nacin
0fa07588c5 Media: Properly select the select element's option in the attachment display settings. props koopersmith. fixes #22693.
git-svn-id: https://develop.svn.wordpress.org/trunk@23037 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 19:38:16 +00:00
Andrew Nacin
39049254ae Move utils.js (cookie and user setting functions) to wp-includes to enable front-end use.
Make it a dependency of media-views (and therefore media-editor). Move its userSettings JS object from admin-header to being paired with the script in script loader.

see #22730.



git-svn-id: https://develop.svn.wordpress.org/trunk@23036 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 19:29:56 +00:00
bumpbot
fde1031744 Compress scripts/styles: 3.5-RC3-23035.
git-svn-id: https://develop.svn.wordpress.org/trunk@23035 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 18:58:30 +00:00
Ryan Boren
7e2df6dc07 Better dropdown select handling.
Props cdog, koopersmith
fixes #22693


git-svn-id: https://develop.svn.wordpress.org/trunk@23033 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 18:50:49 +00:00
Ryan Boren
fa4b718809 Only show Delete in media modal if the user can delete.
Props nacin, koopersmith
fixes #22711


git-svn-id: https://develop.svn.wordpress.org/trunk@23032 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 18:33:51 +00:00
Ryan Boren
eb3dc78a61 Media: Hide "Edit" link in the selection view when it doesn't make sense
Props koopersmith, ocean90, nacin
fixes #22713


git-svn-id: https://develop.svn.wordpress.org/trunk@23031 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 18:23:47 +00:00
bumpbot
d2c09370e1 Compress scripts/styles: 3.5-RC3-23030.
git-svn-id: https://develop.svn.wordpress.org/trunk@23030 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 18:13:59 +00:00
Mark Jaquith
0f3c162db6 Fix a Firefox "scroll to bottom" bug when launching the media modal.
* Records main document scroll position when launching media modal.
* Restores position when media modal is closed.
* Also locks background document scrolling while media modal is open, preventing inadvertent scrolling there.

props koopersmith. fixes #22716

git-svn-id: https://develop.svn.wordpress.org/trunk@23029 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 17:58:24 +00:00
Mark Jaquith
4241d42dbe Update toolbars for Embed screen. Fixes JS error. props koopersmith. fixes #22714
git-svn-id: https://develop.svn.wordpress.org/trunk@23028 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 17:45:24 +00:00
bumpbot
344ddade55 Compress scripts/styles: 3.5-RC3-23025.
git-svn-id: https://develop.svn.wordpress.org/trunk@23025 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 16:25:14 +00:00
Andrew Nacin
e961de8af5 Media: Disable 'Insert gallery' and 'Set featured image' if nothing is queued. Converts selection toolbars to use the newer view manager. props koopersmith, fixes #22714.
git-svn-id: https://develop.svn.wordpress.org/trunk@23024 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 16:21:57 +00:00
bumpbot
e171e1c977 Compress scripts/styles: 3.5-RC2-23018.
git-svn-id: https://develop.svn.wordpress.org/trunk@23018 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 06:58:31 +00:00
Mark Jaquith
3c992973bb Fix a typo in media-views.js that referenced frame.router.get() instead of frame.router. Fixes #22710
git-svn-id: https://develop.svn.wordpress.org/trunk@23015 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 05:18:21 +00:00
bumpbot
fbb3a42707 Compress scripts/styles: 3.5-RC2-23013.
git-svn-id: https://develop.svn.wordpress.org/trunk@23013 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 04:58:31 +00:00
Ryan Boren
b5ae45fae3 Fix race condition in media insertion where the inserted html is invalid due to output being interleaved.
Props koopermsith
fixes #22696


git-svn-id: https://develop.svn.wordpress.org/trunk@23012 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 04:38:42 +00:00
Andrew Nacin
63aa98ed0c 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: https://develop.svn.wordpress.org/trunk@23008 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 04:04:45 +00:00
bumpbot
4073eb5ec2 Compress scripts/styles: 3.5-RC2-23007. props koopersmith. :-)
git-svn-id: https://develop.svn.wordpress.org/trunk@23007 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 01:29:58 +00:00
Ryan Boren
00e20a52dc Final round of media UX improvements.
Props koopersmith
fixes #21390 #22502


git-svn-id: https://develop.svn.wordpress.org/trunk@23006 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-04 01:26:03 +00:00
Andrew Nacin
4acd3d7db8 Alternative Text, not Alternate Text. props SergeyBiryukov. fixes #21176.
git-svn-id: https://develop.svn.wordpress.org/trunk@22996 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 19:21:34 +00:00
bumpbot
0a8240a9c4 Compress scripts/styles: 3.5-RC2-22995.
git-svn-id: https://develop.svn.wordpress.org/trunk@22995 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 08:09:10 +00:00
Ryan Boren
71d333f660 In the QuickPress media modal, use the new post id when a post is published.
Props nacin, koopersmith
fixes #22673


git-svn-id: https://develop.svn.wordpress.org/trunk@22994 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 07:17:10 +00:00
Ryan Boren
594bbe90df When settting a featured image, move the currently selected image to the beginning of the library if it doesn't exist within the attachments loaded so far.
Props koopersmith
fixes #22494


git-svn-id: https://develop.svn.wordpress.org/trunk@22993 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 07:04:34 +00:00
bumpbot
077dea75f7 Compress scripts/styles: 3.5-RC2-22992.
git-svn-id: https://develop.svn.wordpress.org/trunk@22992 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 06:53:58 +00:00
Ryan Boren
7ad3d2410c Show a spinner when attachment details are saved.
Props koopersmith
see #22613


git-svn-id: https://develop.svn.wordpress.org/trunk@22991 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 06:37:49 +00:00
Ryan Boren
c21e4809c3 Show Select Files button the first time the media modal is opened.
Props koopermsith
fixes #22691


git-svn-id: https://develop.svn.wordpress.org/trunk@22990 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 06:32:25 +00:00
bumpbot
c164b8e2c4 Compress scripts/styles: 3.5-RC2-22988.
git-svn-id: https://develop.svn.wordpress.org/trunk@22988 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 05:42:30 +00:00
Ryan Boren
9cdc4de444 Add random and reverse sorting options to gallery settings.
Props koopersmith
fixes #22637


git-svn-id: https://develop.svn.wordpress.org/trunk@22987 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 05:32:25 +00:00
Andrew Nacin
6b0e365fc0 Media: Don't add menu_order to newly uploaded attachments, to match 3.4 behavior. Reverts a bit of [22967]. props koopersmith. fixes #22607.
git-svn-id: https://develop.svn.wordpress.org/trunk@22985 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 04:54:03 +00:00
Ryan Boren
558d134c6b Update gallery editing to work with the modal changes. Add nice handling for default states.
Props koopersmith
see #21776


git-svn-id: https://develop.svn.wordpress.org/trunk@22984 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 04:38:10 +00:00
Andrew Nacin
f88b538001 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: https://develop.svn.wordpress.org/trunk@22979 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-03 02:38:10 +00:00
bumpbot
30066d6553 Compress scripts/styles: 3.5-RC2-22975.
git-svn-id: https://develop.svn.wordpress.org/trunk@22975 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 19:49:31 +00:00
Andrew Nacin
a83710408f wp.media instead of just media. props alexkingorg, see #22676.
git-svn-id: https://develop.svn.wordpress.org/trunk@22974 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 19:24:22 +00:00
bumpbot
23f78b14df Compress scripts/styles: 3.5-RC2-22973.
git-svn-id: https://develop.svn.wordpress.org/trunk@22973 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 16:57:38 +00:00
Andrew Nacin
5c611cde9d Use wp.media, not media, in media-editor.js. see #22676.
git-svn-id: https://develop.svn.wordpress.org/trunk@22972 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 16:55:58 +00:00
bumpbot
dff51dff56 Compress scripts/styles: 3.5-RC2-22971.
git-svn-id: https://develop.svn.wordpress.org/trunk@22971 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 16:50:10 +00:00
Andrew Nacin
7d0efc4012 Avoid leaking the 'media' var into the global JS namespace. props koopersmith, fixes #22676.
git-svn-id: https://develop.svn.wordpress.org/trunk@22968 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 16:32:47 +00:00
Andrew Nacin
d8e714d6e3 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: https://develop.svn.wordpress.org/trunk@22967 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 16:06:31 +00:00
bumpbot
976342549d Compress scripts/styles: 3.5-RC2-22966.
git-svn-id: https://develop.svn.wordpress.org/trunk@22966 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 04:35:23 +00:00
Ryan Boren
14bd848ee5 In the media modal, show the Link To: url.
Props nacin
fixes #22662


git-svn-id: https://develop.svn.wordpress.org/trunk@22965 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-02 00:43:08 +00:00
bumpbot
ce238d39ef Compress scripts/styles: 3.5-RC2-22958.
git-svn-id: https://develop.svn.wordpress.org/trunk@22958 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 17:41:19 +00:00
Ryan Boren
0996e3d153 Resolve race conditions in Attachments.more().
Props koopersmith
fixes #22656


git-svn-id: https://develop.svn.wordpress.org/trunk@22957 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 16:45:43 +00:00
Ryan Boren
303f2bd2ff Resolve race conditions in Attachments.more(). Provides for smoother refreshes when searching and properly cleans out content components.
Props koopersmith
fixes #22656


git-svn-id: https://develop.svn.wordpress.org/trunk@22956 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 16:41:38 +00:00
bumpbot
98d7fb5e28 Compress scripts/styles: 3.5-RC2-22953. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22953 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 15:20:51 +00:00
Ryan Boren
06b9663f58 Refine media state machine methods.
* state( id ) becomes setState( id )
* get( id ) becomes state( id )
* state() stays the same
* previous() becomes lastState()

Props koopersmith
fixes #22652


git-svn-id: https://develop.svn.wordpress.org/trunk@22952 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 15:19:11 +00:00
Ryan Boren
d7ec10376b Update the "Uploaded to this post" filter view when uploading new files.
* Add an Attachments collection filter for uploadedTo (post_parent).
* Correct an erroneous map from the non-existent parent prop to post_parent.
* Define default menuOrder and uploadedTo props for uploading attachments.
* Unify filterable props into a single method (improving validation performance for calls to set with multiple properties).

Props koopersmith
fixes #22654


git-svn-id: https://develop.svn.wordpress.org/trunk@22951 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 15:11:44 +00:00
bumpbot
74f9eabbd0 Compress scripts/styles: 3.5-RC2-22949.
git-svn-id: https://develop.svn.wordpress.org/trunk@22949 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-30 13:52:16 +00:00