Commit Graph

1777 Commits

Author SHA1 Message Date
Daryl Koopersmith
81d474cda0 Toggle display of plupload overlays when the select files button is hidden. see #22732.
git-svn-id: http://core.svn.wordpress.org/trunk@23053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 00:45:21 +00:00
Andrew Nacin
d720772ef3 Media: Return to the library when the editing a selection and all items get de-selected. props koopersmith. fixes #22715.
git-svn-id: http://core.svn.wordpress.org/trunk@23051 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 00:22:11 +00:00
Ryan Boren
51db7de93b 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: http://core.svn.wordpress.org/trunk@23048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 23:07:41 +00:00
Bot (Assets)
d3b24a0e15 Compress scripts/styles: 3.5-RC3-23047. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@23047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 22:44:27 +00:00
Ryan Boren
c9db63ab1e 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: http://core.svn.wordpress.org/trunk@23046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 22:42:26 +00:00
Ryan Boren
edf9769d26 In the media modal, clear attachment details when clearing the selection.
Props koopersmith
fixes #22718


git-svn-id: http://core.svn.wordpress.org/trunk@23045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 22:19:08 +00:00
Bot (Assets)
6cb358e0f4 Compress scripts/styles: 3.5-RC3-23043.
git-svn-id: http://core.svn.wordpress.org/trunk@23043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 20:58:33 +00:00
Andrew Nacin
bd5956087a 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: http://core.svn.wordpress.org/trunk@23042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 20:52:58 +00:00
Andrew Nacin
d47267224c When adding images to a gallery, use "Images" as the filter name, rather than "All media items". props koopersmith. fixes #22722.
git-svn-id: http://core.svn.wordpress.org/trunk@23041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 20:51:37 +00:00
Bot (Assets)
affabf29f4 Compress scripts/styles: 3.5-RC3-23040.
git-svn-id: http://core.svn.wordpress.org/trunk@23040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 19:56:16 +00:00
Andrew Ozz
48ef1a9784 RTL: properly align the demo image in the Edit Image popup, props nacin, fixes #22733
git-svn-id: http://core.svn.wordpress.org/trunk@23039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 19:51:35 +00:00
Andrew Nacin
1c5c724b3a Media: Properly select the select element's option in the attachment display settings. props koopersmith. fixes #22693.
git-svn-id: http://core.svn.wordpress.org/trunk@23037 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 19:38:16 +00:00
Andrew Nacin
36554dd983 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: http://core.svn.wordpress.org/trunk@23036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 19:29:56 +00:00
Bot (Assets)
392ade0221 Compress scripts/styles: 3.5-RC3-23035.
git-svn-id: http://core.svn.wordpress.org/trunk@23035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:58:30 +00:00
Ryan Boren
53f5c1cdc7 Better dropdown select handling.
Props cdog, koopersmith
fixes #22693


git-svn-id: http://core.svn.wordpress.org/trunk@23033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:50:49 +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
Ryan Boren
8603ed6082 Media: Hide "Edit" link in the selection view when it doesn't make sense
Props koopersmith, ocean90, nacin
fixes #22713


git-svn-id: http://core.svn.wordpress.org/trunk@23031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:23:47 +00:00
Bot (Assets)
dad33047b5 Compress scripts/styles: 3.5-RC3-23030.
git-svn-id: http://core.svn.wordpress.org/trunk@23030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:13:59 +00:00
Mark Jaquith
bc09152660 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: http://core.svn.wordpress.org/trunk@23029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 17:58:24 +00:00
Mark Jaquith
82d51aeeef Update toolbars for Embed screen. Fixes JS error. props koopersmith. fixes #22714
git-svn-id: http://core.svn.wordpress.org/trunk@23028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 17:45:24 +00:00
Bot (Assets)
32c83140d0 Compress scripts/styles: 3.5-RC3-23025.
git-svn-id: http://core.svn.wordpress.org/trunk@23025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 16:25:14 +00:00
Andrew Nacin
d2a9957ad8 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: http://core.svn.wordpress.org/trunk@23024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 16:21:57 +00:00
Bot (Assets)
a1bb2f0054 Compress scripts/styles: 3.5-RC2-23018.
git-svn-id: http://core.svn.wordpress.org/trunk@23018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 06:58:31 +00:00
Mark Jaquith
55ac7a4565 Fix a typo in media-views.js that referenced frame.router.get() instead of frame.router. Fixes #22710
git-svn-id: http://core.svn.wordpress.org/trunk@23015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 05:18:21 +00:00
Bot (Assets)
6dee15c92e Compress scripts/styles: 3.5-RC2-23013.
git-svn-id: http://core.svn.wordpress.org/trunk@23013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 04:58:31 +00:00
Ryan Boren
cbf378b601 Fix race condition in media insertion where the inserted html is invalid due to output being interleaved.
Props koopermsith
fixes #22696


git-svn-id: http://core.svn.wordpress.org/trunk@23012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 04:38:42 +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
Bot (Assets)
30cf064068 Compress scripts/styles: 3.5-RC2-23007. props koopersmith. :-)
git-svn-id: http://core.svn.wordpress.org/trunk@23007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 01:29:58 +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
Andrew Nacin
9ba411d918 Alternative Text, not Alternate Text. props SergeyBiryukov. fixes #21176.
git-svn-id: http://core.svn.wordpress.org/trunk@22996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 19:21:34 +00:00
Bot (Assets)
293cfac069 Compress scripts/styles: 3.5-RC2-22995.
git-svn-id: http://core.svn.wordpress.org/trunk@22995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 08:09:10 +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
0848a51955 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: http://core.svn.wordpress.org/trunk@22993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 07:04:34 +00:00
Bot (Assets)
8ca0066e3a Compress scripts/styles: 3.5-RC2-22992.
git-svn-id: http://core.svn.wordpress.org/trunk@22992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 06:53:58 +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
01adc2740e Show Select Files button the first time the media modal is opened.
Props koopermsith
fixes #22691


git-svn-id: http://core.svn.wordpress.org/trunk@22990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 06:32:25 +00:00
Bot (Assets)
b8a9b78359 Compress scripts/styles: 3.5-RC2-22988.
git-svn-id: http://core.svn.wordpress.org/trunk@22988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 05:42:30 +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
6d711428b4 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: http://core.svn.wordpress.org/trunk@22985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 04:54:03 +00:00
Ryan Boren
b382901778 Update gallery editing to work with the modal changes. Add nice handling for default states.
Props koopersmith
see #21776


