Commit Graph

45 Commits

Author SHA1 Message Date
Scott Taylor
615dd5331b Unifying media controls and supporting playlists in the editor:
* Support a `caption` attribute for audio and video shortcodes
* In `wp.media.audio|video`, rename `update` to `shortcode` to allow these models to share the same mixins as `wp.media.collection` subclasses
* When sending an audio or video shortcode to the editor, create a default caption if the user hasn't entered one. This currently only displays in the editor, not on the front end. Captions aren't tied to a specific attachment here because external sources are supported.
* In the `wp.mce.media` mixin, in the `edit` method, read `attr` instead of `data` when attempting to parse the encoded shortcode. `data` does not automatically update when the attribute changes. This was a blessing to debug.
* Add `wp.mce.media.PlaylistView` to support playlist views in TinyMCE
* Expose `WPPlaylistView` to global scope and suppress auto-parsing of playlist nodes when in the admin. Allow `WPPlaylistView` to be passed `metadata` on creation instead of requiring a JSON blob to be parsed.
* Remove all of the playlist logic from the `wpgallery` TinyMCE plugin.
* In `wp_prepare_attachment_for_js()` return more data for audio/video so that playlists can have parity in the admin/front end.

See #27320.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-20 13:33:14 +00:00
Scott Taylor
7ad4205f70 Add MCE views for audio and video shortcodes. When the shortcode does not contain a source that supports native playback, just show the filename.
* Remove the audio/video shortcode parsing from the `wpgallery` plugin.
* Make `mce-view` a dependency of `media-audiovideo`
* Introduce `wp.mce.video`, `wp.mce.audio`, `wp.mce.media`, and `wp.mce.media.View`
* Rename `wp.media.audio|video.shortcode()` to `wp.media.audio|video.update()` since it is called on Update and returns a `wp.shortcode` object now.
* In `wp.mce.View.render()`, fire a `ready` event when the placeholder is being parsed and pass the current node to the event handler.

See #27389, #27437.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 07:02:15 +00:00
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
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
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
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
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
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 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
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
a16cc19790 TinyMCE:
- Fix toolbar icons in IE9.
- Remove background gradients in IE < 10.
- Lint our plugins.
- Add draggable attribute to the caption wrapper and make the captioned images non-draggable in Chrome.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26880


git-svn-id: http://core.svn.wordpress.org/trunk@26763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-30 01:54:11 +00:00
Andrew Ozz
855889f7aa TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876


git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 23:53:15 +00:00
Andrew Nacin
bd265f4983 Fix JSHint errors in remaining WP TinyMCE plugin files.
fixes #26048.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-15 15:05:09 +00:00
Andrew Nacin
d8564963b8 Temporarily remove CSS preprocessing until we can get our Ruby dependency sorted out.
see #25858, #22862.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 21:45:11 +00:00
Helen Hou-Sandí
437caa9972 Turns out it helps if you add those pesky Sass files if you're going to use a preprocessor. see #25858.
Built from https://develop.svn.wordpress.org/trunk@26139


git-svn-id: http://core.svn.wordpress.org/trunk@26050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 19:54:14 +00:00
Bot (Assets)
6e798324e9 New develop.svn.wordpress.org repository based on the old core.svn repository.
* All WordPress files move to a src/ directory.
 * New task runner (Grunt), configured to copy a built WordPress to build/.
 * svn:ignore and .gitignore for Gruntfile.js, wp-config.php, and node.js.
 * Remove Akismet external from develop.svn. Still exists in core.svn.
 * Drop minified files from src/. The build process will now generate these.

props koop.
see #24976.

and see http://wp.me/p2AvED-1AI.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-07 05:49:02 +00:00
Bot (Assets)
a7fd4ea020 Compress scripts/styles: 3.6-beta2-24216.
git-svn-id: http://core.svn.wordpress.org/trunk@24216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-09 00:58:57 +00:00
Andrew Ozz
eb6910f23c TinyMCE: fix for the disappearing placeholders bug in Chrome, see #24177
git-svn-id: http://core.svn.wordpress.org/trunk@24215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-09 00:24:45 +00:00
Bot (Assets)
41db8c91ff Compress scripts/styles: 3.5-RC2-22953. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:20:51 +00:00
Ryan Boren
f07c7f5163 Refine media state machine methods.
* state( id ) becomes setState( id )
* get( id ) becomes state( id )
* state() stays the same
* previous() becomes lastState()

