Commit Graph

84 Commits

Author SHA1 Message Date
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
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
Ryan Boren
ce2c38fda6 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@22920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-29 14:36:12 +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
6030689e50 Some IE7 CSS hacks for media to fix the gallery view. props lessbloat. fixes #22609.
git-svn-id: http://core.svn.wordpress.org/trunk@22894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 17:17:43 +00:00
Daryl Koopersmith
13641926fb Responsive CSS for the media modal. props azaozz. see #22615, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 01:51:15 +00:00
Ryan Boren
ffe752aacc Scope media views CSS fallbacks.
Props koopersmith
fixes #22616


git-svn-id: http://core.svn.wordpress.org/trunk@22886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 01:45:06 +00:00
Andrew Nacin
bb51c14983 Media: IE fixes for attachment selections. props lessbloat. see #22446.
git-svn-id: http://core.svn.wordpress.org/trunk@22876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 19:14:36 +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
Ryan Boren
374bf89c49 Fix overflow of long filenames in the media modal.
Props koopersmith, GregLone
fixes #22554


git-svn-id: http://core.svn.wordpress.org/trunk@22870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 15:58:47 +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
adae728f00 Fix dragging in IE10 on touch devices.
Props georgestephanis, koopersmith
fixes #22583


git-svn-id: http://core.svn.wordpress.org/trunk@22866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 15:00:00 +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
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
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
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
Daryl Koopersmith
6815f4bfef Media: Normalize font sizes, link colors, and other styles. props lessbloat, see #22284, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22782 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 18:37:52 +00:00
Daryl Koopersmith
5ee8582b7a Media: Add base form element CSS. props lessbloat. see #22284, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 18:00:18 +00:00
Daryl Koopersmith
693404f946 Media: Ensure icons stay within the bounds of their surrounding view. fixes #22522, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 08:44:22 +00:00
Daryl Koopersmith
ae52867831 Media: Set a max width on select elements in the sidebar. fixes #22517, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 22:51:35 +00:00
Andrew Nacin
e11afb7c07 RTL media-views fixes. props ocean90. fixes #22453.
git-svn-id: http://core.svn.wordpress.org/trunk@22720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 18:22:19 +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
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
Daryl Koopersmith
1bafce0dbb Media: Allow textareas to be vertically resized. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:59:31 +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
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
Daryl Koopersmith
eeeaf4d016 Media: The zIndex arms race.
Adjusts zIndexes to be not-as-absurd as before, in the process moving the modal below the plupload flash shims (which do not have customizable zIndexes or classes, sadly).

fixes #22441, see #22446, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:20:11 +00:00
Daryl Koopersmith
1d65270bdb Media: Add an explicit border to menus to show a divider in older browsers. see #22446, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 09:47:00 +00:00
Daryl Koopersmith
4d585176d1 Media: Only display "Drop files" text when the browser supports drag and drop. see #22446, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 09:39:58 +00:00
Daryl Koopersmith
01706d8d11 Media: Remove dead CSS. props ocean90, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 00:04:37 +00:00
Daryl Koopersmith
2e6aa4dacf Media: RTL styles for the media modal. props ocean90. see #22453, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:58:33 +00:00
Daryl Koopersmith
b19d48e7fe Media: Update in-grid captions.
* Use input fields instead of textboxes (which provide better handling for smaller attachments).
* Provide `data-setting` properties to properly sync the changes.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:53:06 +00:00
Daryl Koopersmith
3a0e464632 Media: Prevent text from being selected in the menu. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:51:31 +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
Daryl Koopersmith
39528d3c11 Media: Remove border from inline media uploader. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:33:15 +00:00
Daryl Koopersmith
0188fc3e52 Media: Add support for applicable *-upload-ui hooks.
Supports pre-upload-ui, pre-plupload-upload-ui, post-plupload-upload-ui, post-upload-ui.

see #22186, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 01:50:08 +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
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
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
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
04b85c399d Media: Allow the modal sidebar to scroll. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 19:10:04 +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
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
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
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