git-svn-id: http://core.svn.wordpress.org/trunk@22984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 04:38:10 +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
Bot (Assets)
904306e1ce Compress scripts/styles: 3.5-RC2-22975.
git-svn-id: http://core.svn.wordpress.org/trunk@22975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 19:49:31 +00:00
Andrew Nacin
d8c942f26c wp.media instead of just media. props alexkingorg, see #22676.
git-svn-id: http://core.svn.wordpress.org/trunk@22974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 19:24:22 +00:00
Bot (Assets)
7677c12566 Compress scripts/styles: 3.5-RC2-22973.
git-svn-id: http://core.svn.wordpress.org/trunk@22973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:57:38 +00:00
Andrew Nacin
06e2e684dd Use wp.media, not media, in media-editor.js. see #22676.
git-svn-id: http://core.svn.wordpress.org/trunk@22972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:55:58 +00:00
Bot (Assets)
cc0a122a7a Compress scripts/styles: 3.5-RC2-22971.
git-svn-id: http://core.svn.wordpress.org/trunk@22971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:50:10 +00:00
Andrew Nacin
a5549c1d16 Avoid leaking the 'media' var into the global JS namespace. props koopersmith, fixes #22676.
git-svn-id: http://core.svn.wordpress.org/trunk@22968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:32:47 +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
Bot (Assets)
3cfc81b328 Compress scripts/styles: 3.5-RC2-22966.
git-svn-id: http://core.svn.wordpress.org/trunk@22966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 04:35:23 +00:00
Ryan Boren
ebe9cd7395 In the media modal, show the Link To: url.
Props nacin
fixes #22662


git-svn-id: http://core.svn.wordpress.org/trunk@22965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 00:43:08 +00:00
Bot (Assets)
f80e842fe6 Compress scripts/styles: 3.5-RC2-22958.
git-svn-id: http://core.svn.wordpress.org/trunk@22958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 17:41:19 +00:00
Ryan Boren
af42700ebd Resolve race conditions in Attachments.more().
Props koopersmith
fixes #22656


git-svn-id: http://core.svn.wordpress.org/trunk@22957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 16:45:43 +00:00
Ryan Boren
59456a9cea 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: http://core.svn.wordpress.org/trunk@22956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 16:41:38 +00:00
Bot (Assets)
41db8c91ff Compress scripts/styles: 3.5-RC2-22953. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:20:51 +00:00
Ryan Boren
f07c7f5163 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: http://core.svn.wordpress.org/trunk@22952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:19:11 +00:00
Ryan Boren
b73c43e0e2 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: http://core.svn.wordpress.org/trunk@22951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:11:44 +00:00
Bot (Assets)
0924e6facd Compress scripts/styles: 3.5-RC2-22949.
git-svn-id: http://core.svn.wordpress.org/trunk@22949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 13:52:16 +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
Andrew Nacin
5d9fcc48b6 Pressing escape now closes the media modal. props koopersmith, see #22502.
git-svn-id: http://core.svn.wordpress.org/trunk@22946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 08:37:17 +00:00
Ryan Boren
e656d19a30 Improve switching between browser and upload state.
Props koopersmith
fixes #22628


git-svn-id: http://core.svn.wordpress.org/trunk@22945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 06:01:47 +00:00
Bot (Assets)
1e8f12020b Compress scripts/styles: 3.5-RC2-22944.
git-svn-id: http://core.svn.wordpress.org/trunk@22944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 05:39:13 +00:00
Ryan Boren
180476bbf8 Correctly insert images at caret position in IE8/7.
Props lessbloat
fixes #22638


git-svn-id: http://core.svn.wordpress.org/trunk@22943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 04:54:09 +00:00
Ryan Boren
c9cf1508a6 In the edit image modal, move Title to the advanced section and move Caption above Alt.
Props nacin
fixes #22646


git-svn-id: http://core.svn.wordpress.org/trunk@22942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 04:09:17 +00:00
Ryan Boren
a986fd1509 In the media modal, ensure modal events are always fired on its frame. This ensures restoreThickbox() and thus tbRemove() are called properly when clicking the close button of the modal.
Props koopersmith
fixes #22632


git-svn-id: http://core.svn.wordpress.org/trunk@22938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 01:55:37 +00:00
Ryan Boren
fccd72a74b In the add media modal, fallback back to caption if alt is not set. Falback to title if neither caption nor alt are set.
Props koopersmith
see #18984


git-svn-id: http://core.svn.wordpress.org/trunk@22937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 01:38:41 +00:00
Bot (Assets)
626778aaf0 Compress scripts/styles: 3.5-RC2-22928.
git-svn-id: http://core.svn.wordpress.org/trunk@22928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 22:09:26 +00:00
Andrew Nacin
f77c427703 Send the alt attribute when sending attachments to the editor. fixes #22640.
git-svn-id: http://core.svn.wordpress.org/trunk@22927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 21:23:55 +00:00
Bot (Assets)
688654c793 Compress scripts/styles: 3.5-RC1-22924.
git-svn-id: http://core.svn.wordpress.org/trunk@22924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 17:00:38 +00:00
Ryan Boren
5f7f9c5520 Revert accidental bits from r22919. see #22628
git-svn-id: http://core.svn.wordpress.org/trunk@22923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 16:58:08 +00:00
Bot (Assets)
53bdcd5b63 Compress scripts/styles: 3.5-RC1-22922.
git-svn-id: http://core.svn.wordpress.org/trunk@22922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 16:17:06 +00:00
Ryan Boren
7188bff165 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@22919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 13:33:57 +00:00
Andrew Nacin
818e2f3980 Update TinyMCE Spellchecker plugin to 2.0.6.1.
git-svn-id: http://core.svn.wordpress.org/trunk@22917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 02:45:16 +00:00
Bot (Assets)
6e073cc850 Compress scripts/styles: 3.5-RC1-22913.
git-svn-id: http://core.svn.wordpress.org/trunk@22913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 01:37:15 +00:00
Ryan Boren
c71519f791 In the gallery editor, don't stomp on custom shortcode attributes.
Props koopersmith
fixes #22627


git-svn-id: http://core.svn.wordpress.org/trunk@22912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 01:06:21 +00:00
Bot (Assets)
cbd32060e8 Compress scripts/styles: 3.5-RC1-22909.
git-svn-id: http://core.svn.wordpress.org/trunk@22909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 22:58:34 +00:00
Ryan Boren
a5253fd686 Media modal: Don't fire two AJAX calls on settings update.
Props koopersmith
fixes #22611


git-svn-id: http://core.svn.wordpress.org/trunk@22907 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 22:27:13 +00:00
Andrew Ozz
632d0a0571 Media in Internet Explorer: ensure we save the caret bookmark for IE in TinyMCE for the right instance, fixes #22446
git-svn-id: http://core.svn.wordpress.org/trunk@22905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 21:45:10 +00:00
Bot (Assets)
51b6b2189b Compress scripts/styles: 3.5-RC1-22901.
git-svn-id: http://core.svn.wordpress.org/trunk@22901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 18:58:34 +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
Bot (Assets)
041ebd374c Compress scripts/styles: 3.5-RC1-22893.
git-svn-id: http://core.svn.wordpress.org/trunk@22893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 04:58:34 +00:00
Andrew Nacin
bffb901334 Check if the object is empty, as objects are always truthy. props koopersmith. see #22593.
git-svn-id: http://core.svn.wordpress.org/trunk@22892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 04:41:24 +00:00
Bot (Assets)
2b4da9e635 Compress scripts/styles: 3.5-RC1-22890.
git-svn-id: http://core.svn.wordpress.org/trunk@22890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 02:33:43 +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
b70cb2d284 Ensure attachment modal details are saved before the attachment details view is destroyed. props koopersmith. fixes #22593.
git-svn-id: http://core.svn.wordpress.org/trunk@22888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 02:03:31 +00:00
Bot (Assets)
b538c8bd45 Compress scripts/styles: 3.5-RC1-22885. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 00:58:44 +00:00
Andrew Nacin
c09ac0e931 Editor: When hiding gallery/image editing buttons, use Sizzle rather than TinyMCE's internal DOM object. Avoids errors in case the elements do not exist, such as in Press This. props azaozz. fixes #22463.
git-svn-id: http://core.svn.wordpress.org/trunk@22883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 23:36:07 +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
Bot (Assets)
f940c40302 Compress scripts/styles: 3.5-RC1-22879. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 20:58:37 +00:00
Andrew Nacin
e2bc567095 Media in Internet Explorer: Properly insert attachments into the editor at the location of the cursor. props azaozz. fixes #22446.
git-svn-id: http://core.svn.wordpress.org/trunk@22877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 19:24:56 +00:00
Andrew Nacin
45ce9d2a96 Media: Introduce wp.media.editor.open(editor_id) and leverage it in distraction-free writing (fullscreen). props azaozz, koopersmith. fixes #22541.
git-svn-id: http://core.svn.wordpress.org/trunk@22875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 19:09:00 +00:00
Bot (Assets)
735c64c965 Compress scripts/styles: 3.5-RC1-22873.
git-svn-id: http://core.svn.wordpress.org/trunk@22873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 16:58:37 +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
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
Ryan Boren
555a87db2f Back compat $_REQUEST['post_id'] for media XHR requests.
Props koopersmith, nacin.
fixes #22588


git-svn-id: http://core.svn.wordpress.org/trunk@22865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 14:58:08 +00:00
Bot (Assets)
c33e862097 Compress scripts/styles: 3.5-RC1-22860. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 02:58:50 +00:00
Andrew Ozz
3fd9321c91 TinyMCE: improve hiding of the image/gallery popup buttons, fix selecting a gallery in IE, don't leave empty paragraph after deleting an image with the popup button, fixes #22463, see #21390
git-svn-id: http://core.svn.wordpress.org/trunk@22857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 01:31:51 +00:00
Bot (Assets)
4e2fbb27de Compress scripts/styles: 3.5-RC1-22852.
git-svn-id: http://core.svn.wordpress.org/trunk@22852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 22:58:43 +00:00
Ryan Boren
a6bba833d4 Rename 'id' to 'state' in menu item view.
Props koopersmith
fixes #22594


git-svn-id: http://core.svn.wordpress.org/trunk@22851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 22:49:45 +00:00
Ryan Boren
7df6a903f5 In wp.media.editor:send, revert back to the old field names used by media_upload_form_handler() for easier back compat.
Fix notices in wp_ajax_send_attachment_to_editor().

Props nacin, azaozz, miqrogroove
fixes #22553


git-svn-id: http://core.svn.wordpress.org/trunk@22847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 22:08:50 +00:00
Bot (Assets)
34ce6db507 Compress scripts/styles: 3.5-RC1-22844.
git-svn-id: http://core.svn.wordpress.org/trunk@22844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 16:58:36 +00:00
Andrew Nacin
ab5c08a120 Media: When inserting an attachment, if the item is unattached (no post_parent), attach it to the post. fixes #22085.
git-svn-id: http://core.svn.wordpress.org/trunk@22843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 16:34:42 +00:00
Ryan Boren
2105efa5bf Correctly access the nonce to save attachment fields. Fixes firing attachment_fields_to_save.
Props koopersmith
fixes #22577


git-svn-id: http://core.svn.wordpress.org/trunk@22842 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 15:07:36 +00:00
Ryan Boren
7469f91bc7 Always render the attachment compat view. Assures attachment_fields_to_edit is always fired.
Props koopersmith, Chouby
fixes #22578


git-svn-id: http://core.svn.wordpress.org/trunk@22841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 15:05:14 +00:00
Bot (Assets)
a4c7232ce6 Compress scripts/styles: 3.5-RC1-22839.
git-svn-id: http://core.svn.wordpress.org/trunk@22839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 03:47:40 +00:00
Andrew Nacin
24d68b3bcf Media: Watch more events for input changes to catch paste, autocomplete, etc.
Fixes issue where pasting a URL in 'From URL' (via the context menu) did not
enable the insert button, as the event was not yet fired.

props koopersmith.
fixes #22545.



git-svn-id: http://core.svn.wordpress.org/trunk@22836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 03:35:28 +00:00
Andrew Nacin
951082d4da Media: Include the link URL when inserting non-image attachments. props koopersmith. fixes #22544.
git-svn-id: http://core.svn.wordpress.org/trunk@22835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 03:33:30 +00:00
Daryl Koopersmith
43587773a5 jQuery UI 1.9.2. props ocean90. fixes #22563.
git-svn-id: http://core.svn.wordpress.org/trunk@22833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 01:20:40 +00:00
Bot (Assets)
cc5b452797 Compress scripts/styles: 3.5-beta3-22826.
git-svn-id: http://core.svn.wordpress.org/trunk@22826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 12:58:32 +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
c5991558be Media: Properly render any pre-existing upload errors in the uploader status. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 12:24:54 +00:00
Daryl Koopersmith
14af860aab Uploader: Display a more specific error message when a file exceeds the file size limit. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 12:18:17 +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
Bot (Assets)
2430f0f974 Compress scripts/styles: 3.5-beta3-22819.
git-svn-id: http://core.svn.wordpress.org/trunk@22820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 10:58:36 +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
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
Bot (Assets)
2f47959b2d Compress scripts/styles: 3.5-beta3-22810.
git-svn-id: http://core.svn.wordpress.org/trunk@22810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 06:58:42 +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
Bot (Assets)
3006ca6a6c Compress scripts/styles: 3.5-beta3-22808.
git-svn-id: http://core.svn.wordpress.org/trunk@22808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 04:58:35 +00:00
Daryl Koopersmith
98494fdfe1 Media: Check to see if we need more attachments when the browser is attached to the DOM. fixes #22480, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 03:19:08 +00:00
Bot (Assets)
b0ee4d8dda Compress scripts/styles: 3.5-beta3-22805.
git-svn-id: http://core.svn.wordpress.org/trunk@22805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 02:58:33 +00:00
Daryl Koopersmith
f80e93ebf8 Media: Convert the attachments browser to use internal views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 01:43:31 +00:00
Bot (Assets)
adad154f6b Compress scripts/styles: 3.5-beta3-22803.
git-svn-id: http://core.svn.wordpress.org/trunk@22803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 00:58:36 +00:00
Daryl Koopersmith
de54f9318f Media: Make priority list views leverage the subview management class. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 00:41:39 +00:00
Bot (Assets)
3be0694d83 Compress scripts/styles: 3.5-beta3-22801.
git-svn-id: http://core.svn.wordpress.org/trunk@22801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 22:58:36 +00:00
Jon Cave
38e43334a9 Set svn:eol-style to native for all the files
(Except wp-config-sample.php and a couple of license files)


