Commit Graph

67 Commits

Author SHA1 Message Date
Andrew Nacin
74f2a32f52 Fixed mixed spaces and tabs. Also remove trailing comma. see #26631.
Built from https://develop.svn.wordpress.org/trunk@27266


git-svn-id: http://core.svn.wordpress.org/trunk@27123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 17:32:14 +00:00
Scott Taylor
c0379aaafc Load default settings state when creating a new playlist in the media modal. Add a few missing inline @this annotations in media-editor.js.
See #26631.


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


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

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 18:08:16 +00:00
Scott Taylor
5d15ed5202 Access class directly instead of using this in the shortcodeAttrs method of any factory-generated wp.media.collection.
Fixes #27183.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 13:01:14 +00:00
Scott Taylor
911442cdab Replace the current wp.media.gallery instance in media-editor.js with one that leverages wp.media.collection.
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 18:13:14 +00:00
Scott Taylor
08b1c1b0f5 Add an abstraction of the gallery code in media-editor.js called wp.media.collection. This will be the basis for parsing [gallery]-like shortcodes in the media editor (thing playlists, collections of PDFs, etc).
There are currently no instances of this. Those will be forthcoming.

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-20 18:07:12 +00:00
Andrew Nacin
6adabc6e4d Various JSHint fixes. see #26446.
Built from https://develop.svn.wordpress.org/trunk@27131


git-svn-id: http://core.svn.wordpress.org/trunk@26998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-08 00:52:12 +00:00
Scott Taylor
e1759d668a For starters, [27050] is rad. This just cleans up some extra new lines that were littered about, updates *some* of the inline docs (needs more), moves wp.media.controller.ImageDetails closer to its parent class, and de-dupes some code in media-template.php.
See #24409.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 23:21:13 +00:00
Scott Taylor
f850ddd4f8 Add inline docs to each method of the namespaced objects in media-editor.js, explaining what each does. Add inline docs to params as well.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-22 18:38:11 +00:00
Scott Taylor
f6b1f2202a Add the @namespace annotation where appropriate in media-editor.js. Also indicate the default value of a few params via the [options={}] syntax.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-22 17:17:11 +00:00
Scott Taylor
60986d43b4 Remove debug cruft.
Props nacin.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-21 16:31:11 +00:00
Scott Taylor
f473d5eef2 Disambiguate this and use the @this annotation in media-editor.js. This will become way more necessary in other places, but a few examples here show how confusing it can be.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-21 16:30:11 +00:00
Scott Taylor
86aec42f7c Correct a type.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-21 15:57:16 +00:00
Scott Taylor
ad4cf383cd Elaborate on JSDoc blocks for media-editor.js.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-21 15:55:13 +00:00
Scott Taylor
8457a40032 Add initial JSDoc blocks to media-editor.js. The initial blocks are a baseline to work from and invite future iterations. Initial commit is to avoid commits this large in the future.
See #26870.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-20 23:35:15 +00:00
Andrew Ozz
71101bc9e2 TinyMCE: fix send_to_editor(). It no longer needs to replace shortcode strings with html placeholers before inserting them in the editor. This is handled properly by the editor's 'BeforeSetContent' event callbacks. See #24067.
Built from https://develop.svn.wordpress.org/trunk@26945


git-svn-id: http://core.svn.wordpress.org/trunk@26824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-14 23:35:11 +00:00
Andrew Ozz
855889f7aa TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876


git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 23:53:15 +00:00
Andrew Nacin
6292b4c519 Fix JSHint errors in 5 files.
props seanchayes.
fixes #26015, #26020, #26019, #26034, #26022.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-15 05:16:09 +00:00
Andrew Nacin
a30d69e534 Prevent the removal of a manual 'orderby' attribute in the gallery shortcode.
props nofearinc.
fixes #24868.

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


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

fixes #24449.



git-svn-id: http://core.svn.wordpress.org/trunk@24777 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-23 05:39:08 +00:00
Andrew Nacin
b14622b2ff Media: Render unsupported audio files as links instead of mediaelement. props kovshenin, fixes #23798.
git-svn-id: http://core.svn.wordpress.org/trunk@24519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-26 20:42:01 +00:00
Mark Jaquith
e1923d4783 Restore code that returns the existing media object if it already exists.
props programmin, adamsilverstein. fixes #24062

