Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-07 19:31:54 +01:00
Code Issues Projects Releases Wiki Activity
38,022 Commits 50 Branches 747 Tags 791 MiB
c1ddf45869
Commit Graph

82 Commits

Author SHA1 Message Date
Andrew Ozz
bd00d61353 Merged revision 42574 from trunk: 
Editor: when keeping the scroll position treat all shortcodes as preview-able. Otherwise in some cases the marker span can get stuck inside the shortcode and break the markup.

Props azaozz, lizkarkoski and othellobloke for testing.
Fixes #42908 for 4.9.3.

Built from https://develop.svn.wordpress.org/branches/4.9@42575


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-01-23 17:48:41 +00:00
Andrew Ozz
397b2de6e5 Merged revision 42430 from trunk: 
Editor: ensure there is a selection before getting the caret position. Fixes a bug in Firefox when there is no selection for a hidden element.

Props johnschulz, azaozz.

Fixes #43012 for 4.9.2.

Built from https://develop.svn.wordpress.org/branches/4.9@42442


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-01-13 11:28:43 +00:00
Weston Ruter
ecf8680978 Editor: Improve scrolling behavior and prevent autosave logic from causing dirty state when just switching between Visual and Text tabs. 
Props pento.
See #41962, #42029.
Fixes #42530 for 4.9.

Built from https://develop.svn.wordpress.org/branches/4.9@42184


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-15 00:22:42 +00:00
Weston Ruter
0110751ddc Editor: Cease adding paragraphs when switching editor tabs. 
Fixes an error since [41783] in which extra paragraphs could be added to content when switching editor tabs.

Props pento, adamsilverstein, aduth.
Fixes #42531 for 4.9.

Built from https://develop.svn.wordpress.org/branches/4.9@42178


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-14 05:28:41 +00:00
Gary Pendergast
5e736b62e0 Editor: When switching Editor tabs, don't scroll unnecessarily. 
- When switching to the Text view, wait until after the Visual editor element has been hidden, before focussing the `<textarea>`.
- When switching to the Visual view, only scroll if the cursor is not visible on the current screen.

Merge of 52175 to the 4.9 branch.

Fixes #42530.


Built from https://develop.svn.wordpress.org/branches/4.9@42176


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-14 05:21:39 +00:00
Sergey Biryukov
6ecdbe6e0e Editor: Fix JSHint errors after [41783]. 
See #42059.
Built from https://develop.svn.wordpress.org/trunk@41785


git-svn-id: http://core.svn.wordpress.org/trunk@41619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-10-06 19:12:49 +00:00
Andrew Ozz
765272e3e5 Editor: 
- Fix keeping text selection and scroll position when there are embeds from URL.
- Add editor setting to disable keeping selection and scroll position.
- Remove dependency on Underscore.js.
- Fix error in the Text widget editor.

Props biskobe.
Fixes #42059, see #40854.
Built from https://develop.svn.wordpress.org/trunk@41783


git-svn-id: http://core.svn.wordpress.org/trunk@41617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-10-06 17:44:48 +00:00
Andrew Ozz
40d84f7503 Editor: Use editor.$ to improve removeSelectionMarker(). 
See #42029
Built from https://develop.svn.wordpress.org/trunk@41656


git-svn-id: http://core.svn.wordpress.org/trunk@41490 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-10-01 10:33:47 +00:00
Andrew Ozz
5335ba8c20 Editor: pass the DOM library instance instead of a (fake) editor instance to getCursorMarkerSpan(). 
See #42029
Built from https://develop.svn.wordpress.org/trunk@41655


git-svn-id: http://core.svn.wordpress.org/trunk@41489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-10-01 09:42:47 +00:00
Andrew Ozz
309c5559b4 Editor: improve attaching a callback on editor init. 
See #42029
Built from https://develop.svn.wordpress.org/trunk@41646


git-svn-id: http://core.svn.wordpress.org/trunk@41480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-29 19:12:47 +00:00
Andrew Ozz
e4bd7a86a6 Editor: Improve keeping text selection when switching between Visual and Text modes. 
Props biskobe.
See #42029.
Built from https://develop.svn.wordpress.org/trunk@41645


git-svn-id: http://core.svn.wordpress.org/trunk@41479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-29 17:50:45 +00:00
Gary Pendergast
ef3720ac49 Post Editor: Keep text selection between Visual and Text modes 
When switching between post editor modes, the current cursor position and selection is now preserved. This allows authors to switch modes without losing the context of where they were in the document.

Props biskobe.
Fixes #41962.


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


git-svn-id: http://core.svn.wordpress.org/trunk@41465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-28 06:45:46 +00:00
Andrew Ozz
ffa304135e Text widget: add the Add Media button and enable the wpview plugin to show embedded media previews in the editor. 
Props westonruter, azaozz.
See #40854.
Built from https://develop.svn.wordpress.org/trunk@41344


git-svn-id: http://core.svn.wordpress.org/trunk@41177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-08 10:57:43 +00:00
Sergey Biryukov
4e4df0e6c9 Docs: Use 3-digit, x.x.x style semantic versioning for @since 4.8.0 entries. 
See #41017.
Built from https://develop.svn.wordpress.org/trunk@41151


git-svn-id: http://core.svn.wordpress.org/trunk@40991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-07-25 22:48:42 +00:00
Andrew Ozz
d7c37de2de Editor: When stripping paragraph tags, and there is a <br> at the beginning or the end, merge them and keep the paragraph, not the <br>. 
Props rellect.
Fixes #37066.
Built from https://develop.svn.wordpress.org/trunk@40787


git-svn-id: http://core.svn.wordpress.org/trunk@40645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-18 22:55:42 +00:00
Andrew Ozz
19ed296008 Editor: Update wp.editor.remove() to use the new Quicktags instance removep(). 
Fixes: #35760
Built from https://develop.svn.wordpress.org/trunk@40599


git-svn-id: http://core.svn.wordpress.org/trunk@40469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-10 02:50:44 +00:00
Andrew Ozz
cbf3b2cff5 Editor: Add wp.editor.remove() for editors that were dynamically instantiated from JS. 
Fixes: #35760
Built from https://develop.svn.wordpress.org/trunk@40588


git-svn-id: http://core.svn.wordpress.org/trunk@40458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-09 03:41:42 +00:00
Andrew Ozz
d0e4448257 Editor: Provide API for the editor to be dynamically instantiated via JS. First run. 
See: #35760
Built from https://develop.svn.wordpress.org/trunk@40476


git-svn-id: http://core.svn.wordpress.org/trunk@40352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-04-19 02:38:44 +00:00
Andrew Ozz
85ee190163 Formatting: fix wpautop() to stop adding paragraph tags around <figcaption>. 
Fixes #39307 for trunk.
Built from https://develop.svn.wordpress.org/trunk@39912


git-svn-id: http://core.svn.wordpress.org/trunk@39849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-16 01:06:40 +00:00
Andrew Ozz
ee3052fdbe Docs: some improvements/fixes for editor.js. 
See #38933.
Built from https://develop.svn.wordpress.org/trunk@39911


git-svn-id: http://core.svn.wordpress.org/trunk@39848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-16 00:49:41 +00:00
Sergey Biryukov
e654c81f10 Docs: Add documentation for wp-admin/js/editor.js. 
Props terwdan, ireneyoast.
Fixes #38933.
Built from https://develop.svn.wordpress.org/trunk@39738


git-svn-id: http://core.svn.wordpress.org/trunk@39678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-06 22:11:57 +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