set default text (if nothing is present)

flipboxfactory · Apr 9, 2019 · 51b9628 · 51b9628
1 parent f27a558
commit 51b9628
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "flipboxfactory/craft-link",
   "description": "Link Field Type for Craft CMS",
-  "version": "1.1.3",
+  "version": "1.1.2",
   "type": "craft-plugin",
   "keywords": [
     "flipbox",

diff --git a/src/templates/_components/fieldtypes/Link/types/email/settings.twig b/src/templates/_components/fieldtypes/Link/types/email/settings.twig
@@ -11,4 +11,13 @@
         id: 'placeholder',
         value: type.settings.placeholder
     }) }}
+{% endblock %}
+
+{% block notRequiredTextToggle %}
+    {{ forms.lightswitchField({
+        label: 'Use Email as default text'|t('link'),
+        name: 'useEmailAsDefaultText',
+        id: 'useEmailAsDefaultText',
+        on: type.settings.useEmailAsDefaultText,
+    }) }}
 {% endblock %}
diff --git a/src/templates/_components/fieldtypes/Link/types/settings.twig b/src/templates/_components/fieldtypes/Link/types/settings.twig
@@ -25,8 +25,16 @@
             instructions: 'Require the user defined text field to be populated'|t('link'),
             name: 'requireText',
             id: 'requireText',
-            on: type.settings.requireText
+            on: type.settings.requireText,
+            toggle: "text-require-text-field",
+            reverseToggle: "text-not-require-text-field"
         }) }}
+        <div id="text-require-text-field" class="{% if not type.settings.requireText %}hidden{% endif %}">
+            {% block requiredTextToggle %}{% endblock %}
+        </div>
+        <div id="text-not-require-text-field" class="{% if type.settings.requireText %}hidden{% endif %}">
+            {% block notRequiredTextToggle %}{% endblock %}
+        </div>
     </div>
 
     {{ forms.lightswitchField({

diff --git a/src/templates/_components/fieldtypes/Link/types/url/settings.twig b/src/templates/_components/fieldtypes/Link/types/url/settings.twig
@@ -11,4 +11,13 @@
         id: 'placeholder',
         value: type.settings.placeholder
     }) }}
-{% endblock %}
+{% endblock %}
+
+{% block notRequiredTextToggle %}
+    {{ forms.lightswitchField({
+        label: 'Use URL as default text'|t('link'),
+        name: 'useUrlAsDefaultText',
+        id: 'useUrlAsDefaultText',
+        on: type.settings.useUrlAsDefaultText,
+    }) }}
+{% endblock %}
diff --git a/src/types/Email.php b/src/types/Email.php
@@ -32,7 +32,12 @@ class Email extends AbstractType
     const INPUT_TEMPLATE_PATH = self::BASE_TEMPLATE_PATH . '/input';
 
     /**
-     * @var
+     * @var bool
+     */
+    public $useEmailAsDefaultText = true;
+
+    /**
+     * @var string
      */
     public $email;
 
@@ -49,6 +54,18 @@ public static function displayName(): string
         return Link::t('Email');
     }
 
+    /**
+     * @return string|null
+     */
+    public function getText()
+    {
+        if ($this->allowText && $this->overrideText !== null) {
+            return $this->overrideText;
+        }
+
+        return $this->useEmailAsDefaultText ? $this->email : null;
+    }
+
     /**
      * @return string
      */
@@ -65,7 +82,8 @@ public function settings(): array
         return array_merge(
             parent::settings(),
             [
-                'placeholder'
+                'placeholder',
+                'useEmailAsDefaultText'
             ]
         );
     }

diff --git a/src/types/Url.php b/src/types/Url.php
@@ -32,7 +32,12 @@ class Url extends AbstractType
     const INPUT_TEMPLATE_PATH = self::BASE_TEMPLATE_PATH . '/input';
 
     /**
-     * @var
+     * @var bool
+     */
+    public $useUrlAsDefaultText = true;
+
+    /**
+     * @var string
      */
     public $url;
 
@@ -54,17 +59,11 @@ public static function displayName(): string
      */
     public function getText()
     {
-        if ($this->allowText) {
-            if ($this->overrideText !== null) {
-                return $this->overrideText;
-            }
-
-            if (!$this->requireText) {
-                return null;
-            }
+        if ($this->allowText && $this->overrideText !== null) {
+            return $this->overrideText;
         }
 
-        return $this->getUrl();
+        return $this->useUrlAsDefaultText ? $this->getUrl() : null;
     }
 
     /**
@@ -83,7 +82,8 @@ public function settings(): array
         return array_merge(
             parent::settings(),
             [
-                'placeholder'
+                'placeholder',
+                'useUrlAsDefaultText'
             ]
         );
     }