Commit Graph

59 Commits

Author SHA1 Message Date
Andrew Ozz
b8d5769726 TinyMCE, inline link:
- Fix running wpLink without tinymce.js and the TinyMCE plugin without wplink.js.
- Do not show the Advanced button in the inline link dialog when wpLink is not loaded.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36777


git-svn-id: http://core.svn.wordpress.org/trunk@36744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-29 19:38:27 +00:00
John Blackbourn
393ef889c0 Editor: Remove an unused JavaScript variable so the JS lint tests pass.
See #33301

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


git-svn-id: http://core.svn.wordpress.org/trunk@36718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-28 02:19:25 +00:00
Andrew Ozz
32ac4bf58a TinyMCE, inline link:
- Fix in IE (again). Remove setting/getting placeholders, pass the link node instead.
- In the inline dialog: when the selected text looks like URL or email, pre-fill the URL field with it (same as in the modal).
- Fix setting the name of the main button in the modal: Add Link or Update.
- In the modal when clicking Update remove the link if the URL field is empty. That matches the inline dialog behaviour. Otherwise the modal remains open, nothing happens when clicking the Update button there.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36747


git-svn-id: http://core.svn.wordpress.org/trunk@36714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-27 21:33:26 +00:00
Andrew Ozz
1f4b40b9c3 TinyMCE, inline link:
- Fix applying the changes when pressing the Enter key in Firefox. No longer inserts new paragraph in the editor.
- Fix empty check when getting text from the dialog.
- Always focus the URL field when opening the dialog.
- Add back the keydown events in the modal.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36743


git-svn-id: http://core.svn.wordpress.org/trunk@36710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-27 00:52:26 +00:00
Andrew Ozz
2bb20c33fa TinyMCE, inline link:
- Make sure the inline dialog is not showing under the advanced modal.
- Fix checking if the link node contains text.
- Fix undo levels so all actions can be undone and redone.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36716


git-svn-id: http://core.svn.wordpress.org/trunk@36683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-26 00:21:26 +00:00
Andrew Ozz
611acc2193 TinyMCE, inline link dialog:
- Reset the inline dialog when canceling the advanced modal. If there is a link it should be on the first stage: follow/preview link.
- Fix tabbing in the inline edit dialog.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36703


git-svn-id: http://core.svn.wordpress.org/trunk@36670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-25 03:48:26 +00:00
Andrew Ozz
771cfe22ba TinyMCE, inline link dialog:
- Remove the bottom half of the (old) modal and add autocomplete on the URL field.
- Disable the inline edit dialog in old IE (7, 8 and 9). Use only the modal there.
- Fix in IE10 and 11.
- Fix (most?) remaining edge cases.
- Fix focusing the inline dialog, the modal and the editor.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36677


git-svn-id: http://core.svn.wordpress.org/trunk@36644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-24 06:20:26 +00:00
Andrew Ozz
30feff9c99 TinyMCE, inline link dialog:
- Fix passing values to the (old) modal on open when non-linked text is selected and Advanced is clicked before pasting an URL.
- When the user has selected text partially including a link and opens the editing dialog, auto-select the link only. Helps when a linked word is selected by double-clicking.
- Remove all placeholders on saving.
- Do not add undo level on inserting link placeholder.
- Remove the placeholder when canceling from the modal.

See #33301.
Built from https://develop.svn.wordpress.org/trunk@36602


git-svn-id: http://core.svn.wordpress.org/trunk@36569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-20 21:36:25 +00:00
Andrew Ozz
50a5fbb269 Editor: remove wpLink dependency on jQuery UI.
Props afercia.
Fixes #34716.
Built from https://develop.svn.wordpress.org/trunk@35728


git-svn-id: http://core.svn.wordpress.org/trunk@35692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-22 19:27:26 +00:00
Andrew Ozz
4cdddd401a TinyMCE:
- Sanitize and render HTML in captions when showing a gallery preview (wpView).
- Encode/escape HTML entered in the text field in the wpLink dialog.

Props iseulde, kraftbj, jnylen0, shawarkhan.
Fixes #32616.
Built from https://develop.svn.wordpress.org/trunk@35341


