ENHANCEMENT Allow insert links with display link text

silverstripe · Aug 3, 2017 · 417caf2 · 417caf2
1 parent fc03620
commit 417caf2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-internal.js b/client/dist/js/TinyMCE_sslink-internal.js
diff --git a/client/src/legacy/TinyMCE_sslink-internal.js b/client/src/legacy/TinyMCE_sslink-internal.js
@@ -61,6 +61,10 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
+      const selection = tinymce.activeEditor.selection;
+      const selectionContent = selection.getContent() || '';
+      const tagName = selection.getNode().tagName;
+      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
 
       // create/update the react component
       ReactDOM.render(
@@ -74,6 +78,7 @@ jQuery.entwine('ss', ($) => {
             className="insert-link__dialog-wrapper--internal"
             fileAttributes={attrs}
             identifier="Admin.InsertLinkInternalModal"
+            requireLinkText={requireLinkText}
           />
         </ApolloProvider>,
         this[0]

diff --git a/code/Forms/InternalLinkFormFactory.php b/code/Forms/InternalLinkFormFactory.php
@@ -8,6 +8,7 @@
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TreeDropdownField;
+use SilverStripe\Forms\RequiredFields;
 
 /**
  * Provides a form factory for inserting internal page links in a HTML editor
@@ -35,6 +36,19 @@ protected function getFormFields($controller, $name, $context)
             ),
         ]);
 
+        if ($context['RequireLinkText']) {
+            $fields->insertAfter('PageID', TextField::create('Text', _t(__CLASS__.'.LINKTEXT', 'Link text')));
+        }
+
         return $fields;
     }
+
+    protected function getValidator($controller, $name, $context)
+    {
+        if ($context['RequireLinkText']) {
+            return RequiredFields::create('Text');
+        }
+
+        return null;
+    }
 }
diff --git a/code/Forms/InternalLinkModalExtension.php b/code/Forms/InternalLinkModalExtension.php
@@ -34,8 +34,12 @@ public function getOwner()
      */
     public function editorInternalLink()
     {
-        /** @var InternalLinkFormFactory $factory */
+        $showLinkText = $this->getOwner()->getRequest()->getVar('requireLinkText');
         $factory = InternalLinkFormFactory::singleton();
-        return $factory->getForm($this->getOwner(), "editorInternalLink");
+        return $factory->getForm(
+            $this->getOwner(),
+            "editorInternalLink",
+            [ 'RequireLinkText' => isset($showLinkText) ]
+        );
     }
 }