Commit Graph

1251 Commits

Author SHA1 Message Date
Daryl Koopersmith
630484f453 Media: Properly insert caption shortcodes for attachments.
git-svn-id: https://develop.svn.wordpress.org/trunk@22554 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-13 00:32:04 +00:00
Daryl Koopersmith
4ee51a98cb Media: Add an "upload more files" button to upload states. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22552 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 23:52:17 +00:00
bumpbot
b73b44b8db Compress scripts/styles: 3.5-beta2-22551. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22551 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 22:58:31 +00:00
Andrew Ozz
7d5de0703a TinuMCE: update to 3.5.7, fixes #21173
git-svn-id: https://develop.svn.wordpress.org/trunk@22550 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 21:20:46 +00:00
Daryl Koopersmith
c2bef6792f Media: Allow successive embed URLs. see [22547], #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22548 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-12 06:02:03 +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
bumpbot
ac3a589c8d Compress scripts/styles: 3.5-beta2-22546.
git-svn-id: https://develop.svn.wordpress.org/trunk@22546 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 22:58:32 +00:00
Daryl Koopersmith
9cd3c458c7 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: https://develop.svn.wordpress.org/trunk@22543 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 05:16:41 +00:00
Daryl Koopersmith
57b09463e6 Media: Add backwards compatibility for attachment_fields_to_edit and attachment_fields_to_save. see #22186.
git-svn-id: https://develop.svn.wordpress.org/trunk@22541 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-11 01:26:42 +00:00
bumpbot
9c7e947d79 Compress scripts/styles: 3.5-beta2-22540.
git-svn-id: https://develop.svn.wordpress.org/trunk@22540 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 22:58:34 +00:00
Daryl Koopersmith
747016b9d5 Media templates: Alter escaping regular expression to prevent it from aggresively consuming input meant for interpolation. see #22344, #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22539 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 21:38:14 +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
Daryl Koopersmith
307427162b Media: Automatically strip any non-image items from the collection when creating a gallery.
Also changes the rules for when the "new gallery" button shows:
* More than two items must be selected.
* At least one of them must be an image.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22535 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 19:25:39 +00:00
Daryl Koopersmith
2d3c2c4d84 Media: Watch additional search events. Properly captures clearing the search box. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22533 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:56:11 +00:00
Daryl Koopersmith
62fe5ba600 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: https://develop.svn.wordpress.org/trunk@22532 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:25:04 +00:00
Andrew Nacin
ee5bc76549 Add comments to time intervals we cannot express with the constants. Fix a comment. props SergeyBiryukov. fixes #20987.
git-svn-id: https://develop.svn.wordpress.org/trunk@22531 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 18:13:09 +00:00
Daryl Koopersmith
8af2f4674f Media: Account for a race condition when deleting an edit gallery frame. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22530 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 09:57:28 +00:00
Daryl Koopersmith
fefaea2cf1 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: https://develop.svn.wordpress.org/trunk@22529 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 09:11:33 +00:00
Daryl Koopersmith
847a00f84b 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: https://develop.svn.wordpress.org/trunk@22523 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 07:51:37 +00:00
Andrew Nacin
331bcde9c2 Update the JS version of the shortcode regex to match [22382]. props SergeyBiryukov. fixes #17657.
git-svn-id: https://develop.svn.wordpress.org/trunk@22522 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-10 07:23:55 +00:00
bumpbot
68f1c2fd82 Compress scripts/styles: 3.5-beta2-22515.
git-svn-id: https://develop.svn.wordpress.org/trunk@22515 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 22:58:35 +00:00
Andrew Nacin
595cd943bf WordPress dialog jQuery UI widget:
* Link to the upstream bug report.
 * No need to specify the default value for an option.
 * Use the new _super() UI method to open the dialog, avoiding a direct reference to the parent.
 * Fix typo in comment.
 * Use public isOpen() method rather than a private property.

props scott.gonzalez.
fixes #22399.