git-svn-id: http://core.svn.wordpress.org/trunk@24447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-19 21:55:17 +00:00
Ryan Boren
849765385b Respect the link to setting when inserting a gallery.
Props SergeyBiryukov
fixes #23298


git-svn-id: http://core.svn.wordpress.org/trunk@24161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-02 22:07:37 +00:00
Mark Jaquith
1f6d2f796a Force gallery state for gallery post format.
props lessbloat, wonderboymusic. fixes #24062.

git-svn-id: http://core.svn.wordpress.org/trunk@24087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-25 05:43:14 +00:00
Mark Jaquith
51e5c3436e Use attachment.url only if it is available, else fall back to props.url.
see #24046. see [24009].

git-svn-id: http://core.svn.wordpress.org/trunk@24017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-17 17:57:51 +00:00
Ryan Boren
d1675fcea4 Revert attachment.url back to props.url. Fixes error that prevents inserting media into the editor.
see #24046


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

see #24046. props lessbloat, wonderboymusic.

git-svn-id: http://core.svn.wordpress.org/trunk@24006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-17 04:08:46 +00:00
Sergey Biryukov
0f8c735175 Add missing semicolon. props kovshenin. see #23831.
git-svn-id: http://core.svn.wordpress.org/trunk@23998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-15 23:03:13 +00:00
Mark Jaquith
4a3ced1433 Enforce video dimensions.
props wonderboymusic. see #23831.

git-svn-id: http://core.svn.wordpress.org/trunk@23969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-11 22:34:05 +00:00
Mark Jaquith
e3b7b18d26 Fix some Insert-into-Post for Audio/Video bugs.
props wonderboymusic. see #23831.

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

git-svn-id: http://core.svn.wordpress.org/trunk@23729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-16 05:25:44 +00:00
Andrew Ozz
754fd43fe7 Media: when copying from "caption" (textarea) to "alt" (text input) also remove line breaks, props kovshenin, fixes #23176 for trunk
git-svn-id: http://core.svn.wordpress.org/trunk@23298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-14 17:34:45 +00:00
Andrew Nacin
c95ff91fe7 Media: Restore 3.4 behavior by consulting the old-school DB options for default align, size, and link properties.
This restores linking to media files as the default, over attachment pages. This 'default' cannot currently be changed by a user setting (per 3.4 behavior), due to the default database schema.

see #22841, for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@23262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-04 08:02:16 +00:00
Daryl Koopersmith
781ab16abe Don't include the default columns="3" in a gallery shortcode.
Shortcode attributes are strings; fix a variable type error in wp.media.gallery defaults.
props adamsilverstein.

see #22919.


git-svn-id: http://core.svn.wordpress.org/trunk@23247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-03 06:09:09 +00:00
Andrew Nacin
801db6b731 Remove trailing comma from JS. props koopersmith, fixes #22800.
git-svn-id: http://core.svn.wordpress.org/trunk@23114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-07 01:13:04 +00:00
Andrew Nacin
e09094434e Restore captions for non-image attachments. see #22759.
git-svn-id: http://core.svn.wordpress.org/trunk@23087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 03:36:17 +00:00
Andrew Nacin
173806d7a1 Restore the Description field to the media UI in 3.5.
We tried in vain -- a noble but ultimately failed effort -- to reduce the number of fields for attachments from four (title, caption, alt, description) to one (caption for images, title otherwise). Alternative text needed to stay for accessibility reasons, of course.

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

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

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

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

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

props nacin, helenyhou.
fixes #22759.



git-svn-id: http://core.svn.wordpress.org/trunk@23083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 00:41:06 +00:00
Mark Jaquith
d8d39ff764 When setting the featured image from the dedicated meta box, only show the featured image section in the media chooser. props koopersmith. fixes #22731
* Less distracting
* Some of these sections won't apply for CPTs without an editor

git-svn-id: http://core.svn.wordpress.org/trunk@23069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 09:43:10 +00:00
Andrew Nacin
dc9e6144be Fix inserting of multiple attachments with captions when the first attachment does not have a caption. props azaozz. fixes #22720.
git-svn-id: http://core.svn.wordpress.org/trunk@23055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 00:59:25 +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
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
Ryan Boren
61a9471024 Final round of media UX improvements.
Props koopersmith
fixes #21390 #22502


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


git-svn-id: http://core.svn.wordpress.org/trunk@22994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 07:17:10 +00:00
Ryan Boren
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
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
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
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
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