Commit Graph

163 Commits

Author SHA1 Message Date
Andrew Nacin
2b03ef73ae Add the ability to drag and drop files directly onto the editor.
The file will then begin to upload and the media manager will open.

props kovshenin.
see #19845.


git-svn-id: https://develop.svn.wordpress.org/trunk@27343 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-01 21:33:36 +00:00
Andrew Ozz
7c98b86d65 Plupload: remove the (old) plupload.silverlight.xap, remove the "executable" prop from Moxie.xap, see #25663
git-svn-id: https://develop.svn.wordpress.org/trunk@27340 602fd350-edb4-49c9-b593-d223f7449a82
2014-03-01 07:36:42 +00:00
Scott Taylor
8402d9c745 Rather than extending media.controller.CollectionAdd 3 times, make it a constructor that dynamically extends media.controller.Library and use instances of it instead.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27322 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 23:03:02 +00:00
Scott Taylor
01fb070621 Restore / re-tools some docs after [27313].
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27321 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 21:50:40 +00:00
Scott Taylor
6736936a43 Some playlist cleanup:
* Check properties against the `window` object when using `_.isUndefined()` on globals
* Fix a typo for `$safe_type` introduced in [27311]

See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27320 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 21:37:36 +00:00
Andrew Ozz
2dd4f585aa Remove debugging cruft, see #25663
git-svn-id: https://develop.svn.wordpress.org/trunk@27318 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 20:14:35 +00:00
Scott Taylor
a8c8ed3b94 In media-editor.js, use _.isUndefined() when available.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27317 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 20:10:32 +00:00
Andrew Ozz
11586e8ebe Upgrade Plupload to 2.1.1, props kovshenin, see #25663
git-svn-id: https://develop.svn.wordpress.org/trunk@27316 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 20:00:55 +00:00
Scott Taylor
84a00ad5f1 This comment was pasted and does not apply to specified code block.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27315 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 19:50:53 +00:00
Scott Taylor
7092b31e2f wp.media.collection should be its own civilized instantiable class, not a wrapper/factory. The class shall contain no reference to specific instances, and shall not try to grab static properties of itself. self, meet this.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27313 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 19:21:04 +00:00
Scott Taylor
d43fcdb10b Correct a misspelled property name in a media-views.js annotation.
Props kovshenin.
See #26870.



git-svn-id: https://develop.svn.wordpress.org/trunk@27309 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 03:06:37 +00:00
Scott Taylor
1481b6a07c Populate playlist setting values with their default value if they don't exist while parsing shortcode attributes.
Props kovshenin.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27308 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-27 02:54:58 +00:00
Andrew Nacin
724ca13549 Remove unnecessary quotes from urls in CSS.
props TobiasBg.
fixes #22476.


git-svn-id: https://develop.svn.wordpress.org/trunk@27289 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-26 17:22:18 +00:00
Andrew Ozz
5e8787d0de When closing the various "edit" media modals, remove the related views elements from the DOM. Props gcorne, fixes #27204.
git-svn-id: https://develop.svn.wordpress.org/trunk@27276 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-25 21:02:22 +00:00
Andrew Nacin
f14ef59818 Update the Masonry JavaScript library to version 3.
The new script handle is 'masonry'. The old 'jquery-masonry' handle is the official shiv that sits on top of the v3 library. While v3 no longer depends on jQuery, a theme or plugin may have bee
n implicitly loading jQuery though Masonry, rather than additionally declaring it as a dependency for themselves. Thus, the shiv is separate.

Themes should switch to 'masonry' and declare jQuery as a dependency on their own if they need it. Upgrade guide: http://masonry.desandro.com/appendix.html#upgrading-from-v2. imagesLoaded remai
ns included with Masonry here.

props shelob9.
fixes #25351.


git-svn-id: https://develop.svn.wordpress.org/trunk@27271 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-25 19:52:57 +00:00
Andrew Nacin
1e078dd1e4 Fixed mixed spaces and tabs. Also remove trailing comma. see #26631.
git-svn-id: https://develop.svn.wordpress.org/trunk@27266 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-25 17:31:19 +00:00
wonderboymusic
29725ce426 Remove a few unnecessary jQuery selectors added in [27239]. Playlists don't exist in some older contexts that galleries do.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27243 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-24 20:48:02 +00:00
Scott Taylor
5ead62b90c Load default settings state when creating a new playlist in the media modal. Add a few missing inline @this annotations in media-editor.js.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27242 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-24 20:25:54 +00:00
Scott Taylor
9ff3e7c214 Add core support for Playlists and Video Playlists.
* Playlists operate like galleries in the admin. 
* Provide default UI and JS support in themes using MediaElement and Backbone. 
* The shortcodes are clickable, editable, and configurable using the media modal. 
* Playlists support images for each item, whether or not the current theme supports images for `attachment:audio` and `attachment:video`
* Playlists respond to `$content_width` and resize videos accordingly.
* All playlist data is included inline, using a script tag with `type="application/json"`, allowing anyone to unenqueue the WP playlist JS and roll their own.
* Playlist styles are minimal and work out of the box in the last 5 default themes. They inherit and adapt to the current theme's font styles, and their rules are easily overrideable.

