Commit Graph

62 Commits

Author SHA1 Message Date
Dion Hulse e18e5acce8 Formatting: fix `wpautop()` to stop adding paragraph tags around `<figcaption>`.
Props azaozz, pbearne for tests.
Merges [39912], [39914] to the 4.7 branch.
Fixes #39307 for 4.7.


Built from https://develop.svn.wordpress.org/branches/4.7@40091


git-svn-id: http://core.svn.wordpress.org/branches/4.7@40028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-02-21 03:42:38 +00:00
Gary Pendergast 3e08cf2b66 Formatting: Update `autop()` to match `wpautop()`.
[38592] changed the behaviour of `wpautop()` , so it's nice to change `autop()` to match.

Interestingly, this change isn't necessary for the functionality to work - #4857 didn't affect content that had been run through `autop()` at some point, as `autop()` would add a single line break before block elements, then `wpautop()` would later add a second line break, making it work correctly.

Props nacin for finding out about [38592] on Twitter, and DMing me to remind me to review `autop()`.
See #4857.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-13 06:03:31 +00:00
Andrew Ozz 532e8f0204 TinyMCE: preserve `<script>` and `<style>` tags inside the editor.
Uses image placeholders for the tags and makes then visible. That way the tags can also be deleted from inside the editor.

Props iseulde, azaozz.
Fixes #32923.
Built from https://develop.svn.wordpress.org/trunk@38039


git-svn-id: http://core.svn.wordpress.org/trunk@37980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-12 22:09:31 +00:00
Pascal Birchler a7e13d0af9 Editor: Correctly indent definition lists when switching from the visual to the text editor.
Props ocean90, katieburch.
Fixes #23299.
Built from https://develop.svn.wordpress.org/trunk@35999


git-svn-id: http://core.svn.wordpress.org/trunk@35964 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-17 23:06:25 +00:00
Andrew Ozz 91759029e9 TinyMCE: fix the regexp used to protect line breaks inside script and pre tags to match `<script>` that load external scripts.
Fixes #34760.
Built from https://develop.svn.wordpress.org/trunk@35727


git-svn-id: http://core.svn.wordpress.org/trunk@35691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-22 19:13:28 +00:00
Andrew Ozz 2de7757124 Fix creating of extra `<br />` tags in both PHP and JS variants of wpautop(). Add PHP tests to catch similar problems in the future.
Props valendesigns, azaozz. Fixes #33377.
Built from https://develop.svn.wordpress.org/trunk@33624


git-svn-id: http://core.svn.wordpress.org/trunk@33591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-17 17:36:24 +00:00
Andrew Ozz e4758f42e5 Update the TinyMCE initialization:
- Replace `wp_htmledit_pre()` and `wp_richedit_pre()` with `format_for_editor()`.
- Replace the `'htmledit_pre'` and `'richedit_pre'` filters with `'format_for_editor'`.
- Do not run the post content through `wpautop()` in PHP when the visual editor is default. Run the textarea content through the JS wpautop on initializing TinyMCE.
- Simplify both editors initialization.
- Improve setting of `wpActiveEditor` in Quicktags.
- Improve editor.js, use `tinymce.$` when possible.
See #32425.
Built from https://develop.svn.wordpress.org/trunk@32899


git-svn-id: http://core.svn.wordpress.org/trunk@32870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-21 22:01:28 +00:00
Scott Taylor 6b84df3bbd Ensure that `<figcaption>` is not autop'd.
Fixes #29219.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 00:27:21 +00:00
Sergey Biryukov 468dc35b8b When switching to the Text editor, make the textarea visible to screen readers.
props afercia.
fixes #29815.
Built from https://develop.svn.wordpress.org/trunk@29815


git-svn-id: http://core.svn.wordpress.org/trunk@29581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-02 12:46:16 +00:00
Andrew Ozz 004da2f6ba Formatting: make the removal of white space around <option> greedy, see #28217.
Built from https://develop.svn.wordpress.org/trunk@29316


git-svn-id: http://core.svn.wordpress.org/trunk@29097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-28 19:55:16 +00:00
Andrew Ozz ad0f539621 Formatting: no <p> or <br> around <option> tags in both flavours of wpautop, make "selects" easier to read in the Text editor. Fixes #28217.
Built from https://develop.svn.wordpress.org/trunk@29315


