Merge remote-tracking branch 'origin/f9528-xToClearInput' into B9720CheckboxVariousSetups

javascript/src/Main.js

@@ -58,5 +58,28 @@ $(document).ready( function () {
             }
         });
 
+        $('.qfq-clear-me').each(function() {
+            var myInput = $(this);
+            if(!myInput.is("input,textarea")) {
+                return;
+            }
+            var closeButton = $("<span>", {
+                class: "qfq-clear-me-button hidden"
+            });
+            closeButton.on("click", function(e) {
+                myInput.val('');
+                closeButton.addClass("hidden");
+            });
+            $(this).after(closeButton);
+            $(this).on("input", function() {
+                if(myInput.val() != '') {
+                    closeButton.removeClass("hidden");
+                } else {
+                    closeButton.addClass("hidden");
+                }
+            });
+            
+        });
+
     })(QfqNS);
 });
\ No newline at end of file

less/qfq-bs.css.less

@@ -1063,7 +1063,31 @@ select.qfq-locked:invalid {
 }
 
 span.qfq-more-text {
-  display: none
+  display: none;
+}
+
+.qfq-clear-me-button {
+  display: block;
+  content: '\f00d';
+  font-family: FontAwesome;
+  right:21px;
+  width: 30px;
+  height: 30px;
+  top: 2px;
+  position:absolute;
+  cursor: pointer;
+}
+.qfq-clear-me-button:before {
+  content: '\f00d';
+  font-family: FontAwesome;
+  position: absolute;
+  color: #aaa;
+  font-size: 21px;
+  left: 12px;
+}
+
+input.qfq-clear-me {
+  padding-right: 28px;
 }
 
 // Droplets