Props koopersmith
fixes #22652


git-svn-id: http://core.svn.wordpress.org/trunk@22952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:19:11 +00:00
Bot (Assets)
c33e862097 Compress scripts/styles: 3.5-RC1-22860. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 02:58:50 +00:00
Andrew Ozz
3fd9321c91 TinyMCE: improve hiding of the image/gallery popup buttons, fix selecting a gallery in IE, don't leave empty paragraph after deleting an image with the popup button, fixes #22463, see #21390
git-svn-id: http://core.svn.wordpress.org/trunk@22857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 01:31:51 +00:00
Bot (Assets)
a5641f8814 Compress scripts/styles: 3.5-beta3-22607. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 00:58:33 +00:00
Andrew Ozz
9f258e4342 TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, see #21390
git-svn-id: http://core.svn.wordpress.org/trunk@22602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:49:19 +00:00
Bot (Assets)
9d24f55bed Compress scripts/styles: 3.5-beta3-22589. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 00:58:36 +00:00
Andrew Ozz
dc43ad3ac8 TinyMCE: fix styles, add 2x background icons and load buttons.css in the Edit Image modal, remove wp-view styles from content.css, add 2x icons for the popup buttons (for editing image and gallery), fixes #22447, see #21019
git-svn-id: http://core.svn.wordpress.org/trunk@22586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 23:21:59 +00:00
Bot (Assets)
93b55dca26 Compress scripts/styles: 3.5-beta3-22572. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 15:00:31 +00:00
Daryl Koopersmith
fd6b847330 Media: Make edit gallery button use new media. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:06:10 +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
bumpbot
715efd86f0 Compress scripts/styles: 3.4-beta2-20521. TinyMCE updated.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 20:58:24 +00:00
azaozz
b85e997156 Remove extra slash when opening the gallery thickbox popup from the visual editor, props SergeyBiryukov, fixes #19850
git-svn-id: http://svn.automattic.com/wordpress/trunk@20519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 20:43:28 +00:00
azaozz
5745a57dc4 TinyMCE: move the WordPress plugins styles to the theme's stylesheet, fixes #20118
git-svn-id: http://svn.automattic.com/wordpress/trunk@19990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-24 23:46:04 +00:00
azaozz
4c10d04190 Load TinyMCE's non-minified "*src.js" plugin files when SCRIPT_DEBUG is defined, part props ericlewis, fixes #20055
git-svn-id: http://svn.automattic.com/wordpress/trunk@19945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-18 06:43:47 +00:00
azaozz
aac51df0e9 Fix timeout for the inline buttons on images in TinyMCE.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-10-27 09:06:26 +00:00
azaozz
a4996245ec PressThis: fix TinyMCE config and IE6 css "hasLayout"
git-svn-id: http://svn.automattic.com/wordpress/trunk@12112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-10-27 00:23:58 +00:00
azaozz
f5c253376e When inserting the embed shortcode in TinyMCE replace it with a placeholder image, update the 'wordpress', 'wpeditimage' and 'wpgallery' TinyMCE plugins, fix the audio and video "From URL" tabs in the uploader popup to accept only URLs for embedding, see #10337
git-svn-id: http://svn.automattic.com/wordpress/trunk@12098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-10-24 11:43:42 +00:00
azaozz
7cf1bbfcc7 TinyMCE: minify the custom plugins, remove unneeded CSS, load in the footer
git-svn-id: http://svn.automattic.com/wordpress/trunk@10337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-09 12:02:59 +00:00
markjaquith
379faab1b0 Remove third party logo, pending a better gallery icon image.
git-svn-id: http://svn.automattic.com/wordpress/trunk@10139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-09 10:22:37 +00:00
azaozz
d301ed68fd Several TinyMCE fixes and adjustments: Gecko spellchecker, Gallery options, single quote in image captions, see #8021
git-svn-id: http://svn.automattic.com/wordpress/trunk@9917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-27 11:30:51 +00:00
azaozz
ddead422a1 Move Gallery Settings to the Gallery tab in the uploader, split the Upload tab in "From Computer" and "From URL" tabs
git-svn-id: http://svn.automattic.com/wordpress/trunk@9894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-26 02:27:37 +00:00
azaozz
3c15f6a8d3 Gallery settings for TinyMCE
git-svn-id: http://svn.automattic.com/wordpress/trunk@9847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-23 06:37:15 +00:00