Commit Graph

1215 Commits

Author SHA1 Message Date
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