git-svn-id: http://core.svn.wordpress.org/trunk@29096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-28 19:44:18 +00:00
Scott Taylor 856e5ef55e Remove `noscript` from `wpautop()`'s list of block elements.
Props mdawaffe.
Fixes #27268.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-24 00:54:17 +00:00
Andrew Ozz 15a1f80885 TinyMCE in iOS:
- Fix placing the caret at the bottom of longer posts when the keyboard is open.
- Disable resizing on switching editors and on show/hide the kitchen sink row.
See #28242
Built from https://develop.svn.wordpress.org/trunk@28626


git-svn-id: http://core.svn.wordpress.org/trunk@28446 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-30 02:38:16 +00:00
Andrew Ozz 2d0ce517e8 TinyMCE: better calculation for editor height when switching Text to Visual and back. Add stopping of editor resizing when the mouse leaves the browser window. See #27279
Built from https://develop.svn.wordpress.org/trunk@27941


git-svn-id: http://core.svn.wordpress.org/trunk@27771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-04 01:31:15 +00:00
Andrew Nacin 2133c89e8f Remove select and input from wpautop()'s HTML blocks list.
props rachelbaker, DH-Shredder.
fixes #22230.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-27 00:01:15 +00:00
John Blackbourn 184dc2bc33 `figcaption` should not be treated as a block-level element by `wpautop()`. See #25646. Props oso96_2000.
Built from https://develop.svn.wordpress.org/trunk@27527


git-svn-id: http://core.svn.wordpress.org/trunk@27370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 21:51:16 +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 Ozz 0395919b11 JSHint fixes for editor.js. Props dougwollison, fixes #25947
Built from https://develop.svn.wordpress.org/trunk@26224


git-svn-id: http://core.svn.wordpress.org/trunk@26131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-15 21:03:10 +00:00
Andrew Nacin d06c049d51 Fix various typos in inline documentation. props nofearinc, fixes #25119.
Built from https://develop.svn.wordpress.org/trunk@25094


git-svn-id: http://core.svn.wordpress.org/trunk@25078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-22 22:01:08 +00:00
Andrew Ozz 4064312308 Editor: fix switching Text to Visual and back if TinyMCE fails to initialise, fixes #23235
git-svn-id: http://core.svn.wordpress.org/trunk@23790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-22 20:43:37 +00:00
Andrew Ozz 50ceba1323 Autop: <samp> is not a block tag, props toscho, fixes #18807
git-svn-id: http://core.svn.wordpress.org/trunk@23327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-22 19:05:21 +00:00
Andrew Ozz 563c7caac5 Main editor: maintain the height when switching Visual to Text and back, save the height when resizing as user state, output the height in the textarea tag when loading, (thanks @nacin for the help), fixes #21718
git-svn-id: http://core.svn.wordpress.org/trunk@22007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-26 03:30:21 +00:00
Andrew Nacin 8fd2fb4998 Synchronize block-level elements between the JS and PHP versions of wpautop. props SergeyBiryukov. fixes #18534.
git-svn-id: http://core.svn.wordpress.org/trunk@21888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-18 17:32:44 +00:00
Andrew Nacin 2710bcade1 Switch to .min for compressed JS and CSS files.
* This moves our "development" versions from .dev.js to .js (same for css).
 * The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.



