Commit Graph

619 Commits

Author SHA1 Message Date
Scott Taylor
b4569b69dc Revert [27528] until Flash in Firefox behaves :(
See #27389.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 23:39:16 +00:00
Scott Taylor
ba84f57083 Add MCE Views for audio and video. Please clear your browser cache so that you get the latest TinyMCE stylesheet.
* Move TinyMCE shortcode handling from `wpgallery` plugin to `mce-view.js`
* Force `preload="none"` when rendering media in the editor to ensure fast loading (I realize this sounds illogical)
* Move audio and video tag builder logic in `media-template.php` into PHP funcs that can be reused by any code passing `data.model` to an Underscore template
* Pause all players when moving between editor tabs and when moving from the editor to editing in the media modal.
* Rename `wp.media.audio|video.shortcode()` to the more appropriate `wp.media.audio|video.update()` that now returns a `wp.shortcode` object instead of a string.
* Add necessary MediaElement css files to `$mce_css`
* In `wp.mce.View.render()`, support multiple instances of the same shortcode
* When rendering `wp.mce.View`s, fire a ready event that passes the current MCE View root element as context 

See #27389.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 23:10:14 +00:00
Andrew Ozz
2a7918390b TinyMCE modals: re-enable the Close button in charmap, fix arrows in listboxes, add and position dashicons to the menu (when visible), see #26952
Built from https://develop.svn.wordpress.org/trunk@27513


git-svn-id: http://core.svn.wordpress.org/trunk@27356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-12 08:19:14 +00:00
Scott Taylor
f078f3e10e Video editing in the media modal:
* Add a state: `Add Subititles`
* Add `text/vtt` to the list of allowed mime-types, files end in `.vtt`. `.srt` files are served as `text/plain`.
* The content body of a video shortcode should be used for adding `<track>` elements only. This happens dynamically in the modal. If added by hand, they can still be parsed and managed.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 10:32:15 +00:00
Scott Taylor
f7af18e1d6 Audio/Video shortcodes in the media modal:
* Make a generic model, `wp.media.model.PostMedia`, which replaces `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Make a generic library, `wp.media.controller.MediaLibrary`, which replaces `wp.media.controller.ReplaceVideo` and `wp.media.controller.ReplaceAudio`
* `wp.media.controller.MediaLibrary` is used to create new states that want to load a library filtered by type, making it incredibly simple to add states to frames. See `wp.media.view.MediaFrame.VideoDetails` and `wp.media.view.MediaFrame.AudioDetails`.

UX changes:

* Add the ability to manage HTML5 fallbacks - add additional `<source>`s or remove specific `<source>`s
* In the Video Details state, add the ability to select a poster image

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 05:25:15 +00:00
Andrew Ozz
a8a20f4bb7 Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952
Built from https://develop.svn.wordpress.org/trunk@27460


git-svn-id: http://core.svn.wordpress.org/trunk@27305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-08 00:41:16 +00:00
Andrew Ozz
88a47ecd06 TinyMCE editimage: show the toolbar on mouseup to avoid accidental clicks on the buttons, fixes #24409
Built from https://develop.svn.wordpress.org/trunk@27451


git-svn-id: http://core.svn.wordpress.org/trunk@27297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-07 06:34:14 +00:00
Andrew Ozz
2b697a3d84 TinyMCE: add Ctrl+K, the "de-facto standard" shortcut to open wpLink, fixes #27305
Built from https://develop.svn.wordpress.org/trunk@27449


git-svn-id: http://core.svn.wordpress.org/trunk@27295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-07 03:09:14 +00:00
Andrew Ozz
6f1668c43d TinyMCE:
- Restore the "link" button state to disabled by default and enabled when text or image is selected.
- Remove the (recently added) default `link` plugin, not needed for `wpLink`.
See #27309
Built from https://develop.svn.wordpress.org/trunk@27447


git-svn-id: http://core.svn.wordpress.org/trunk@27293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-07 02:02:13 +00:00
Scott Taylor
eda85e17ca Cleanup audio/video shortcodes in the media modal:
* On the controller's `update`, `replace`, and `close` events, call `detach()` on the frame
* Cleanup the HTML ouput of the Underscore templates.
* Move some logic from the Underscore template to the `VideoDetails` view class.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 19:06:16 +00:00
Andrew Ozz
f0bfa77a4a TinyMCE: add the <hr> plugin and button, see #27159
Built from https://develop.svn.wordpress.org/trunk@27428


git-svn-id: http://core.svn.wordpress.org/trunk@27275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 00:54:14 +00:00
Andrew Ozz
79441fc1c1 TinyMCE: remove border-radius and padding from placeholder images, props avryl, see #27106
Built from https://develop.svn.wordpress.org/trunk@27427


git-svn-id: http://core.svn.wordpress.org/trunk@27274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 00:29:15 +00:00
Andrew Ozz
62d68cc992 TinyMCE: when parsing [caption] and the width attribute is missing, recreate it from the image tag width, fixes #23103
Built from https://develop.svn.wordpress.org/trunk@27426


git-svn-id: http://core.svn.wordpress.org/trunk@27273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 00:13:14 +00:00
Scott Taylor
ff8844deae Add TinyMCE placeholders for audio and video shortcodes.
* Add `wp.media.mixin`.
* Add `wp.media.audio` and `wp.media.video`.
* Add `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Add `wp.media.controller.AudioDetails` and `wp.media.controller.VideoDetails`.
* Add `wp.media.controller.ReplaceAudio` and `wp.media.controller.ReplaceVideo`.
* Add `wp.media.view.MediaFrame.AudioDetails` and `wp.media.view.MediaFrame.VideoDetails`.
* Add `wp.media.view.AudioDetails` and `wp.media.view.VideoDetails`.
* Update the `wpgallery` TinyMCE plugin.
* Display audio and video players in the media modal when shortcode is clicked.
* Provide a UI to edit shortcode attributes in the media modal.
* Provide a UI to replace the `src` media file in an `audio` or `video` shortcode.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 15:06:14 +00:00
Andrew Ozz
6074dfa272 Update mce-view.js and the wpview TinyMCE plugin, and use them to show gallery previews in the Visual editor, props gcorne, see #26959
Built from https://develop.svn.wordpress.org/trunk@27408


git-svn-id: http://core.svn.wordpress.org/trunk@27255 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 07:01:14 +00:00
Andrew Ozz
7121bb490d Restyles the modal for attaching media to posts, take II (also some autoprefixer and imagemin). Props avryl, see #26952.
Built from https://develop.svn.wordpress.org/trunk@27403


git-svn-id: http://core.svn.wordpress.org/trunk@27250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 03:54:15 +00:00
Andrew Ozz
5525f32fd8 TinyMCE: update to 4.0.18, see #24067
Built from https://develop.svn.wordpress.org/trunk@27387


git-svn-id: http://core.svn.wordpress.org/trunk@27235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-04 01:57:15 +00:00
Andrew Nacin
420afb81de TinyMCE: Propagate the dragover event outside the editor so drag-and-drop uploads can catch it.
props kovshenin.
see #19845.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 15:54:21 +00:00
Andrew Ozz
cab6362f2b Editor: throttle scrolling of the main window when the editor is active and is being scrolled with the mouse wheel or a trackpad, see #27013
Built from https://develop.svn.wordpress.org/trunk@27368


git-svn-id: http://core.svn.wordpress.org/trunk@27218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 02:34:14 +00:00
Andrew Ozz
cd0552a810 TinyMCE: remove box-shadow from the "more" and "nextpage" placeholder images, props avryl, see #24067
Built from https://develop.svn.wordpress.org/trunk@27345


git-svn-id: http://core.svn.wordpress.org/trunk@27197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-01 22:36:14 +00:00
Andrew Nacin
c4545fbbf4 Remove unnecessary quotes from urls in CSS.
props TobiasBg.
fixes #22476.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-26 17:23:13 +00:00
Andrew Ozz
511f12f793 When closing the various "edit" media modals, remove the related views elements from the DOM. Props gcorne, fixes #27204.
Built from https://develop.svn.wordpress.org/trunk@27276


git-svn-id: http://core.svn.wordpress.org/trunk@27132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 21:03:15 +00:00
Scott Taylor
943f295d2e 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.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-24 18:08:16 +00:00
Andrew Ozz
d7db798635 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
Built from https://develop.svn.wordpress.org/trunk@27190


git-svn-id: http://core.svn.wordpress.org/trunk@27049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-18 06:32:14 +00:00
Andrew Ozz
4aeae869dd 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.
Built from https://develop.svn.wordpress.org/trunk@27179


git-svn-id: http://core.svn.wordpress.org/trunk@27041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-14 19:20:13 +00:00
Andrew Ozz
f2f6d60624 TinyMCE: add support for audio and video shortcodes without closing, fix jshint warning, see #27016.
Built from https://develop.svn.wordpress.org/trunk@27177


git-svn-id: http://core.svn.wordpress.org/trunk@27039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-13 20:13:13 +00:00
Andrew Nacin
fae539978e Optimize 69 images (of 127) using the new Grunt task. (See [27172].)
fixes #25169.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27037 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-13 08:03:14 +00:00
Andrew Ozz
a6b4307422 TinyMCE: add image based placeholders for audio and video shortcodes. Props wonderboymusic, see #27016.
Built from https://develop.svn.wordpress.org/trunk@27169


git-svn-id: http://core.svn.wordpress.org/trunk@27034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-13 05:10:11 +00:00
Andrew Ozz
20fe8f026e 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.
Built from https://develop.svn.wordpress.org/trunk@27165


git-svn-id: http://core.svn.wordpress.org/trunk@27031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-11 23:33:14 +00:00
Andrew Ozz
c908c8f708 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.
Built from https://develop.svn.wordpress.org/trunk@27159


git-svn-id: http://core.svn.wordpress.org/trunk@27025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-10 23:48:12 +00:00
Andrew Ozz
5ea367cfe1 Fix scrolling inside the Visual editor on MacOS, add the same functionality to the Text editor, see #27013
Built from https://develop.svn.wordpress.org/trunk@27110


git-svn-id: http://core.svn.wordpress.org/trunk@26977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-06 19:34:12 +00:00
Andrew Ozz
c4f8dede57 TinyMCE: set the proper caption width when clicking image resize handle on image with caption. Props gcorne, fixes #27009, see #24067.
Built from https://develop.svn.wordpress.org/trunk@27098


git-svn-id: http://core.svn.wordpress.org/trunk@26969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-05 02:07:13 +00:00
Andrew Ozz
5e08452f49 TinyMCE: don't scroll the main window when scrolling the editor content with a mouse wheel or trackpad and reaching the end. Fixes #27013.
Built from https://develop.svn.wordpress.org/trunk@27095


git-svn-id: http://core.svn.wordpress.org/trunk@26967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-05 01:10:13 +00:00
Andrew Ozz
93d3e3efb6 Minor cleanup (jshint) of wp-fullscreen.js and /wordpress/plugin.js, see #24067
Built from https://develop.svn.wordpress.org/trunk@27085


git-svn-id: http://core.svn.wordpress.org/trunk@26958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-03 21:31:13 +00:00
Andrew Ozz
12b6085865 TinyMCE: don't replace <i> with <em> and <b> with <strong> and don't remove them when empty, see #24067, see #23037.
Built from https://develop.svn.wordpress.org/trunk@27083


git-svn-id: http://core.svn.wordpress.org/trunk@26956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-03 20:26:12 +00:00
Andrew Ozz
7b4b508b91 TinyMCE: update to 4.0.16, see #24067.
Built from https://develop.svn.wordpress.org/trunk@27062


git-svn-id: http://core.svn.wordpress.org/trunk@26935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-31 18:58:15 +00:00
Andrew Ozz
314f9569e5 TinyMCE: update to 4.0.14. Remove the fix for using init.setup in old plugins, now fixed upstream. See #24067.
Built from https://develop.svn.wordpress.org/trunk@27060


git-svn-id: http://core.svn.wordpress.org/trunk@26933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-31 00:06:12 +00:00
Scott Taylor
0347a8944e Update the versions of several devDependencies in package.json. grunt-cssjanus has been updated to 0.2.2, we no longer need the fork. Run npm install to receive updates for node_modules in the project root.
Props yoavf, TobiasBg.
Fixes #26073.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-29 04:43:30 +00:00
Andrew Ozz
6f25a990d0 TinyMCE: fix Ctrl + s shortcut (trigger autosave), see #24067.
Built from https://develop.svn.wordpress.org/trunk@27052


git-svn-id: http://core.svn.wordpress.org/trunk@26926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 23:29:12 +00:00
Scott Taylor
e1759d668a For starters, [27050] is rad. This just cleans up some extra new lines that were littered about, updates *some* of the inline docs (needs more), moves wp.media.controller.ImageDetails closer to its parent class, and de-dupes some code in media-template.php.
See #24409.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 23:21:13 +00:00
Andrew Ozz
33eedc570b Introduce Edit Image (single mode) in the media modal and use it to edit images inserted in the editor. Adds new feature: replace an image in the editor. Props gcorne, see #24409.
Built from https://develop.svn.wordpress.org/trunk@27050


git-svn-id: http://core.svn.wordpress.org/trunk@26924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 21:17:12 +00:00
Andrew Ozz
07ae13e432 TinyMCE: do not run preventDefault() on the tab key when Ctrl, Alt or Command key is also pressed. Ctrl + Tab is used to switch between browser tabs. See #24067, fixes #17261.
Built from https://develop.svn.wordpress.org/trunk@27034


git-svn-id: http://core.svn.wordpress.org/trunk@26910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-26 00:29:12 +00:00
Andrew Ozz
ed3145ec3d TinyMCE: fix the compat3x plugin appending 'en.' to button titles. Set charset to UTF-8 in html_entity_decode() for translated strings. See #24067, see #26875.
Built from https://develop.svn.wordpress.org/trunk@27030


git-svn-id: http://core.svn.wordpress.org/trunk@26906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-25 01:21:13 +00:00
Andrew Ozz
b4d76115cd TinyMCE: fix error trying to translate non-existent button "title" in the compat3x plugin. See #24067.
Built from https://develop.svn.wordpress.org/trunk@26994


git-svn-id: http://core.svn.wordpress.org/trunk@26871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-22 02:29:12 +00:00
Andrew Ozz
910ec9c462 TinyMCE: add a custom jQuery event 'tinymce-editor-init' triggered on initialization of every editor instance. This makes it a lot more convenient to hook into the instance compared to the init.setup callback. See #24067, see #26872.
Built from https://develop.svn.wordpress.org/trunk@26983


git-svn-id: http://core.svn.wordpress.org/trunk@26860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-19 23:22:14 +00:00
Andrew Ozz
5d92ed5632 TinyMCE: remove the 'spellchecker' plugin. It has been disabled for a while and the back-end currently doesn't work. See #24067.
Built from https://develop.svn.wordpress.org/trunk@26958


git-svn-id: http://core.svn.wordpress.org/trunk@26837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-15 19:07:11 +00:00
Andrew Ozz
1ddc17780a TinyMCE: add/remove the 'alignnone' class when aligning images without captions. See #24067.
Built from https://develop.svn.wordpress.org/trunk@26942


git-svn-id: http://core.svn.wordpress.org/trunk@26822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-14 05:52:09 +00:00
Andrew Ozz
88959be27d TinyMCE: improve handling of Read More and Nextpage tags. See #24067, fixes #16239.
Built from https://develop.svn.wordpress.org/trunk@26941


git-svn-id: http://core.svn.wordpress.org/trunk@26821 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-14 05:46:11 +00:00
Andrew Ozz
6c0fe71d05 TinyMCE: re-enable soft resizing of images inside the editor. See #24067.
Built from https://develop.svn.wordpress.org/trunk@26934


git-svn-id: http://core.svn.wordpress.org/trunk@26815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-13 01:13:10 +00:00
Andrew Ozz
290b52e8a4 TinyMCE: update compat3x.min.js and bump $tinymce_version. See #24067, fixes #26750.
Built from https://develop.svn.wordpress.org/trunk@26930


git-svn-id: http://core.svn.wordpress.org/trunk@26811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-10 00:52:13 +00:00