Commit Graph

63 Commits

Author SHA1 Message Date
Andrew Nacin
426eb50936 Fix inserting of multiple attachments with captions when the first attachment does not have a caption. props azaozz. fixes #22720.
git-svn-id: https://develop.svn.wordpress.org/trunk@23055 602fd350-edb4-49c9-b593-d223f7449a82
2012-12-05 00:59:25 +00:00
Daryl Koopersmith
8ce1f39c6c 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: https://develop.svn.wordpress.org/trunk@22770 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-21 16:46:32 +00:00
Daryl Koopersmith
9a2033cabc Media: Backwards compatibility for the many send_to_editor filters. props nacin. see #22186, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22768 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-21 16:02:20 +00:00
Daryl Koopersmith
493572fd09 Media: Backwards compatibility for the disable_captions filter. see #22186, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22761 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-21 14:27:22 +00:00
Daryl Koopersmith
185c2d1afc Media: Use the wp.media.string functions when generating embed strings. Embed captions now work. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22760 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-21 14:20:01 +00:00
Daryl Koopersmith
4c2e0d6b45 Media: Make the attachment object optional when using the wp.media.string methods. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22758 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-21 13:53:15 +00:00
Daryl Koopersmith
fb3d44da9b Media: Remove default gallery shortcode attributes when generating shortcode output. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22715 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 14:38:20 +00:00
Daryl Koopersmith
f3199b6005 Media: Correctly fetch the default post ID when editing a gallery. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22714 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 14:33:48 +00:00
Daryl Koopersmith
69f9e2a1bf Media: Allow all galleries to be sortable. fixes #22488, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22713 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 14:04:59 +00:00
Daryl Koopersmith
81bb685bc0 Media: Improve media buttons on the front end.
* Use a less specific selector (the body, actually) to delegate opening the media dialog.
* Allow the editor ID to be the empty string so the `media_buttons` action can be called without arguments.

see #22284, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22699 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-20 02:35:30 +00:00
Daryl Koopersmith
ae2f322e25 Media: Insert each attachment into the editor individually.
This allows the `wpeditimage` plugin to correctly identify `caption` shortcodes.

fixes #22459, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22672 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 07:30:53 +00:00
Daryl Koopersmith
395fd933c9 Media: Blur the "Add Images" button when the media modal is opened. fixes #22445, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22665 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-19 06:34:41 +00:00
Daryl Koopersmith
902b910bea Media: Declare wp.media.string methods in a single object. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22569 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 09:31:53 +00:00
Daryl Koopersmith
f684d6abc2 Media: Make edit gallery button use new media. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22568 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 09:06:10 +00:00
Daryl Koopersmith
223eb63b6f 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: https://develop.svn.wordpress.org/trunk@22567 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-14 07:17:22 +00:00
Daryl Koopersmith
f6a737ed34 Media: Add Embed from URL tab.
Note: There is a bug that currently blocks adding several successive embeds.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22547 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 05:57:12 +00:00
Daryl Koopersmith
5096f387d1 Media: Add custom URL as an option to attachment display properties. see #21390, #22206.
git-svn-id: https://develop.svn.wordpress.org/trunk@22537 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 20:36:46 +00:00
Andrew Nacin
e655cbc2d1 Use event delegation for Add Media, allowing the event to bubble up to #wpbody. Keeps the Add Media button functional on a second use of QuickPress. fixes #22255.
git-svn-id: https://develop.svn.wordpress.org/trunk@22518 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 04:39:44 +00:00
Daryl Koopersmith
63dd1ca518 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: https://develop.svn.wordpress.org/trunk@22495 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 09:59:36 +00:00
Daryl Koopersmith
b9a5374e64 Media: Add batch insertion workflow. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22480 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:44:02 +00:00
Daryl Koopersmith
68d143d20d 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: https://develop.svn.wordpress.org/trunk@22466 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 14:15:09 +00:00
Daryl Koopersmith
b636e94e47 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: https://develop.svn.wordpress.org/trunk@22437 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 20:14:41 +00:00
Daryl Koopersmith
15c451d2f6 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: https://develop.svn.wordpress.org/trunk@22320 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-28 23:29:17 +00:00
Daryl Koopersmith
4966b15409 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: https://develop.svn.wordpress.org/trunk@22220 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-12 18:36:21 +00:00
Daryl Koopersmith
d27568e703 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: https://develop.svn.wordpress.org/trunk@22173 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 23:32:48 +00:00
Daryl Koopersmith
a830567a92 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: https://develop.svn.wordpress.org/trunk@22170 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 21:54:21 +00:00
Daryl Koopersmith
a04930b340 Reset the media modal to the library view after inserting a gallery. fixes #22151, see #21390, #21809.
git-svn-id: https://develop.svn.wordpress.org/trunk@22156 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 08:47:15 +00:00
Daryl Koopersmith
db21ce7189 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: https://develop.svn.wordpress.org/trunk@22155 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-10 08:31:12 +00:00
Daryl Koopersmith
d43c390e2b 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: https://develop.svn.wordpress.org/trunk@22120 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-05 04:23:59 +00:00
Daryl Koopersmith
1758d1aae3 Add QuickPress support for new media workflow.
* Adds the code required to include the new media scripts, styles, and settings to `media_button()`.
* Improves script dependencies, namely making `media-upload` require `media-views`.
* Some CSS tweaks for the making the new button work well with QuickPress.

see #21390, fixes #22021.