git-svn-id: http://core.svn.wordpress.org/trunk@35307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-21 20:38:26 +00:00
Mark Jaquith
d60e2eea84 Only use a bare URL when the link text field is used.
Fixes bug that would remove images on edit, in some circumstances.

fixes #33293
props azaozz
Built from https://develop.svn.wordpress.org/trunk@33591


git-svn-id: http://core.svn.wordpress.org/trunk@33558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-06 20:58:25 +00:00
Sergey Biryukov
1b282962a4 wpLink: Make sure the link wrapper is the last element in the body, otherwise the inline editor toolbar may show up above the backdrop.
props azaozz.
fixes #33268.
Built from https://develop.svn.wordpress.org/trunk@33588


git-svn-id: http://core.svn.wordpress.org/trunk@33555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-06 02:17:25 +00:00
Andrew Ozz
4605417b1c wpLink: always attempt to correct the URL before getting the URL field value. Fixes an edge case where the URL was not corrected when the user submitted the form by pressing Enter.
Props andfinally. Fixes #32412.
Built from https://develop.svn.wordpress.org/trunk@32992


git-svn-id: http://core.svn.wordpress.org/trunk@32963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-28 23:07:25 +00:00
Andrew Ozz
1f75220e9a TinyMCE, inline link toolbar: fix z-index bug in iOS Safari.
See #32604.
Built from https://develop.svn.wordpress.org/trunk@32958


git-svn-id: http://core.svn.wordpress.org/trunk@32929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-26 20:29:24 +00:00
Ella Iseulde Van Dorpe
af4f2bd1e8 wplink: update TinyMCE UI after updating the link
See #32604.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-24 23:23:26 +00:00
Scott Taylor
6148f3cd41 Add a class method to wpLink, buildHtml(). This will allows devs to duck-punch the implementation.
Props martinsachse.
Fixes #32180.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:20:26 +00:00
Ella Iseulde Van Dorpe
c12af009c2 Editor: link modal: use link as fallback for text
If there is no link text provided, use the link as the text. This is better than silently failing.

Props bcole808.
Fixes #32323.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-07 21:11:24 +00:00
Ella Iseulde Van Dorpe
677c3e53bb Link modal: reset search results appropriately
Reset the search results when the input field is emptied with the
browser's "clear" button inside that field.

Fixes #32174.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-25 06:41:25 +00:00
Helen Hou-Sandí
d672824273 wpLink: Make the text editor experience the same as in the visual editor.
props azaozz.
fixes #31890.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 13:59:30 +00:00
Helen Hou-Sandí
3ac1a19529 Spinners: Toggle a class instead of show/hide.
Toggling spinners also now uses visibility instead of display, so that the space is always reserved and nothing moves around unexpectedly.

props cdog, MikeHansenMe, valendesigns.
fixes #22839. see #31875, #30725.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-03 04:52:27 +00:00
Dominik Schilling
593e062b2e JSHint: Remove an unused variable.
see #28206.
Built from https://develop.svn.wordpress.org/trunk@31724


git-svn-id: http://core.svn.wordpress.org/trunk@31705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 17:40:27 +00:00
Andrew Ozz
eb878043a5 wpLink: change the text label to Link text, always focus the URK field, fix Ctrl/Cmd + K shortcut. See #28206.
Built from https://develop.svn.wordpress.org/trunk@31714


git-svn-id: http://core.svn.wordpress.org/trunk@31695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 03:01:27 +00:00
Andrew Ozz
9029c07592 wpLink: replace the "Title" field with a "Text" field and populate it with the link text when editing an existing link or with the selected text if any.
Props iseulde. See #28206.
Built from https://develop.svn.wordpress.org/trunk@31713


git-svn-id: http://core.svn.wordpress.org/trunk@31694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 02:40:27 +00:00
Andrew Ozz
eecd5561d8 wpLink: fix the logic for prepending http:// and trim the input.
Props iseulde. See #18149.
Built from https://develop.svn.wordpress.org/trunk@31606