git-svn-id: http://core.svn.wordpress.org/trunk@22798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 22:31:55 +00:00
Jon Cave
340d5815ff Remove svn:executable property from SimplePie and jcrop files
git-svn-id: http://core.svn.wordpress.org/trunk@22797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 22:18:48 +00:00
Andrew Nacin
a962e6f58b Autosave: Properly convert undefined fields to empty strings. This bug could cause issues if a post type didn't support the title and/or editor. see #22491.
git-svn-id: http://core.svn.wordpress.org/trunk@22794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 21:04:04 +00:00
Bot (Assets)
f328a74f77 Compress scripts/styles: 3.5-beta3-22793.
git-svn-id: http://core.svn.wordpress.org/trunk@22793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 21:03:21 +00:00
Daryl Koopersmith
4aa6a83d47 Media: Rename PriorityList's add/remove methods to set/unset (to prevent the default remove from being overridden). see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 20:43:42 +00:00
Daryl Koopersmith
452c486d5f Media: Refresh the window-wide uploader whenever a state is activated. Properly unbind controller events. fixes #22504, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 20:34:46 +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
Daryl Koopersmith
095093e390 Uploader: Route plupload errors to the correct handler and prevent naming conflicts. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 20:17:25 +00:00
Daryl Koopersmith
46020c6dd0 Uploader: Correctly trigger error callback. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 20:12:02 +00:00
Daryl Koopersmith
1480429ec0 Media: Make inline uploader use main dispose method. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 19:54:06 +00:00
Daryl Koopersmith
f8630d2be3 Media: Remove unused variable for state attributes. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 19:21:08 +00:00
Daryl Koopersmith
b5335a5d24 Media: Make the upload state a dedicated screen, instead of including its own library view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 18:29:53 +00:00
Daryl Koopersmith
7de56d32db Media: Use a more specific class for toolbar buttons. see #22284, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 17:50:02 +00:00
Daryl Koopersmith
1ba7bea0a0 Media: Move send_to_editor to wp.media.editor.insert to prevent redeclaration.
Maintains backwards compatibility by delegating to window.send_to_editor and window.tb_remove if they exist.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 17:01:40 +00:00
Daryl Koopersmith
bc66935dc6 Media: Remove unused link-formatting function from media-editor.js. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 16:50:58 +00:00
Daryl Koopersmith
c95bd0198a Media: Remove dead thickbox code from media-editor.js. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 16:50:13 +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
Bot (Assets)
852d90b3d6 Compress scripts/styles: 3.5-beta3-22763.
git-svn-id: http://core.svn.wordpress.org/trunk@22763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 14:58:31 +00:00
Daryl Koopersmith
5cecff80b8 Media: Calculate image width and height when embedding images. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 14:32:52 +00:00
Daryl Koopersmith
7a4b96d78f Customizer: Track the link that was used to open the customizer and restore focus on close. props lessbloat. fixes #21283.
git-svn-id: http://core.svn.wordpress.org/trunk@22756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 13:17:10 +00:00
Andrew Nacin
e276fc44be Have media-new.php return simple rows of basic attachment data, with an 'Edit' link next to each taking them to post.php (in a new window). Not ideal, but this is largely a fallback screen at this point.
This is bolted on to existing code, the vast majority of which is destined to be ripped out in 3.6 once things settle.

see #22083.