git-svn-id: https://develop.svn.wordpress.org/trunk@22514 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 22:36:35 +00:00
Andrew Nacin
e625c90923 Define a custom event prefix in the wpdialog jQuery UI widget to work around a jQuery UI 1.9.1 regression. see #22399.
git-svn-id: https://develop.svn.wordpress.org/trunk@22513 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 21:45:13 +00:00
Daryl Koopersmith
80d6ef3b28 Media JS: Pass the region instance through when firing the activate and deactivate events. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22509 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:43:39 +00:00
Daryl Koopersmith
68b5140382 Media: Keep track of gallery display properties in a separate model instead of mixed in with the query parameters. This allows for arbitrary gallery arguments and a more flexible data structure. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22508 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:37:21 +00:00
Daryl Koopersmith
199edff3b4 Media: When printing a gallery shortcode, hide the implicit orderby value. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22507 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:14:48 +00:00
Daryl Koopersmith
cc58e827f3 Media: Correctly set the edit gallery's library. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22506 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 12:09:15 +00:00
Daryl Koopersmith
a72459a5f5 Media JS: Only block button events by default if the button does not link to anything. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22501 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 11:30:40 +00:00
Daryl Koopersmith
2fcc122d9c Media: Output correct link html when inserting attachments. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22499 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 10:48:50 +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
1401ee7928 Media: Add a basic starting frame for upload/library selection.
`media.view.MediaFrame.Select` is a frame class with a handful of sensible defaults to handle selecting and uploading items in the media library.

see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22494 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 09:47:12 +00:00
Daryl Koopersmith
b06d75f58b Media: Add size dropdown to attachment display settings in the media modal. fixes #22206, see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22493 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 06:15:25 +00:00
Daryl Koopersmith
bb3dccd180 Media: Ensure search box reflects actual search state.
* Also switches search box to use `<input type="search" />` to take advantage of browser UI to clear the field.

fixes #22315, see #21390.


git-svn-id: https://develop.svn.wordpress.org/trunk@22487 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 04:44:31 +00:00
Daryl Koopersmith
1692eb9b95 Media: In the main media library in the insert media dialog, only show attachment display settings when one attachment is selected. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22482 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 02:11:37 +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
df931d747d Media JS: Use correct variable name when binding to the change:library event. see [22477], #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22478 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:24:55 +00:00
Daryl Koopersmith
8f79cdaea4 Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22477 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-09 01:23:20 +00:00
bumpbot
08a5af03ed Compress scripts/styles: 3.5-beta2-22475.
git-svn-id: https://develop.svn.wordpress.org/trunk@22475 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 22:58:34 +00:00
Daryl Koopersmith
cf75c68b55 Media JS: Add media.model.Composite, to aid in the representation of joint views. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22467 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-08 15:32:40 +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
bumpbot
6b78173371 Compress scripts/styles: 3.5-beta2-22455.
git-svn-id: https://develop.svn.wordpress.org/trunk@22456 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:58:33 +00:00
Daryl Koopersmith
9dc03c5c29 Media: Improve memory management of views, events, and DOM nodes. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22454 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 22:43:16 +00:00
bumpbot
7ec25963e0 Compress scripts/styles: 3.5-beta2-22438. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@22438 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 20:29:58 +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
Mark Jaquith
504b94b1b3 Use ImageOptim to losslessly smush our images. About half a MB in savings! fixes #22381. props waldojaquith
git-svn-id: https://develop.svn.wordpress.org/trunk@22425 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 18:49:10 +00:00
Daryl Koopersmith
c0ab768faa 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: https://develop.svn.wordpress.org/trunk@22415 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 08:41:17 +00:00
Andrew Ozz
49d5e725ce 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: https://develop.svn.wordpress.org/trunk@22411 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 23:36:10 +00:00
bumpbot
75201ce1e5 Compress scripts/styles: 3.5-beta2-22407.
git-svn-id: https://develop.svn.wordpress.org/trunk@22407 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 22:58:35 +00:00
Daryl Koopersmith
f70612501d Media JS: Move state-related logic from sidebar views to the state controllers. see #21390.
git-svn-id: https://develop.svn.wordpress.org/trunk@22397 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 01:19:39 +00:00
Andrew Ozz
330c10d1a9 Kill use of colons in class names, props SergeyBiryukov, fixes #21152
git-svn-id: https://develop.svn.wordpress.org/trunk@22396 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-06 01:01:52 +00:00