git-svn-id: http://core.svn.wordpress.org/trunk@31587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-03 21:21:25 +00:00
Andrew Ozz
1750c89afb wpLink:
- Prepend 'http://' to pasted URLs.
- Do not prepend it when typing an URL.
- Do not prepend it when pasting the same URL for the second time (trying to correct wrong guess).
Props iseulde. Fixes #18149.
Built from https://develop.svn.wordpress.org/trunk@31602


git-svn-id: http://core.svn.wordpress.org/trunk@31583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-03 00:01:28 +00:00
John Blackbourn
e96e165c3a Prevent scrolling beneath modals on mobile devices by removing overflow from #wpwrap when a modal is open.
Fixes #29909
Props avryl

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


git-svn-id: http://core.svn.wordpress.org/trunk@30697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-02 08:09:25 +00:00
Andrew Ozz
2dda137191 wpLink: add custom open and close events, props bradyvercher, fixes #28095.
Built from https://develop.svn.wordpress.org/trunk@29335


git-svn-id: http://core.svn.wordpress.org/trunk@29115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-01 02:04:17 +00:00
Andrew Ozz
d15f9617f9 wpLink:
- Fix adding a link on pressing Enter.
- Don't auto-focus the URL field after selecting a local link.
- Don't auto-focus the URL field when opening on touch devices. Toggle focus/blur on it to close the onscreen keyboard so the modal is positioned properly.
See #28897.
Built from https://develop.svn.wordpress.org/trunk@29333


git-svn-id: http://core.svn.wordpress.org/trunk@29113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-31 23:28:19 +00:00
Andrew Ozz
77599cd99b wpLink: add keyboard navigation, improve accessibility. Props afercia, fixes #28897.
Built from https://develop.svn.wordpress.org/trunk@29321


git-svn-id: http://core.svn.wordpress.org/trunk@29102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-29 03:16:17 +00:00
Helen Hou-Sandí
f3ede5702e Don't interfere with browser-based autocomplete in the link modal. props SergeyBiryukov. fixes #28685.
Built from https://develop.svn.wordpress.org/trunk@29301


git-svn-id: http://core.svn.wordpress.org/trunk@29083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-25 15:57:16 +00:00
Andrew Ozz
c8ce9e2815 wpLink: support whole URLs including query/fragment when pre-filling the URL field. Fixes #19992
Built from https://develop.svn.wordpress.org/trunk@28828


git-svn-id: http://core.svn.wordpress.org/trunk@28632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-25 00:37:15 +00:00
Sergey Biryukov
8c90ebaec7 wpLink: use simpler expressions to detect email address or URL. We are not validating user input here, just suggesting.
see #19992.
Built from https://develop.svn.wordpress.org/trunk@28751


git-svn-id: http://core.svn.wordpress.org/trunk@28565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-13 21:26:15 +00:00
Andrew Ozz
15c902ea3a wpLink: use the proper instance of the editor when looking at the selection. Move the email and URL regexp to variables. See #19992
Built from https://develop.svn.wordpress.org/trunk@28750


git-svn-id: http://core.svn.wordpress.org/trunk@28564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-13 21:14:16 +00:00
Scott Taylor
c6d0dcc634 When a plain URL or email address is selected in the editor and "Insert/edit link" is clicked, pre-populate the URL field with the URL or mailto:<email-address>.
Props tillkruess.
Fixes #19992.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-09 15:35:14 +00:00
Andrew Ozz
08770f6b88 wpLink: fix spinners selectors and add some throttling when searching with AJAX while the user is typing, fixes #27615
Built from https://develop.svn.wordpress.org/trunk@27900


git-svn-id: http://core.svn.wordpress.org/trunk@27731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-02 02:27:16 +00:00
Andrew Ozz
d1008b2dfe wpLink: bring back the Cancel link, improve responsive styles, see #26952
Built from https://develop.svn.wordpress.org/trunk@27510