git-svn-id: http://core.svn.wordpress.org/trunk@22755 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 13:05:44 +00:00
Bot (Assets)
68e4e2c4a6 Compress scripts/styles: 3.5-beta3-22754.
git-svn-id: http://core.svn.wordpress.org/trunk@22754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 12:58:33 +00:00
Daryl Koopersmith
1a3e06ddd5 Media: Ensure Attachments.mirror returns true. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 12:53:02 +00:00
Daryl Koopersmith
5e39581c13 Media: Remove redundant code.
Make the composite gallery library use `mirror` instead of `observe`, as one method now invokes the other. Also, make `mirror` return the attachment collection for chaining.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 12:11:38 +00:00
Daryl Koopersmith
ff1707892d Media: Make mirroring a collection of attachments a special case of observing a collection of attachments. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 11:35:30 +00:00
Daryl Koopersmith
ff482e86fb Media: Add filters for image-only libraries. see #22514, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 11:04:23 +00:00
Bot (Assets)
55a3b3a7f0 Compress scripts/styles: 3.5-beta3-22744.
git-svn-id: http://core.svn.wordpress.org/trunk@22744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 10:58:28 +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
Daryl Koopersmith
a763641235 Media: Remove debug cruft. props ocean90. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 09:28:58 +00:00
Bot (Assets)
76d4e0c954 Compress scripts/styles: 3.5-beta3-22740.
git-svn-id: http://core.svn.wordpress.org/trunk@22740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 08:58:30 +00:00
Daryl Koopersmith
46bc46d88a Media: Dropping images on the edit gallery view will automatically add those images to the gallery. fixes #22521, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 08:17:45 +00:00
Daryl Koopersmith
c717bb47e2 Media: Prevent type and search attachments filters from short circuiting.
Moves the reference to the source collection out of the props model. If it was translated over to a query (which was potentially possible) which then fired an ajax request, jQuery would attempt to serialize an object recursively, which caused an infinite loop and much sadness for my browser.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 08:09:28 +00:00
Bot (Assets)
4d00db15b4 Compress scripts/styles: 3.5-beta3-22729.
git-svn-id: http://core.svn.wordpress.org/trunk@22729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 20:58:28 +00:00
Andrew Ozz
cddc116653 Toolbar: sync jQuery and non-jQuery JS behaviour when there's a hash in the url, props tlovett1, fixes #22520
git-svn-id: http://core.svn.wordpress.org/trunk@22728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 20:45:03 +00:00
Bot (Assets)
530d5248f7 Compress scripts/styles: 3.5-beta3-22717.
git-svn-id: http://core.svn.wordpress.org/trunk@22717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:58:32 +00:00
Daryl Koopersmith
d63026f2ba Media: Maintain event bindings in the main embed view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:44:23 +00:00
Daryl Koopersmith
e25565f4b7 Media: Allow all galleries to be sortable. fixes #22488, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:04:59 +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
Bot (Assets)
7f377032aa Compress scripts/styles: 3.5-beta3-22711.
git-svn-id: http://core.svn.wordpress.org/trunk@22711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 12:58:29 +00:00
Daryl Koopersmith
9350f67e28 Media: Refresh the attachment display settings when the active attachment finishes uploading. fixes #22452, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:57:08 +00:00
Daryl Koopersmith
fd78be75d9 Media Uploader: Change an uploaded attachment's 'updating' key with the rest of the returned attributes to allow events bound to 'change:updating' to access the new properties. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:52:08 +00:00
Daryl Koopersmith
31c525b289 Media: Remove dead dropdown code from button view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:29:00 +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
Bot (Assets)
38b7b820aa Compress scripts/styles: 3.5-beta3-22701.
git-svn-id: http://core.svn.wordpress.org/trunk@22701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:58:28 +00:00
Daryl Koopersmith
d4744fda0a Media: Prevent undefined errors when media scripts are enqueued outside of wp_enqueue_media(). fixes #22495, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 01:48:37 +00:00
Bot (Assets)
ef6ff8b4a8 Compress scripts/styles: 3.5-beta3-22693.
git-svn-id: http://core.svn.wordpress.org/trunk@22693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 00:58:32 +00:00
Daryl Koopersmith
05db7000c4 Media: Detect when views are added to the DOM and fire a ready event. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 00:53:02 +00:00
Bot (Assets)
48293c9384 Compress scripts/styles: 3.5-beta3-22691.
git-svn-id: http://core.svn.wordpress.org/trunk@22691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 22:58:31 +00:00
Daryl Koopersmith
663cde2c51 Media: Add render tracking to views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 22:48:11 +00:00
Bot (Assets)
22579938ae Compress scripts/styles: 3.5-beta3-22685.
git-svn-id: http://core.svn.wordpress.org/trunk@22685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 12:58:31 +00:00
Daryl Koopersmith
e6943d1033 Media: Add silent options to the views; improve documentation. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 12:11:16 +00:00
Bot (Assets)
63930c9404 Compress scripts/styles: 3.5-beta3-22683.
git-svn-id: http://core.svn.wordpress.org/trunk@22683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:58:31 +00:00
Daryl Koopersmith
028d378322 Media: Add a method to fetch the first subview. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22682 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:41:24 +00:00
Daryl Koopersmith
31576e6c0c Media: Add documentation to media.Views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:40:49 +00:00
Bot (Assets)
fa3497237b Compress scripts/styles: 3.5-beta3-22678.
git-svn-id: http://core.svn.wordpress.org/trunk@22678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:58:31 +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
Bot (Assets)
f8b7c4ee59 Compress scripts/styles: 3.5-beta3-22668.
git-svn-id: http://core.svn.wordpress.org/trunk@22668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:58:29 +00:00
Daryl Koopersmith
a776bcb14d Media: Use correct variable name. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:43:01 +00:00
Daryl Koopersmith
1af6c38db3 Media: Add default render method to views.
* Use default `render` method in the `Frame` view.
* Rename `Views.attach` to `Views.insert`.
* Add `Views.all` to retrieve all subviews.
* Add `Views.detach` to detach all subviews.
* Detect whether views are going to be reused in `View.set` and `detach` them instead of calling `dispose`.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:02:00 +00:00
Bot (Assets)
9e200c91e6 Compress scripts/styles: 3.5-beta3-22661.
git-svn-id: http://core.svn.wordpress.org/trunk@22661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 04:58:32 +00:00
Daryl Koopersmith
473583a4f4 Media: Allow subviews to be inserted at a specific index. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 04:41:57 +00:00
Daryl Koopersmith
795ba27d10 Media: Convert the attachments browser view's destroy method to the newer dispose method. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 03:33:29 +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
Bot (Assets)
29a9b52ca9 Compress scripts/styles: 3.5-beta3-22657. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:58:28 +00:00
Daryl Koopersmith
25ebc64c20 Media: Remove debug cruft from [22655]. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:44:34 +00:00
Daryl Koopersmith
561f01bd79 Media: Optimize media models.
* Merge `Composite` model with general `Attachments` model, as `Attachments.validate` and `Composite.evaluate` were functionally equivalent.
* Queries should only watch `wp.Uploader.queue`, as watching `Attachments.all` results in queries attempting to add attachments before their properties are set (which then results a few too many irrelevant adds/removes). `Attachments.all` should potentially be removed or rethought.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:43:10 +00:00
Daryl Koopersmith
88f09f7118 Media: Remove redundant sorting logic from composite models. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:00:01 +00:00
Daryl Koopersmith
e3d01cddd0 Media: Make TinyMCE attachment and gallery controls always show when the corresponding view is selected. props SergeyBiryukov. fixes #22463, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 01:23:45 +00:00
Daryl Koopersmith
10eada54dc Media: Move Attachments view preventDefault handler to the events object. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 01:17:30 +00:00
Bot (Assets)
cae8ce47fc Compress scripts/styles: 3.5-beta3-22650.
git-svn-id: http://core.svn.wordpress.org/trunk@22650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:58:49 +00:00
Daryl Koopersmith
13a3cc30b2 Media: Allow for the views manager to be extended. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:54:18 +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
Bot (Assets)
5dfefbd1cd Compress scripts/styles: 3.5-beta3-22645. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 18:58:32 +00:00
Andrew Ozz
f630e12290 TinyMCE: place the caret after/under images with captions when inserting content, fixes #19389
git-svn-id: http://core.svn.wordpress.org/trunk@22644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 18:04:20 +00:00
Bot (Assets)
85afdd2ef7 Compress scripts/styles: 3.5-beta3-22637.
git-svn-id: http://core.svn.wordpress.org/trunk@22637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 20:58:31 +00:00
Andrew Ozz
981419d292 Make the admin menu and toolbar work well on mobile devices (take 2), props georgestephanis, fixes #20614, fixes #22382
git-svn-id: http://core.svn.wordpress.org/trunk@22636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 20:14:17 +00:00
Ryan Boren
06ee370814 Pinking shears
git-svn-id: http://core.svn.wordpress.org/trunk@22634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 15:11:29 +00:00
Andrew Nacin
7183a9cce9 Introduce a new, cross-browser HiDPI CSS @media rule to be used everywhere.
{{{
@media print,
  (-o-min-device-pixel-ratio: 5/4),
  (-webkit-min-device-pixel-ratio: 1.25),
  (min-resolution: 120dpi) {
}}}

Serve HiDPI graphics for printing, regardless of screen resolution.

Specify Opera's vendor-prefixed device pixel ratio property, for Opera desktop.

Specify a minimum Webkit device pixel ratio of 1.25 instead of 1.5, to serve
2x images to Android devices that are between 1 and 1.5x (like the Nexus 7).
Firefox and Opera will respond to 1.5x on these devices, but Chrome will not.

Specify min-resolution, which covers Firefox 19. Opera on Android also supports
min-resolution, but Opera Mini does not support dppx, so the dpi unit is used.

props iammattthomas for the exhaustive research.
props lessbloat for patching.

fixes #22238.



git-svn-id: http://core.svn.wordpress.org/trunk@22629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 06:50:08 +00:00
Bot (Assets)
094cb6f7dc Compress scripts/styles: 3.5-beta3-22613.
git-svn-id: http://core.svn.wordpress.org/trunk@22613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:58:32 +00:00
Daryl Koopersmith
b57d3ff767 Media: zIndex peace was only temporary.
Revert [22611] in favor of using plupload's `container` setting. Turns out, plupload's flash shim is forced to the exact same index as the admin bar, so balancing the two is better solved by nesting the shim.

see #22441, #22446, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:30:36 +00:00
Bot (Assets)
a5641f8814 Compress scripts/styles: 3.5-beta3-22607. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 00:58:33 +00:00
Andrew Ozz
9f258e4342 TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, see #21390
git-svn-id: http://core.svn.wordpress.org/trunk@22602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:49:19 +00:00
Bot (Assets)
53363c4f25 Compress scripts/styles: 3.5-beta3-22601. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 22:58:31 +00:00
Andrew Ozz
673003bf64 TinyMCE: extend the allowed obsolete attributes to include tr, th and td (thead, tfoot and tbody weren't around in HTML 3.2), see #22175
git-svn-id: http://core.svn.wordpress.org/trunk@22600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 22:56:44 +00:00
Bot (Assets)
1889d7de3b Compress scripts/styles: 3.5-beta3-22598.
git-svn-id: http://core.svn.wordpress.org/trunk@22598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 04:58:34 +00:00
Daryl Koopersmith
24910d5c06 Media: Only show the edit selection link for the media library. Make the upload attachments list sortable. Only retain the silent option when running Attachments.validate(). see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 03:09:35 +00:00
Bot (Assets)
b26b39e3bc Compress scripts/styles: 3.5-beta3-22596.
git-svn-id: http://core.svn.wordpress.org/trunk@22596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:58:37 +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
Andrew Nacin
0427b96415 jQuery 1.8.3. fixes #22432.
git-svn-id: http://core.svn.wordpress.org/trunk@22593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:26:22 +00:00
Bot (Assets)
9d24f55bed Compress scripts/styles: 3.5-beta3-22589. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 00:58:36 +00:00
Andrew Ozz
dc43ad3ac8 TinyMCE: fix styles, add 2x background icons and load buttons.css in the Edit Image modal, remove wp-view styles from content.css, add 2x icons for the popup buttons (for editing image and gallery), fixes #22447, see #21019
git-svn-id: http://core.svn.wordpress.org/trunk@22586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 23:21:59 +00:00
Bot (Assets)
29abff2525 Compress scripts/styles: 3.5-beta3-22584.
git-svn-id: http://core.svn.wordpress.org/trunk@22585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:58:34 +00:00
Daryl Koopersmith
511c14e4ed Media: Unify the "Insert" and "Insert.Post" toolbars. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:40:34 +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
Bot (Assets)
93b55dca26 Compress scripts/styles: 3.5-beta3-22572. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 15:00:31 +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
b2db6270ee Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.

When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.

fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 07:17:22 +00:00
Andrew Nacin
f1f045cdde 3.5-beta3
git-svn-id: http://core.svn.wordpress.org/trunk@22559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 04:06:51 +00:00
Daryl Koopersmith
8e775dff4b Media: Better image detection in the embed from URL tab. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 03:33:41 +00:00
Daryl Koopersmith
b5ab7bbbc9 Media: Properly insert caption shortcodes for attachments.
git-svn-id: http://core.svn.wordpress.org/trunk@22554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 00:32:04 +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
Bot (Assets)
8c60f41b2f Compress scripts/styles: 3.5-beta2-22551. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 22:58:31 +00:00
Andrew Ozz
114c42a3b5 TinuMCE: update to 3.5.7, fixes #21173
git-svn-id: http://core.svn.wordpress.org/trunk@22550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 21:20:46 +00:00
Daryl Koopersmith
1ec12cccb9 Media: Allow successive embed URLs. see [22547], #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 06:02:03 +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
Bot (Assets)
e84d1f724d Compress scripts/styles: 3.5-beta2-22546.
git-svn-id: http://core.svn.wordpress.org/trunk@22546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 22:58:32 +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
Bot (Assets)
bbb099b2dd Compress scripts/styles: 3.5-beta2-22540.
git-svn-id: http://core.svn.wordpress.org/trunk@22540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 22:58:34 +00:00
Daryl Koopersmith
0422f833a8 Media templates: Alter escaping regular expression to prevent it from aggresively consuming input meant for interpolation. see #22344, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 21:38:14 +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
43c289dee6 Media: Automatically strip any non-image items from the collection when creating a gallery.
Also changes the rules for when the "new gallery" button shows:
* More than two items must be selected.
* At least one of them must be an image.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 19:25:39 +00:00
Daryl Koopersmith
2396b66c98 Media: Watch additional search events. Properly captures clearing the search box. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:56:11 +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
Andrew Nacin
e7767b1eba Add comments to time intervals we cannot express with the constants. Fix a comment. props SergeyBiryukov. fixes #20987.
git-svn-id: http://core.svn.wordpress.org/trunk@22531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:13:09 +00:00
Daryl Koopersmith
944066ef83 Media: Account for a race condition when deleting an edit gallery frame. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 09:57:28 +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
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
Andrew Nacin
809bb5a8f7 Update the JS version of the shortcode regex to match [22382]. props SergeyBiryukov. fixes #17657.
git-svn-id: http://core.svn.wordpress.org/trunk@22522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:23:55 +00:00
Bot (Assets)
c57076aab7 Compress scripts/styles: 3.5-beta2-22515.
git-svn-id: http://core.svn.wordpress.org/trunk@22515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 22:58:35 +00:00
Andrew Nacin
8f08f77601 WordPress dialog jQuery UI widget:
* Link to the upstream bug report.
 * No need to specify the default value for an option.
 * Use the new _super() UI method to open the dialog, avoiding a direct reference to the parent.
 * Fix typo in comment.
 * Use public isOpen() method rather than a private property.

props scott.gonzalez.
fixes #22399.



git-svn-id: http://core.svn.wordpress.org/trunk@22514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 22:36:35 +00:00
Andrew Nacin
8b53ffec74 Define a custom event prefix in the wpdialog jQuery UI widget to work around a jQuery UI 1.9.1 regression. see #22399.
git-svn-id: http://core.svn.wordpress.org/trunk@22513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 21:45:13 +00:00
Daryl Koopersmith
880b1e4b81 Media JS: Pass the region instance through when firing the activate and deactivate events. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 12:43:39 +00:00
Daryl Koopersmith
b9ed8db596 Media: Keep track of gallery display properties in a separate model instead of mixed in with the query parameters. This allows for arbitrary gallery arguments and a more flexible data structure. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22508 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 12:37:21 +00:00
Daryl Koopersmith
adf0c7e1a7 Media: When printing a gallery shortcode, hide the implicit orderby value. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 12:14:48 +00:00
Daryl Koopersmith
db30495fcd Media: Correctly set the edit gallery's library. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 12:09:15 +00:00
Daryl Koopersmith
3797b7e18c Media JS: Only block button events by default if the button does not link to anything. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 11:30:40 +00:00
Daryl Koopersmith
0c219be45d Media: Output correct link html when inserting attachments. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 10:48:50 +00:00
Daryl Koopersmith
4a008574d2 Media JS: Use basic upload/library by default.
`wp.media` now recognizes the `frame` attribute (currently a string; either'select' or 'post') and defaults to using a basic select frame. It also checks for the existence of classes in a safer fashion, as it does not assume the `MediaFrame` property exists.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 09:59:36 +00:00
Daryl Koopersmith
9c7acdfe7c Media: Add a basic starting frame for upload/library selection.
`media.view.MediaFrame.Select` is a frame class with a handful of sensible defaults to handle selecting and uploading items in the media library.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 09:47:12 +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
9c4214745b Media: Ensure search box reflects actual search state.
* Also switches search box to use `<input type="search" />` to take advantage of browser UI to clear the field.

fixes #22315, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 04:44:31 +00:00
Daryl Koopersmith
dd504180f7 Media: In the main media library in the insert media dialog, only show attachment display settings when one attachment is selected. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 02:11:37 +00:00
Daryl Koopersmith
21ff438642 Media: Add batch insertion workflow. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 01:44:02 +00:00
Daryl Koopersmith
23b62b3d77 Media JS: Use correct variable name when binding to the change:library event. see [22477], #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 01:24:55 +00:00
Daryl Koopersmith
103694aa4f Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 01:23:20 +00:00
Bot (Assets)
0f3d286dd3 Compress scripts/styles: 3.5-beta2-22475.
git-svn-id: http://core.svn.wordpress.org/trunk@22475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-08 22:58:34 +00:00
Daryl Koopersmith
fe570eb90c Media JS: Add media.model.Composite, to aid in the representation of joint views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22467 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-08 15:32:40 +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
Bot (Assets)
9cc507b1c9 Compress scripts/styles: 3.5-beta2-22455.
git-svn-id: http://core.svn.wordpress.org/trunk@22456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 22:58:33 +00:00
Daryl Koopersmith
4daeaf464d Media: Improve memory management of views, events, and DOM nodes. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 22:43:16 +00:00
Bot (Assets)
a94a72e010 Compress scripts/styles: 3.5-beta2-22438. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 20:29:58 +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
Mark Jaquith
2ec9c4acc2 Use ImageOptim to losslessly smush our images. About half a MB in savings! fixes #22381. props waldojaquith
git-svn-id: http://core.svn.wordpress.org/trunk@22425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 18:49:10 +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 Ozz
c09c079a6f Allow commonly used obsolete HTML5 attributes in TinyMCE, table[summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor] and a[name], fixes #22175
git-svn-id: http://core.svn.wordpress.org/trunk@22411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 23:36:10 +00:00
Bot (Assets)
aa464fde32 Compress scripts/styles: 3.5-beta2-22407.
git-svn-id: http://core.svn.wordpress.org/trunk@22407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 22:58:35 +00:00
Daryl Koopersmith
349afb3c4f Media JS: Move state-related logic from sidebar views to the state controllers. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 01:19:39 +00:00
Andrew Ozz
cbd737470c Kill use of colons in class names, props SergeyBiryukov, fixes #21152
git-svn-id: http://core.svn.wordpress.org/trunk@22396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 01:01:52 +00:00
Andrew Ozz
50c704fc80 Remove the Alt + Shift + G (old fullscreen mode) shortcut from the TinyMCE help popup, props SergeyBiryukov, see #21197
git-svn-id: http://core.svn.wordpress.org/trunk@22394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-06 00:28:01 +00:00
Bot (Assets)
c94990017b Compress scripts/styles: 3.5-beta2-22384.
git-svn-id: http://core.svn.wordpress.org/trunk@22384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-05 22:58:34 +00:00
Andrew Nacin
32ad332432 Update Thickbox images for HiDPI. props lessbloat. see #21019.
git-svn-id: http://core.svn.wordpress.org/trunk@22378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-05 21:00:15 +00:00
Daryl Koopersmith
825bea7637 Media: Show an inline uploader when the media library is empty.
Merges most of `wp.media.controller.Upload` into `wp.media.controller.Library`, so we always create an inline uploader instead of an attachments browser if the state's `library` is empty.

props rzen, fixes #22323, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-05 02:43:47 +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
Ryan Boren
a29e0190db jQuery UI 1.9.1
Props ocean90
fixes #22290


git-svn-id: http://core.svn.wordpress.org/trunk@22361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-03 22:51:38 +00:00
Bot (Assets)
270a0964f5 Compress scripts/styles: 3.5-beta2-22360.
git-svn-id: http://core.svn.wordpress.org/trunk@22360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-02 22:58:37 +00:00
Daryl Koopersmith
9670372812 Media: Update the gallery "add images" state. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-02 01:20:01 +00:00
Bot (Assets)
3e51d043ab Compress scripts/styles: 3.5-beta2-22352.
git-svn-id: http://core.svn.wordpress.org/trunk@22352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 22:58:32 +00:00
Daryl Koopersmith
62771d6824 Media: Update gallery editing to work with the new frame view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 21:43:59 +00:00
Daryl Koopersmith
d16ba6ac18 Media JS: When editing a gallery, prevent attachments from being selected as they are removed. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 20:51:34 +00:00
Daryl Koopersmith
9b1ac05bc0 Remove dead gallery settings code. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22342 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 20:00:39 +00:00
Daryl Koopersmith
665fadb7bd Make gallery columns fallback a string, as the accepted values are strings. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 20:00:02 +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
f3c673558a Media JS: Several improvements to the Attachment views.
* Bind Attachment details updates to the Attachments initialize method.
* Improve Attachment view unbinding.
* Re-render Attachment views when titles and captions are updated.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 23:59:57 +00:00
Daryl Koopersmith
fcde71fd77 Media JS: Properly fire the Attachment view details method on render. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 23:41:13 +00:00
Daryl Koopersmith
efea572e91 Media JS: Properly build detail views when the selection's single model changes. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 23:36:38 +00:00
Daryl Koopersmith
640edbdfbc Media JS: Improve handling of single attachments in selections.
* Adds `wp.media.model.Selection.single()` to specify a single item used in a multi-item selection.
* Fixes a bug where the `details` class would not be removed when "Clear Selection" was clicked.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 23:15:16 +00:00
Bot (Assets)
b502e1e0c2 Compress scripts/styles: 3.5-beta2-22334.
git-svn-id: http://core.svn.wordpress.org/trunk@22334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 22:58:31 +00:00
Daryl Koopersmith
faf00687d4 Media JS: Remove unused Attachment view events. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 21:15:46 +00:00
Daryl Koopersmith
097cb6117d Improve selection UI/behavior in the media modal.
* Moves handling which models are in the selection into the `Library` state.
* Adds highlight for the last-selected view in a multi-view state.
* A view must be the last-selected view before it can be deselected.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-30 21:09:45 +00:00
Bot (Assets)
2e1aaeb2c5 Compress scripts/styles: 3.5-beta2-22326.
git-svn-id: http://core.svn.wordpress.org/trunk@22326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 22:58:31 +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
Bot (Assets)
3ff4a47f36 Compress scripts/styles: 3.5-beta2-22311.
git-svn-id: http://core.svn.wordpress.org/trunk@22311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-25 22:58:32 +00:00
Andrew Ozz
bcb040f1e0 Hide the "You are using the multi-file uploader. Problems? Try the browser uploader instead." when Plupload falls back to "html4" runtime, fixes #19496
git-svn-id: http://core.svn.wordpress.org/trunk@22305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-25 20:53:38 +00:00
Bot (Assets)
3cc79b6461 Compress scripts/styles: 3.5-beta2-22269.
git-svn-id: http://core.svn.wordpress.org/trunk@22269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-22 22:58:34 +00:00
Daryl Koopersmith
4188c373fd Correctly assign post_parent to attachments uploaded in the new media modal. fixes #22085, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-22 17:40:06 +00:00
Bot (Assets)
c2d9d834dc Compress scripts/styles: 3.5-beta2-22265.
git-svn-id: http://core.svn.wordpress.org/trunk@22265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-19 22:58:33 +00:00
Andrew Ozz
1dad05c508 Make the admin menu and toolbar work well on mobile devices, props georgestephanis, see #20614
git-svn-id: http://core.svn.wordpress.org/trunk@22262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-19 18:31:21 +00:00
Bot (Assets)
19d83ff7e8 Compress scripts/styles: 3.5-beta2-22252. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-16 22:58:39 +00:00
Andrew Ozz
e8b10439bb Accessibility shortcuts: new looks and fix for the WebKit focus bug, props lessbloat, fixes #21471
git-svn-id: http://core.svn.wordpress.org/trunk@22249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-16 21:26:59 +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 Ozz
97fc06f706 TinyMCE: fix showing popup buttons on images in WebKit, fixes #22188
git-svn-id: http://core.svn.wordpress.org/trunk@22246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-16 18:16:29 +00:00
Andrew Nacin
65534a21c0 jQuery Masonry for uploaded custom headers. props zamoose. fixes #20346.
git-svn-id: http://core.svn.wordpress.org/trunk@22228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-14 17:05:16 +00:00
Bot (Assets)
3012719800 Compress scripts/styles: 3.5-beta1-22223. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 22:58:48 +00:00
Daryl Koopersmith
5302794b9b Display gallery and attachment MCE views as inline blocks. Make gallery MCE view wrappers block level. see #21390, #21813, #21815.
git-svn-id: http://core.svn.wordpress.org/trunk@22221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 18:41:38 +00:00
Daryl Koopersmith
5c9fa8ee8f Properly align MCE attachment views.
* Adds a `$wrapper` property to MCE views to allow them to manipulate the wrapper on render. This should be used sparingly — only for layout changes that cannot be accomplished through altering the wrapper's children — and likely only for adding/removing classes.
* Uses `wp.html.string()` in `wp.mce.view.toView()`.

see #21390, #21812, #21813.


git-svn-id: http://core.svn.wordpress.org/trunk@22220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 18:36:21 +00:00
Daryl Koopersmith
dbbcd85ce3 MCE Views: Add alignment styles for generic views.
Adds `alignnone`, `aligncenter`, `alignleft`, and `alignright` by default.

see #21390, #21812, #21813.


git-svn-id: http://core.svn.wordpress.org/trunk@22219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 18:32:12 +00:00
Daryl Koopersmith
3ee553c6bc Add a nonce to wp_ajax_save_attachment. see #21390, #21807.
git-svn-id: http://core.svn.wordpress.org/trunk@22212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 16:02:45 +00:00
Daryl Koopersmith
62e5ae4e56 MCE Views: First pass at keystroke and insertion handling.
* When a MCE view is selected, normal keystrokes (those without command/control) are blocked.
* Backspace/delete will successfully remove the view.
* Arrow handling will be added at a later point.
* When a MCE view is selected and content is pasted or injected (e.g. when an attachment is added), the content is added to the first text node after the view. If the view is at the end of the document or the next element is another view, a text node is injected into the DOM immediately after the selected view.

see #21390, #21812, #21813, #21815.


git-svn-id: http://core.svn.wordpress.org/trunk@22210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 03:28:22 +00:00
Daryl Koopersmith
e0135ddf09 MCE Views: Add selection/deselection when a view is clicked.
These methods should be expanded to prevent content from being inserted into the view by blocking and rerouting keystrokes as appropriate as well as repositioning the caret before content is inserted.

see #21390, #21812, #21813, #21815.


git-svn-id: http://core.svn.wordpress.org/trunk@22208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 23:52:09 +00:00
Bot (Assets)
28cddba189 Compress scripts/styles: 3.5-beta1-22204.
git-svn-id: http://core.svn.wordpress.org/trunk@22204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 22:58:47 +00:00
Daryl Koopersmith
4c9f50537c Media Modal: Attachments on the gallery page now inherit general events with the exception of click-to-select. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 04:04:12 +00:00
Andrew Nacin
a610836667 jQuery 1.9.0 final. see #21736.
git-svn-id: http://core.svn.wordpress.org/trunk@22182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 03:34:19 +00:00
Daryl Koopersmith
ce36b0b5f0 Media Modal: Only automatically select uploading attachments when in a workflow that supports multiple images.
Fixes a bug in featured images where uploading an image would force you to reopen the modal (as the modal would close on upload).

see #21390, #21776.


git-svn-id: http://core.svn.wordpress.org/trunk@22175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 00:28:01 +00:00
Daryl Koopersmith
9d44f5c57d Add caption and title default values for the attachment view template. see #21390, #21807.
git-svn-id: http://core.svn.wordpress.org/trunk@22174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 23:55:45 +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
Bot (Assets)
d71143817e Compress scripts/styles: 3.5-beta1-22172.
git-svn-id: http://core.svn.wordpress.org/trunk@22172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 22:58:38 +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
1d60c42550 Add a class to the TinyMCE view end marker.
Certain TinyMCE plugins scan for all spans in the document and remove any that do not have classes (or a handful of other attributes). This is quite aggressive, and breaks the regex used to scan for MCE views when transforming them back to plain text. Adding a class ensures that any plugins that do so will not break MCE views.

see #21812, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 10:52:14 +00:00
Daryl Koopersmith
d1c2c7714c Media JS: More default Attachments view template values. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 10:45:01 +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
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
70bd368ad8 Gallery editing in the media modal.
The edit button on gallery MCE views will open a new instance of the media modal. Images can be removed, uploaded, and reordered. However, the "Add images from media library" button is not yet functional.

see #21390, #21809, #21815.


git-svn-id: http://core.svn.wordpress.org/trunk@22155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 08:31:12 +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
Bot (Assets)
4efe0b5efa Compress scripts/styles: 3.5-beta1-22150.
git-svn-id: http://core.svn.wordpress.org/trunk@22150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 22:58:33 +00:00
Jon Cave
e3c7cf5cc1 Remove allowed query args before checking isEmpty() in Query model. See #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 22:55:49 +00:00
Daryl Koopersmith
4c2f61c767 Improve JavaScript object formatting. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 02:07:09 +00:00
Daryl Koopersmith
9788d9142c Properly handle inserting full size images. props timbeks, fixes #22124.
git-svn-id: http://core.svn.wordpress.org/trunk@22140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 00:55:44 +00:00
Daryl Koopersmith
6312e4af27 On second thought, we're going to need the library-specific attachment view. see #21390, [22138].
git-svn-id: http://core.svn.wordpress.org/trunk@22139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 00:27:14 +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
Bot (Assets)
6416d4fe53 Compress scripts/styles: 3.5-beta1-22133.
git-svn-id: http://core.svn.wordpress.org/trunk@22133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-07 22:58:41 +00:00
Jon Cave
8961dc5d91 Theme Customizer: Correctly update background-attachment property in live preview
Props bainternet. Fixes #21732.


git-svn-id: http://core.svn.wordpress.org/trunk@22131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-07 14:46:39 +00:00
Bot (Assets)
06d16327f5 Compress scripts/styles: 3.5-beta1-22128.
git-svn-id: http://core.svn.wordpress.org/trunk@22128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-07 02:27:48 +00:00
Daryl Koopersmith
1baac22e9d Improve the lazy instantiation of the 'wp' JavaScript variable. props evansolomon, fixes #22113.
git-svn-id: http://core.svn.wordpress.org/trunk@22126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-06 00:43:36 +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
Daryl Koopersmith
ca4275859f MCE Views: Use default shortcode properties when the shortcode parameter is set.
Prevents devs from having to manually extend the default shortcode property object.

see #21390, #21812.


git-svn-id: http://core.svn.wordpress.org/trunk@22102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-03 06:40:07 +00:00
Daryl Koopersmith
e687b66922 Allow galleries to be reordered by drag and drop.
An `Attachments` view now accepts a `sortable` property. Manual sorting is only enabled when the corresponding collection doesn't have a comparator.

jQuery UI sortable must be enqueued for sorting to work.

see #21390, #21809.


git-svn-id: http://core.svn.wordpress.org/trunk@22101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-03 04:21:50 +00:00