git-svn-id: http://core.svn.wordpress.org/trunk@21592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 00:04:18 +00:00
bumpbot 5a37c2f523 Compress scripts/styles: 3.4-beta3-20681. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@20681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-02 01:58:25 +00:00
bumpbot d675c19762 Compress scripts/styles: 3.4-alpha-20175. TinyMCE updated.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-14 22:00:22 +00:00
azaozz 930cd0862f mode == 'tmce' || mode == 'tinymce', see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@19319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-17 15:50:01 +00:00
azaozz 44472ebcff Make switchEditors.go() fully back-compat, see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@19316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-17 02:44:28 +00:00
azaozz 6041cd0410 Fix QTags.closeAllTags(), replace 'tb' with 'ed' in quicktags,js to make it clear it is the editor instance not the toolbar, small comments quick edit fixes, see #16695, fixes #15911
git-svn-id: http://svn.automattic.com/wordpress/trunk@18576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-20 19:55:51 +00:00
azaozz f634dd5af4 Editor API enhancement, first run (still needs some work), see #17144
git-svn-id: http://svn.automattic.com/wordpress/trunk@18498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-03 10:19:00 +00:00
azaozz 24599d17f0 Update TinyMCE to 3.4.2, includes native <iframe>, <audio>, <video> support and stops removing HTML 5.0 tags, fixes #17086
git-svn-id: http://svn.automattic.com/wordpress/trunk@17625 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-10 18:36:05 +00:00
azaozz c121aa0ae3 Remove invalid parent paragraph when pasting in the visual editor or switching visual to HTML and back, keep multiple empty lines in a <pre> tag, fixes #15095 fixes #15367
git-svn-id: http://svn.automattic.com/wordpress/trunk@16394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-15 23:57:27 +00:00
azaozz 6efcb2913a Autop: add fieldset to blocks, remove support for empty <p> for now, fix block in block problems when switching the editor from visual to html and back, fixes #8644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-25 09:50:20 +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 ba74883676 TinyMCE 3.2.7
git-svn-id: http://svn.automattic.com/wordpress/trunk@11974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-09-26 08:33:16 +00:00
azaozz bf88b244cd Hide text while editor is loading, show html editor on error
git-svn-id: http://svn.automattic.com/wordpress/trunk@11171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-04 10:34:50 +00:00
azaozz 9c1c3f7eda Add <col> to list of block elements, props CharlieHamu and Denis-de-Bernardy, fixes #9484
git-svn-id: http://svn.automattic.com/wordpress/trunk@11070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-23 08:28:22 +00:00
azaozz 8011e6016b TinyMCE 3.2.2.3, has several bugfixes
git-svn-id: http://svn.automattic.com/wordpress/trunk@10845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-27 12:57:25 +00:00
azaozz a750885c8e Minify all js and add the non-minified files as .dev.js
git-svn-id: http://svn.automattic.com/wordpress/trunk@10291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-01-02 15:08:58 +00:00
azaozz f7e5bfa831 Explicitly declare Javascript vars when created, props projct, fixes #8654, fixes #8655, fixes #8656, for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@10232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-19 20:33:44 +00:00
ryan e89192b1a8 Strip trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@10150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-09 18:03:31 +00:00
azaozz 9fba444f3b Preview for both drafts and published posts/pages
git-svn-id: http://svn.automattic.com/wordpress/trunk@9451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-31 22:47:07 +00:00
azaozz da113155e8 Write page styling
git-svn-id: http://svn.automattic.com/wordpress/trunk@9384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-28 10:59:26 +00:00
azaozz 72df1fc525 Ensure default editor is selected
git-svn-id: http://svn.automattic.com/wordpress/trunk@9019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-28 14:21:00 +00:00
azaozz e2b4009e66 Saving/restoring the user interface state, see #7654
git-svn-id: http://svn.automattic.com/wordpress/trunk@8784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-31 06:34:43 +00:00
azaozz 95fa29a208 Reply to comments from admin, first run, see #7435
git-svn-id: http://svn.automattic.com/wordpress/trunk@8720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-24 06:56:22 +00:00
ryan 35b18e5034 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@8600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-09 05:36:14 +00:00
ryan 752b0eb45b Rename wp_caption shortcode to caption. Allow themes to disable captioning. Use dashes instead of underscores in class names. Props azaozz. see #6812
git-svn-id: http://svn.automattic.com/wordpress/trunk@8313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-07-11 15:59:14 +00:00
ryan e455091d0a Image caption fixes from azaozz: captions are properly created in tables and in lists, all tags are properly removed when deleting a caption, the align buttons can be used to align the captions. see #6812
git-svn-id: http://svn.automattic.com/wordpress/trunk@8260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-07-06 16:38:37 +00:00
ryan 88ca7797d1 Image captions from azaozz. see #6812
git-svn-id: http://svn.automattic.com/wordpress/trunk@8239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-07-02 18:41:11 +00:00