Commit Graph

65 Commits

Author SHA1 Message Date
Sergey Biryukov 8d5b038aa1 Fix thickbox positioning on Manage Themes screen. Adjust thickbox resizing code on various screens for new toolbar height.
see #26078. fixes #26140.
Built from https://develop.svn.wordpress.org/trunk@26323


git-svn-id: http://core.svn.wordpress.org/trunk@26226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-22 08:06:09 +00:00
Andrew Nacin 7e1bf9f745 Fix JSHint errors in media-upload.js.
props iblamefish.
fixes #26023.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-15 04:53: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
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
Daryl Koopersmith bfc8690006 Media: Backwards compatibility for the many send_to_editor filters. props nacin. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 16:02:20 +00:00
Daryl Koopersmith e0ebe09802 Media: Backwards compatibility for the disable_captions filter. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 14:27:22 +00:00
Daryl Koopersmith 4d01db3f0a Media: Use the wp.media.string functions when generating embed strings. Embed captions now work. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 14:20:01 +00:00
Daryl Koopersmith c901a4825e Media: Make the attachment object optional when using the wp.media.string methods. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 13:53:15 +00:00
Daryl Koopersmith 00377a42f4 Media: Remove default gallery shortcode attributes when generating shortcode output. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:38:20 +00:00
Daryl Koopersmith 3f630bf0fa Media: Correctly fetch the default post ID when editing a gallery. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:33:48 +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 b1f720c616 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: http://core.svn.wordpress.org/trunk@22699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:35:30 +00:00
Daryl Koopersmith fe1e4e3f56 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: http://core.svn.wordpress.org/trunk@22672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 07:30:53 +00:00
Daryl Koopersmith b222046481 Media: Blur the "Add Images" button when the media modal is opened. fixes #22445, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:34:41 +00:00
Daryl Koopersmith 3cfbf3c4bb Media: Declare wp.media.string methods in a single object. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:31:53 +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
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
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
Andrew Nacin 7ba61388a4 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: http://core.svn.wordpress.org/trunk@22518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 04:39:44 +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 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 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
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
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
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 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
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 ebc9a34650 Reset the media modal to the library view after inserting a gallery. fixes #22151, see #21390, #21809.
git-svn-id: http://core.svn.wordpress.org/trunk@22156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-10 08:47:15 +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 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 0c42e6121a 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: http://core.svn.wordpress.org/trunk@22072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 20:04:34 +00:00
Daryl Koopersmith a9d3197c28 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: http://core.svn.wordpress.org/trunk@22044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 06:20:22 +00:00
Daryl Koopersmith eec758fd26 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: http://core.svn.wordpress.org/trunk@22036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 04:09:43 +00:00
Andrew Nacin 2710bcade1 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: http://core.svn.wordpress.org/trunk@21592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 00:04:18 +00:00
bumpbot a24bfc4d47 Compress scripts/styles: 3.4-alpha-19983.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19983 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 02:00:58 +00:00
azaozz 816fcad9e2 Fix editor detection when inserting image, see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@18837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-30 16:00:11 +00:00
azaozz e076a246fd 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: http://svn.automattic.com/wordpress/trunk@18799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-28 07:26:34 +00:00
azaozz eb8878fbfc Fix wplink when TinyMCE is not loaded, fix image insertion when wpActiveEditor is not set, see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@18766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-24 04:43:19 +00:00
azaozz d012143326 Fix send_to_editor() and Insert/Upload buttons URLs, see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@18516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-06 01:35:02 +00:00
azaozz f634dd5af4 Editor API enhancement, first run (still needs some work), see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@18498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-03 10:19:00 +00:00
azaozz 57134c64b7 Fix image insertion in IE, fixes #17237
git-svn-id: http://svn.automattic.com/wordpress/trunk@17701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-25 22:49:22 +00:00
azaozz 03c3c94d1e Remove redundant IE restore selection calls for TinyMCE, see #17136
git-svn-id: http://svn.automattic.com/wordpress/trunk@17639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-15 04:20:12 +00:00
markjaquith 4920e7a54f Recompress some JS scripts that were done without YUI munging.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-13 08:04:58 +00:00
markjaquith a1b12eb6e5 Make sure media upload thickbox takes admin bar height into account. props ocean90. fixes #15635
git-svn-id: http://svn.automattic.com/wordpress/trunk@16681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-02 04:20:48 +00:00
azaozz f5c253376e 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: http://svn.automattic.com/wordpress/trunk@12098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-10-24 11:43:42 +00:00
azaozz 5342a53586 Fix image insertion in IE7
git-svn-id: http://svn.automattic.com/wordpress/trunk@10366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-15 16:17:46 +00:00
azaozz 73caf3b30b Fix Thickbox position for browsers pretending to be IE6
git-svn-id: http://svn.automattic.com/wordpress/trunk@10365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-15 14:56:52 +00:00
azaozz 1c9353ad2e Cleanup js files and prepare for concatenating, move most inline js to files
git-svn-id: http://svn.automattic.com/wordpress/trunk@10348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-12 13:43:17 +00:00
azaozz a750885c8e Minify all js and add the non-minified files as .dev.js
git-svn-id: http://svn.automattic.com/wordpress/trunk@10291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-02 15:08:58 +00:00