git-svn-id: http://core.svn.wordpress.org/trunk@27353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-12 03:07:15 +00:00
Andrew Ozz
05e23f7506 wpLink: stop using UI dialog, restyle the modal, add better responsive behaviour.
Fix UI dialog styling to match the rest of the admin styling.
Props avryl, see #26952
Built from https://develop.svn.wordpress.org/trunk@27494


git-svn-id: http://core.svn.wordpress.org/trunk@27336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 00:04:14 +00:00
Andrew Ozz
2726713764 Add back missing var definition in wplink.js, props TobiasBg, see #24067
Built from https://develop.svn.wordpress.org/trunk@27084


git-svn-id: http://core.svn.wordpress.org/trunk@26957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-03 21:27:12 +00:00
Sergey Biryukov
e35d675558 Add braces around conditionals. props TobiasBg. fixes #25704.
Built from https://develop.svn.wordpress.org/trunk@27082


git-svn-id: http://core.svn.wordpress.org/trunk@26955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-03 20:17:11 +00:00
Andrew Ozz
2f6d9d37cc Consolidate "close on Escape" in the media modal, DFW, wpLink and Thickbox. Props kovshenin, fixes #26854.
Built from https://develop.svn.wordpress.org/trunk@27080


git-svn-id: http://core.svn.wordpress.org/trunk@26953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-03 05:31:14 +00:00
Andrew Ozz
28cd7371c4 WP_Link: convert < > and " to HTML entities when setting link title for the Text editor. Fixes #25704.
Built from https://develop.svn.wordpress.org/trunk@27071


git-svn-id: http://core.svn.wordpress.org/trunk@26944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-02 21:12:12 +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
Sergey Biryukov
c85484e9cf Fix typo in a comment. props kovshenin. fixes #26266.
Built from https://develop.svn.wordpress.org/trunk@26418


git-svn-id: http://core.svn.wordpress.org/trunk@26318 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-26 21:45:09 +00:00
Andrew Nacin
fe440d71d8 Fix JSHint errors in wplink.js.
props jorbin.
fixes #25914.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-15 04:28:10 +00:00
Sergey Biryukov
b9387f0621 Add missing semicolon after wpLink object definition. props mt8.biz. fixes #25862.
Built from https://develop.svn.wordpress.org/trunk@26033


git-svn-id: http://core.svn.wordpress.org/trunk@25962 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-07 10:42:09 +00:00
Andrew Ozz
65cd133a6f TinyMCE: add support for IE11.
- Add the latest changes from the 3.x branch upstream.
- Reduce the number of calls to tinyMCEPopup.restoreSelection() in our custom plugins.
- Remove the deprecated execCommand("mceBeginUndoLevel");.
See #25281.
Built from https://develop.svn.wordpress.org/trunk@25748


git-svn-id: http://core.svn.wordpress.org/trunk@25661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-09 21:05:10 +00:00
Helen Hou-Sandí
09954eb82e Revert [25031] and [24841] - filling the internal linking search field with selected text has UX and performance issues with no resolution in sight. see #16276.
Built from https://develop.svn.wordpress.org/trunk@25528


git-svn-id: http://core.svn.wordpress.org/trunk@25448 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-20 20:38:09 +00:00
Helen Hou-Sandí
8c67a2917a Only set and run internal search for linking selected text if the panel is open. Make sure the focus is in the URL field whenever opening the linking modal to preserve previous behavior. props greuben. fixes #16276.
Built from https://develop.svn.wordpress.org/trunk@25031


git-svn-id: http://core.svn.wordpress.org/trunk@25018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-15 21:44:09 +00:00
Helen Hou-Sandí
d8f819fdda Set the default internal search value for the link dialog to be the text that is highlighted in the editor. props greuben. fixes #16276.
git-svn-id: http://core.svn.wordpress.org/trunk@24841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-29 01:01:33 +00:00
Mark Jaquith
cb3afeb56b Properly uncheck the "new tab" box when editing a non-new-tab link.
Previously, if you had just edited a new-tab link, a subsequent edit of a non-new-tab link would mistakenly keep the checkbox checked.

props sc0ttkclark. fixes #24520.

git-svn-id: http://core.svn.wordpress.org/trunk@24419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-06 16:49:25 +00:00