Merge branch '5.1' into 5

client/src/legacy/TinyMCE_sslink-anchor.js

@@ -76,11 +76,7 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
-      const editor = this.getElement().getEditor();
-      const selection = editor.getInstance().selection;
-      const selectionContent = editor.getSelection();
-      const tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
+      const requireLinkText = this.getRequireLinkText();
       const currentPageID = Number($('#Form_EditForm_ID').val() || 0);
 
       // create/update the react component

client/src/legacy/TinyMCE_sslink-internal.js

@@ -95,22 +95,6 @@ jQuery.entwine('ss', ($) => {
       );
     },
 
-    /**
-     * Determine whether to show the link text field
-     *
-     * @return {Boolean}
-     */
-    getRequireLinkText() {
-      const editor = this.getElement().getEditor();
-      const selection = editor.getInstance().selection;
-      const selectionContent = editor.getSelection();
-
-      const tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
-
-      return requireLinkText;
-    },
-
     /**
      * @param {Object} data - Posted data
      * @return {Object}

templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss

@@ -13,12 +13,12 @@
     <div class="input-group">
         <input $AttributesHTML />
         <div class="input-group-append">
-            <button role="button" data-icon="accept" type="button" class="btn btn-primary update">
+            <button role="button" type="button" class="btn btn-primary update">
                 <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.OK 'OK' %>
             </button>
         </div>
         <div class="input-group-append">
-            <button role="button" data-icon="cancel" type="button" class="btn btn-outline-secondary btn-sm input-group-append cancel">
+            <button role="button" type="button" class="btn btn-outline-secondary btn-sm input-group-append cancel">
                 <%t SilverStripe\CMS\Forms\SiteTreeURLSegmentField.Cancel 'Cancel' %>
             </button>
         </div>

tests/behat/features/insert-a-link.feature

@@ -8,7 +8,8 @@ So that I can link to a external website or a page on my site
     Given a "page" "Home"
       And a "page" "About Us" has the "Content" "<p>My awesome content</p>"
       And a "file" "file1.jpg"
-      And the "group" "EDITOR" has permissions "Access to 'Pages' section"
+      # And the "group" "EDITOR" has permissions "Access to 'Pages' section"
+      And the "group" "EDITOR" has permissions "Access to 'Files' section" and "Access to 'Pages' section" and "FILE_EDIT_ALL"
       And I am logged in as a member of "EDITOR" group
       And I go to "/admin/pages"
       And I click on "About Us" in the tree
@@ -25,6 +26,19 @@ So that I can link to a external website or a page on my site
     # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save" button
 
+  Scenario: I can wrap an image in a link to an internal page
+    Given I fill in the "Content" HTML field with "<p><img src='file1.jpg'></p>"
+    When I select the image "file1.jpg" in the "Content" HTML field
+      And I press the "Insert link" HTML field button
+      And I click "Page on this site" in the ".tox-collection__group" element
+    Then I should see an "form#Form_editorInternalLink" element
+      And I should not see "Link text"
+    When I select "About Us" in the "#Form_editorInternalLink_PageID_Holder" tree dropdown
+      And I press the "Insert link" button
+    Then the "Content" HTML field should contain "<a href="[sitetree_link,id=2]"><img src="file1.jpg"></a>"
+      # Required to avoid "unsaved changed" browser dialog
+      And I press the "Save" button
+
   Scenario: I can edit a link to an internal page
     Given I fill in the "Content" HTML field with "<a title='my desc' href='[sitetree_link,id=2]'>awesome</a>"
       And I select "awesome" in the "Content" HTML field
@@ -53,7 +67,20 @@ So that I can link to a external website or a page on my site
     # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save" button
 
-  Scenario: I can edit a link
+  Scenario: I can wrap an image in a link to an external URL
+    Given I fill in the "Content" HTML field with "<p><img src='file1.jpg'></p>"
+    When I select the image "file1.jpg" in the "Content" HTML field
+      And I press the "Insert link" HTML field button
+    When I click "Link to external URL" in the ".tox-collection__group" element
+      And I should see an "form#Form_ModalsEditorExternalLink" element
+      And I should not see "Link text"
+    When I fill in "http://silverstripe.org" for "URL"
+      And I press the "Insert link" button
+    Then the "Content" HTML field should contain "<a href="http://silverstripe.org"><img src="file1.jpg"></a>"
+      # Required to avoid "unsaved changed" browser dialog
+      And I press the "Save" button
+
+  Scenario: I can edit an external link
     Given I fill in the "Content" HTML field with "<p>My <a href='http://silverstripe.org'>awesome</a> content"
       And I select "awesome" in the "Content" HTML field
     When I press the "Insert link" HTML field button
@@ -67,7 +94,7 @@ So that I can link to a external website or a page on my site
     # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save" button
 
-  Scenario: I can remove a link
+  Scenario: I can remove an external link
     Given I fill in the "Content" HTML field with "My <a href='http://silverstripe.org'>awesome</a> content"
       And I select "awesome" in the "Content" HTML field
     When I press the "Remove link" button