git-svn-id: https://develop.svn.wordpress.org/trunk@22072 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 20:04:34 +00:00
Daryl Koopersmith
6fff91f4d1 Media JS: Move the modal box's title from being stored in the modal view to being stored as an attribute on the workflow. Update modal titles for both the post media and featured image workflows. see #21390, #21776.
git-svn-id: https://develop.svn.wordpress.org/trunk@22044 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 06:20:22 +00:00
Daryl Koopersmith
692d806fff BUTTON.
Add a "Beta Media" button to the post editor. Currently, it is only capable of inserting images. Other attachment types and galleries need not apply... yet.

* Added `wp.media.string.image( attachment, props )` for generating an image as a string from an attachment and relevant attachment display properties.
* Properly localized the gallery workflow.
* Added `Workflow.update()`, which closes the modal, triggers an `update` event, and resets the selection.
* Added `wp.mce.media` to manage the various media workflows for editors.

see #21813, #21814, #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22036 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 04:09:43 +00:00
Andrew Nacin
db981a3b27 Switch to .min for compressed JS and CSS files.
* This moves our "development" versions from .dev.js to .js (same for css).
 * The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.



git-svn-id: https://develop.svn.wordpress.org/trunk@21592 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-23 00:04:18 +00:00
bumpbot
2a0b86ea08 Compress scripts/styles: 3.4-alpha-19983.
git-svn-id: https://develop.svn.wordpress.org/trunk@19983 602fd350-edb4-49c9-b593-d223f7449a82
2012-02-24 02:00:58 +00:00
Andrew Ozz
e8fd0746c8 Fix editor detection when inserting image, see #17144
git-svn-id: https://develop.svn.wordpress.org/trunk@18837 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-30 16:00:11 +00:00
Andrew Ozz
13c72ba193 Fix enqueueing of the right scripts when more than one instance of the editor, fix inserting images in full screen mode, see #17144
git-svn-id: https://develop.svn.wordpress.org/trunk@18799 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-28 07:26:34 +00:00
Andrew Ozz
be87523fed Fix wplink when TinyMCE is not loaded, fix image insertion when wpActiveEditor is not set, see #17144
git-svn-id: https://develop.svn.wordpress.org/trunk@18766 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-24 04:43:19 +00:00
Andrew Ozz
aad319a3ac Fix send_to_editor() and Insert/Upload buttons URLs, see #17144
git-svn-id: https://develop.svn.wordpress.org/trunk@18516 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-06 01:35:02 +00:00
Andrew Ozz
461ceba60d Editor API enhancement, first run (still needs some work), see #17144
git-svn-id: https://develop.svn.wordpress.org/trunk@18498 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-03 10:19:00 +00:00
Andrew Ozz
3a79a20c25 Fix image insertion in IE, fixes #17237
git-svn-id: https://develop.svn.wordpress.org/trunk@17701 602fd350-edb4-49c9-b593-d223f7449a82
2011-04-25 22:49:22 +00:00
Andrew Ozz
157571de2a Remove redundant IE restore selection calls for TinyMCE, see #17136
git-svn-id: https://develop.svn.wordpress.org/trunk@17639 602fd350-edb4-49c9-b593-d223f7449a82
2011-04-15 04:20:12 +00:00
Mark Jaquith
852a939130 Recompress some JS scripts that were done without YUI munging.
git-svn-id: https://develop.svn.wordpress.org/trunk@17286 602fd350-edb4-49c9-b593-d223f7449a82
2011-01-13 08:04:58 +00:00
Mark Jaquith
d9ae425dc2 Make sure media upload thickbox takes admin bar height into account. props ocean90. fixes #15635
git-svn-id: https://develop.svn.wordpress.org/trunk@16681 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-02 04:20:48 +00:00
Andrew Ozz
104abc4a7b When inserting the embed shortcode in TinyMCE replace it with a placeholder image, update the 'wordpress', 'wpeditimage' and 'wpgallery' TinyMCE plugins, fix the audio and video "From URL" tabs in the uploader popup to accept only URLs for embedding, see #10337
git-svn-id: https://develop.svn.wordpress.org/trunk@12098 602fd350-edb4-49c9-b593-d223f7449a82
2009-10-24 11:43:42 +00:00
Andrew Ozz
5f38225a1c Fix image insertion in IE7
git-svn-id: https://develop.svn.wordpress.org/trunk@10366 602fd350-edb4-49c9-b593-d223f7449a82
2009-01-15 16:17:46 +00:00
Andrew Ozz
11743ff0c0 Fix Thickbox position for browsers pretending to be IE6
git-svn-id: https://develop.svn.wordpress.org/trunk@10365 602fd350-edb4-49c9-b593-d223f7449a82
2009-01-15 14:56:52 +00:00
Andrew Ozz
80fb5c79ce Cleanup js files and prepare for concatenating, move most inline js to files
git-svn-id: https://develop.svn.wordpress.org/trunk@10348 602fd350-edb4-49c9-b593-d223f7449a82
2009-01-12 13:43:17 +00:00
Andrew Ozz
416baab11a Minify all js and add the non-minified files as .dev.js
git-svn-id: https://develop.svn.wordpress.org/trunk@10291 602fd350-edb4-49c9-b593-d223f7449a82
2009-01-02 15:08:58 +00:00
Andrew Ozz
bcfde60872 Move Gallery Settings to the Gallery tab in the uploader, split the Upload tab in "From Computer" and "From URL" tabs
git-svn-id: https://develop.svn.wordpress.org/trunk@9894 602fd350-edb4-49c9-b593-d223f7449a82
2008-11-26 02:27:37 +00:00
Ryan Boren
9698bf7f45 Dashboard updates from mdawaffe. see #7552
git-svn-id: https://develop.svn.wordpress.org/trunk@9219 602fd350-edb4-49c9-b593-d223f7449a82
2008-10-16 22:35:53 +00:00