See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27239 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-24 18:07:51 +00:00
Scott Taylor
7b4cc75efb Access class directly instead of using this in the shortcodeAttrs method of any factory-generated wp.media.collection.
Fixes #27183.



git-svn-id: https://develop.svn.wordpress.org/trunk@27238 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-24 13:00:01 +00:00
Dominik Schilling (ocean90)
fb3d0c02b4 Update Backbone to version 1.1.2.
props gcorne.
fixes #27182.

git-svn-id: https://develop.svn.wordpress.org/trunk@27233 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-22 15:41:50 +00:00
Scott Taylor
2b06a387fe Register wp.media.controller.GalleryEdit and wp.media.controller.GalleryAdd using the new wp.media.controller.Collection* abstraction code.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27215 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-20 18:33:39 +00:00
Scott Taylor
fc5a96502f In media-views.js, add wp.media.controller.CollectionAdd and wp.media.controller.CollectionEdit to provide an abstraction for Add and Edit screens in the media modal for collection-type things.
There are currently no instances of this. Those will be forthcoming.

See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27214 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-20 18:25:01 +00:00
Scott Taylor
6fed18847c Replace the current wp.media.gallery instance in media-editor.js with one that leverages wp.media.collection.
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27213 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-20 18:12:05 +00:00
Scott Taylor
863c141ba8 Add an abstraction of the gallery code in media-editor.js called wp.media.collection. This will be the basis for parsing [gallery]-like shortcodes in the media editor (thing playlists, collections of PDFs, etc).
There are currently no instances of this. Those will be forthcoming.

See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27212 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-20 18:06:31 +00:00
Andrew Ozz
0d52823908 TinyMCE: style the modals to match WordPress admin (first-run). Fix couple of IE problems in tiny_mce_popup.js. Props avryl, see #26952, see #24067
git-svn-id: https://develop.svn.wordpress.org/trunk@27190 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-18 06:31:30 +00:00
Andrew Ozz
5a9624b834 TinyMCE: when clicking on a character in the Charmap modal, don't close it if the Crtl key is pressed. Makes it possible to insert several special chars in a row. See #27107.
git-svn-id: https://develop.svn.wordpress.org/trunk@27179 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-14 19:19:28 +00:00
Andrew Ozz
f6af16cd76 TinyMCE: add support for audio and video shortcodes without closing, fix jshint warning, see #27016.
git-svn-id: https://develop.svn.wordpress.org/trunk@27177 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-13 20:12:46 +00:00
Andrew Nacin
12b13fe7cf Optimize 69 images (of 127) using the new Grunt task. (See [27172].)
fixes #25169.


git-svn-id: https://develop.svn.wordpress.org/trunk@27173 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-13 08:02:48 +00:00
Andrew Nacin
110978e2d3 Update media-views and wp.Backbone.View for Backbone 1.1.
* Collection set/add/remove/reset methods now return models, not `this`, so they can no longer be chained.
 * Options passed to Backbone.View's constructor are no longer attached automatically. wp.Backbone.View now does this automatically.

See [27170] for Backbone 1.1 itself.

props gcorne.
fixes #26799.


git-svn-id: https://develop.svn.wordpress.org/trunk@27171 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-13 07:36:01 +00:00
Andrew Nacin
4e36f55df7 Update Backbone from 1.0 to 1.1.
Also update Underscore to 1.6. Includes the development versions of both, which are not included in the build.

Here is Backbone's changelog:
 * Made the return values of Collection’s `set`, `add`, `remove`, and `reset` more useful. Instead of returning `this`, they now return the changed (added, removed or updated) model or list of 
models. (This means they can no longer be chained.)
 * Backbone Views no longer automatically attach options passed to the constructor as `this.options` and Backbone Models no longer attach `url` and `urlRoot` options, but you can do it yourself if you prefer. (But if you extend `wp.Backbone.View`, options will be attached for you.)
 * All `"invalid"` events now pass consistent arguments. First the model in question, then the error object, then options.
 * You are no longer permitted to change the id of your model during `parse`. Use `idAttribute` instead.
 * On the other hand, `parse` is now an excellent place to extract and vivify incoming nested JSON into associated submodels.

See [27171] (next commit) for changes made to WordPress to be compatible with Backbone 1.1.

props gcorne, georgestephanis.
see #26799.


