From c7fa9125482bbd075b8e322332798fe0cc199e25 Mon Sep 17 00:00:00 2001 From: Tomasz Jakut Date: Fri, 23 Oct 2015 14:24:15 +0200 Subject: [PATCH 1/6] Added i flag to subject and body regexps. --- plugins/link/plugin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/link/plugin.js b/plugins/link/plugin.js index a3f7baef163..d89648b2d60 100755 --- a/plugins/link/plugin.js +++ b/plugins/link/plugin.js @@ -203,8 +203,8 @@ // Loads the parameters in a selected link to the link dialog fields. var javascriptProtocolRegex = /^javascript:/, emailRegex = /^mailto:([^?]+)(?:\?(.+))?$/, - emailSubjectRegex = /subject=([^;?:@&=$,\/]*)/, - emailBodyRegex = /body=([^;?:@&=$,\/]*)/, + emailSubjectRegex = /subject=([^;?:@&=$,\/]*)/i, + emailBodyRegex = /body=([^;?:@&=$,\/]*)/i, anchorRegex = /^#(.*)$/, urlRegex = /^((?:http|https|ftp|news):\/\/)?(.*)$/, selectableTargets = /^(_(?:self|top|parent|blank))$/, From 8716f6c59da06566501819e3d3e882a33ff628ef Mon Sep 17 00:00:00 2001 From: Tomasz Jakut Date: Fri, 23 Oct 2015 14:25:06 +0200 Subject: [PATCH 2/6] Tests. --- tests/plugins/link/mail_link.js | 25 ++++++++++++++++++- ...ctandbodywhencapitallettersinmaillink.html | 11 ++++++++ ...jectandbodywhencapitallettersinmaillink.md | 11 ++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html create mode 100644 tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md diff --git a/tests/plugins/link/mail_link.js b/tests/plugins/link/mail_link.js index f219cb0eecf..a3c3b4ede0e 100644 --- a/tests/plugins/link/mail_link.js +++ b/tests/plugins/link/mail_link.js @@ -9,7 +9,8 @@ bender.editor = { } }; -var protectedMailLink = 'AJD', protectedMailLinkWithoutParams = 'AJD'; @@ -72,6 +73,28 @@ bender.test( { assert.areEqual( '', subjectField.getValue() ); assert.areEqual( '', bodyField.getValue() ); + dialog.fire( 'ok' ); + dialog.hide(); + } ); + }, + + // #12189 + 'test read from mail link with Subject and Body parameters provided': function() { + var bot = this.editorBot; + + bot.setHtmlWithSelection( '[' + mailLinkWithCapitalLetters + ']' ); + + bot.dialog( 'link', function( dialog ) { + var linkTypeField = dialog.getContentElement( 'info', 'linkType' ), + addressField = dialog.getContentElement( 'info', 'emailAddress' ), + subjectField = dialog.getContentElement( 'info', 'emailSubject' ), + bodyField = dialog.getContentElement( 'info', 'emailBody' ); + + assert.areEqual( 'email', linkTypeField.getValue() ); + assert.areEqual( 'job@cksource.com', addressField.getValue() ); + assert.areEqual( 'Test subject', subjectField.getValue() ); + assert.areEqual( 'Test body', bodyField.getValue() ); + dialog.fire( 'ok' ); dialog.hide(); } ); diff --git a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html new file mode 100644 index 00000000000..ea7a453af82 --- /dev/null +++ b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html @@ -0,0 +1,11 @@ + + + + + diff --git a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md new file mode 100644 index 00000000000..48eccca03bd --- /dev/null +++ b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md @@ -0,0 +1,11 @@ +@bender-tags: tc, link, 9192, 4.5.5 +@bender-ui: collapsed +@bender-ckeditor-plugins: link, toolbar, wysiwygarea + +---- + +1. Double click on mail link in the editor. The dialog should open. + +**Expected:** +* The value of "E-mail subject" field should be equal to `Test subject`. +* The value of "Email body" field should be equal to `Test body`. From 66621ea3e30fb8729532e73db255f0a26147ddd4 Mon Sep 17 00:00:00 2001 From: "m.lewandowski" Date: Tue, 3 Nov 2015 17:10:00 +0100 Subject: [PATCH 3/6] Inlined mailLinkWithCapitalLetters variable. --- tests/plugins/link/mail_link.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/plugins/link/mail_link.js b/tests/plugins/link/mail_link.js index a3c3b4ede0e..6a1ec363cdd 100644 --- a/tests/plugins/link/mail_link.js +++ b/tests/plugins/link/mail_link.js @@ -9,8 +9,7 @@ bender.editor = { } }; -var mailLinkWithCapitalLetters = 'AJD', - protectedMailLink = 'AJD', protectedMailLinkWithoutParams = 'AJD'; @@ -82,7 +81,7 @@ bender.test( { 'test read from mail link with Subject and Body parameters provided': function() { var bot = this.editorBot; - bot.setHtmlWithSelection( '[' + mailLinkWithCapitalLetters + ']' ); + bot.setHtmlWithSelection( '[AJD]' ); bot.dialog( 'link', function( dialog ) { var linkTypeField = dialog.getContentElement( 'info', 'linkType' ), From 73efb49f0ab53b4d3d077564823bcd736abe9440 Mon Sep 17 00:00:00 2001 From: "m.lewandowski" Date: Tue, 3 Nov 2015 17:12:00 +0100 Subject: [PATCH 4/6] Corrected ticket number. --- .../manual/readsubjectandbodywhencapitallettersinmaillink.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md index 48eccca03bd..1056e051e21 100644 --- a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md +++ b/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md @@ -1,4 +1,4 @@ -@bender-tags: tc, link, 9192, 4.5.5 +@bender-tags: tc, link, 12189, 4.5.5 @bender-ui: collapsed @bender-ckeditor-plugins: link, toolbar, wysiwygarea From 5dc7ec34fe9e9384d0265af7de862e9b538dac2f Mon Sep 17 00:00:00 2001 From: "m.lewandowski" Date: Tue, 3 Nov 2015 17:15:36 +0100 Subject: [PATCH 5/6] Simplified manual test file name. --- ...apitallettersinmaillink.html => parseuppercasedurlparams.html} | 0 ...hencapitallettersinmaillink.md => parseuppercasedurlparams.md} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/plugins/link/manual/{readsubjectandbodywhencapitallettersinmaillink.html => parseuppercasedurlparams.html} (100%) rename tests/plugins/link/manual/{readsubjectandbodywhencapitallettersinmaillink.md => parseuppercasedurlparams.md} (100%) diff --git a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html b/tests/plugins/link/manual/parseuppercasedurlparams.html similarity index 100% rename from tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.html rename to tests/plugins/link/manual/parseuppercasedurlparams.html diff --git a/tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md b/tests/plugins/link/manual/parseuppercasedurlparams.md similarity index 100% rename from tests/plugins/link/manual/readsubjectandbodywhencapitallettersinmaillink.md rename to tests/plugins/link/manual/parseuppercasedurlparams.md From d8c97dc0a6ba91a5b330d37a5febdfe5efbdde8c Mon Sep 17 00:00:00 2001 From: "m.lewandowski" Date: Wed, 4 Nov 2015 08:05:03 +0100 Subject: [PATCH 6/6] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index edd05c502b9..97715982e0a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Fixed Issues: * [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: Link target now supports wider ASCII character range. Thanks to [SamZiemer](https://github.com/SamZiemer)! * [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: Allow for the iframe having been removed already. Thanks to [Stefan Rijnhart](https://github.com/StefanRijnhart)! * [#13803](https://dev.ckeditor.com/ticket/13803): Fixed: Allow the editor to be destroyed before being fully initialized. Thanks to [Cyril Fluck](https://github.com/cyril-sf)! +* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: Link plugin dialog does not display subject of email links if subject parameter is not lowercase. * [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Images fail when site path includes parentheses because background-image path needs single-quotes around URL value. * [#13798](http://dev.ckeditor.com/ticket/13798): Fixed: Changing paragraph format causes cursor to move on Firefox 41. * [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: Now `contents.css` style will be used even if [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing.