Merge pull request #562 from scireum/meg/placeHoldMe

Don't show placeholder in tokenfield if token is present
scireum · Jan 31, 2019 · 8274673 · 8274673
2 parents 7e79256 + c9bc9c6
commit 8274673
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/resources/default/taglib/w/autocompleteMultiSelect.html.pasta b/src/main/resources/default/taglib/w/autocompleteMultiSelect.html.pasta
@@ -21,8 +21,7 @@
 
 <div id="@id" class="multiselect">
     <w:textfield id="@apply('%s-input',id)" name="@apply('%s-input', name)" span="@span" smallSpan="@smallSpan"
-                 value="" label="@label" help="@help" adminOnly="@adminOnly" readonly="@readonly" required="@required"
-                 placeholder="@i18n('template.html.selects.selection')"/>
+                 value="" label="@label" help="@help" adminOnly="@adminOnly" readonly="@readonly" required="@required"/>
 </div>
 
 <select id="@id-suggestions-select" style="display: none" multiple="multiple">
@@ -41,6 +40,7 @@
             noMatchesText: '@i18n("template.html.selects.noMatches")',
             readonly: @readonly,
             maxItems: @maxItems,
+            placeholder: '@i18n('template.html.selects.selection')',
             allowCustomEntries: !@strict,
             serviceUri: '@serviceUri',
             type: '@type'

diff --git a/src/main/resources/default/taglib/w/multiSelect.html.pasta b/src/main/resources/default/taglib/w/multiSelect.html.pasta
@@ -19,8 +19,7 @@
 
 <div id="@id" class="multiselect">
     <w:textfield id="@apply('%s-input',id)" name="@apply('%s-input', name)" span="@span" smallSpan="@smallSpan"
-                 value="" label="@label" help="@help" adminOnly="@adminOnly" readonly="@readonly" required="@required"
-                 placeholder="@i18n('template.html.selects.selection')"/>
+                 value="" label="@label" help="@help" adminOnly="@adminOnly" readonly="@readonly" required="@required"/>
 </div>
 
 <select id="@id-suggestions-select" style="display: none" multiple="multiple">
@@ -38,6 +37,7 @@
             name: '@name',
             noMatchesText : '@i18n("template.html.selects.noMatches")',
             readonly: @readonly,
+            placeholder: '@i18n('template.html.selects.selection')',
             maxItems: @maxItems,
             allowCustomEntries: @allowCustomEntries
         });

diff --git a/src/main/resources/default/templates/wondergem/page-script.html.pasta b/src/main/resources/default/templates/wondergem/page-script.html.pasta
@@ -643,6 +643,8 @@
             } else {
                 token.label = suggestions.getTokenForValue(token.value).label;
             }
+
+            tokenfield.getTokenfieldInputField()[0].placeholder = '';
             return true;
         });
 
@@ -658,6 +660,16 @@
 
         tokenfield.appendTokens(suggestions.getInitialSelection());
 
+        if (!tokenfield.hasTokens()) {
+            tokenfield.getTokenfieldInputField()[0].placeholder = args.placeholder;
+        }
+
+        tokenfield.on('onRemovedToken', function () {
+            if (!tokenfield.hasTokens()) {
+                tokenfield.getTokenfieldInputField()[0].placeholder = args.placeholder;
+            }
+        });
+
         if (!args.readonly) {
             var noMatchesToken = {label: args.noMatchesText, type: 'basic'};