git-svn-id: https://develop.svn.wordpress.org/trunk@27170 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-13 07:33:29 +00:00
Andrew Ozz
fcea323396 TinyMCE: add image based placeholders for audio and video shortcodes. Props wonderboymusic, see #27016.
git-svn-id: https://develop.svn.wordpress.org/trunk@27169 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-13 05:09:04 +00:00
Andrew Ozz
94a1bb0485 TinyMCE: fix styling in the Charmap modal so the click targets are as large as the table cells. Remove the "Close" button and close the modal after inserting the special char. Fixes #27107.
git-svn-id: https://develop.svn.wordpress.org/trunk@27165 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-11 23:32:11 +00:00
Dominik Schilling (ocean90)
a03b5033ce Use jQuery.prop('checked') instead of jQuery.attr('checked'), which is deprecated.
git-svn-id: https://develop.svn.wordpress.org/trunk@27164 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-11 21:12:04 +00:00
Andrew Ozz
fd19c371d1 Edit image in TinyMCE:
- Add a "toolbar" at the top of the image with two buttons: Edit and Delete.
- Don't open the edit modal on second click on the image. Makes the "edit" button somewhat pointless and can sometimes trigger after resizing the image.
- When the image has caption: attempt to prevent IE11 from making the caption element resizable and wrapping it in thick border.
- When the caret is inside a caption next to the image, pressing Enter will create a new <p> tag above the caption.
- Hide the image toolbar on drag, cut, align.
Props gcorne, see #24409.

git-svn-id: https://develop.svn.wordpress.org/trunk@27159 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-10 23:47:34 +00:00
Andrew Nacin
522670cef2 Various JSHint fixes. see #26446.
git-svn-id: https://develop.svn.wordpress.org/trunk@27131 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-08 00:51:14 +00:00
Scott Taylor
4b047c21ab Add some inline docs to media-views.js and remove some unnecessary comments from a few super calls.
Props gcorne.
See #26870.



git-svn-id: https://develop.svn.wordpress.org/trunk@27126 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-07 20:20:38 +00:00
Andrew Ozz
4d7d68b565 Fix scrolling inside the Visual editor on MacOS, add the same functionality to the Text editor, see #27013
git-svn-id: https://develop.svn.wordpress.org/trunk@27110 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-06 19:33:13 +00:00
Andrew Nacin
7ff0442a07 JSHint fixes for media-views and Gruntfile.
props gcorne.
fixes #27032, #27033.


git-svn-id: https://develop.svn.wordpress.org/trunk@27105 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-06 05:31:22 +00:00
Andrew Ozz
5a3fb502cb TinyMCE: set the proper caption width when clicking image resize handle on image with caption. Props gcorne, fixes #27009, see #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@27098 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-05 02:06:10 +00:00
Andrew Ozz
89b8edf8f1 TinyMCE: don't scroll the main window when scrolling the editor content with a mouse wheel or trackpad and reaching the end. Fixes #27013.
git-svn-id: https://develop.svn.wordpress.org/trunk@27095 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-05 01:09:42 +00:00
Andrew Nacin
6aaad4785a Autosave: Fix typo in event namespace. props avryl, see #25272.
git-svn-id: https://develop.svn.wordpress.org/trunk@27092 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-04 16:06:13 +00:00
Andrew Ozz
840423ea10 Minor cleanup (jshint) of wp-fullscreen.js and /wordpress/plugin.js, see #24067
git-svn-id: https://develop.svn.wordpress.org/trunk@27085 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-03 21:30:25 +00:00
Andrew Ozz
5ff41a8635 Add back missing var definition in wplink.js, props TobiasBg, see #24067
git-svn-id: https://develop.svn.wordpress.org/trunk@27084 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-03 21:26:39 +00:00
Andrew Ozz
c24e451ae3 TinyMCE: don't replace <i> with <em> and <b> with <strong> and don't remove them when empty, see #24067, see #23037.
git-svn-id: https://develop.svn.wordpress.org/trunk@27083 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-03 20:25:08 +00:00
Sergey Biryukov
0d8921de03 Add braces around conditionals. props TobiasBg. fixes #25704.
git-svn-id: https://develop.svn.wordpress.org/trunk@27082 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-03 20:16:08 +00:00
Andrew Ozz
9fd8c54ef9 Consolidate "close on Escape" in the media modal, DFW, wpLink and Thickbox. Props kovshenin, fixes #26854.
git-svn-id: https://develop.svn.wordpress.org/trunk@27080 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-03 05:30:12 +00:00
Andrew Ozz
bb49691c63 WP_Link: convert < > and " to HTML entities when setting link title for the Text editor. Fixes #25704.
git-svn-id: https://develop.svn.wordpress.org/trunk@27071 602fd350-edb4-49c9-b593-d223f7449a82
2014-02-02 21:11:24 +00:00
Andrew Ozz
01da73ac78 TinyMCE: update to 4.0.16, see #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@27062 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-31 18:57:45 +00:00
Andrew Ozz
ced0079d88 TinyMCE: update to 4.0.14. Remove the fix for using init.setup in old plugins, now fixed upstream. See #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@27060 602fd350-edb4-49c9-b593-d223f7449a82
2014-01-31 00:05:17 +00:00