Fixed WFormWidget placeholder not updating on locale change

src/Wt/WFormWidget.C

@@ -13,10 +13,6 @@
 #include "DomElement.h"
 #include "WebUtils.h"
 
-#ifndef WT_DEBUG_JS
-#include "js/WFormWidget.min.js"
-#endif
-
 namespace Wt {
 
 const char *WFormWidget::CHANGE_SIGNAL = "M_change";
@@ -81,69 +77,14 @@ bool WFormWidget::isReadOnly() const
 
 void WFormWidget::setPlaceholderText(const WString& placeholderText)
 {
-  emptyText_ = placeholderText;
-
-  WApplication* app = WApplication::instance();
-  const WEnvironment& env = app->environment();
-  if (!env.agentIsIElt(10) &&
-    (domElementType() == DomElementType::INPUT || domElementType() == DomElementType::TEXTAREA)) {
-    flags_.set(BIT_PLACEHOLDER_CHANGED);
-    repaint();
-  } else {
-    if (env.ajax()) {
-      if (!emptyText_.empty()) {
-        if (!flags_.test(BIT_JS_OBJECT))
-          defineJavaScript();
-        else
-          updateEmptyText();
-
-        if (!removeEmptyText_) {
-          removeEmptyText_.reset(new JSlot(this));
-
-          focussed().connect(*removeEmptyText_);
-          blurred().connect(*removeEmptyText_);
-          keyWentDown().connect(*removeEmptyText_);
-
-          std::string jsFunction =
-            "function(obj, event) {"
-            """" + jsRef() + ".wtObj.applyEmptyText();"
-            "}";
-          removeEmptyText_->setJavaScript(jsFunction);
-        }
-      } else {
-        removeEmptyText_.reset();
-      }
-    } else {
-      setToolTip(placeholderText);
-    }
-  }
-}
-
-void WFormWidget::defineJavaScript(bool force)
-{
-  if (force || !flags_.test(BIT_JS_OBJECT)) {
-    flags_.set(BIT_JS_OBJECT);
-
-    if (!isRendered())
-      return;
-
-    WApplication *app = WApplication::instance();
-
-    LOAD_JAVASCRIPT(app, "js/WFormWidget.js", "WFormWidget", wtjs1);
-
-    setJavaScriptMember(" WFormWidget", "new " WT_CLASS ".WFormWidget("
-                        + app->javaScriptClass() + ","
-                        + jsRef() + ","
-                        + emptyText_.jsStringLiteral() + ");");
-  }
+  placeholderText_ = placeholderText;
+  flags_.set(BIT_PLACEHOLDER_CHANGED);
+  repaint();
 }
 
 void WFormWidget::render(WFlags<RenderFlag> flags)
 {
   if (flags.test(RenderFlag::Full)) {
-    if (flags_.test(BIT_JS_OBJECT))
-      defineJavaScript(true);
-
     if (validator()) {
       WValidator::Result result = validator()->validate(valueText());
       WApplication::instance()->theme()
@@ -155,39 +96,14 @@ void WFormWidget::render(WFlags<RenderFlag> flags)
   WInteractWidget::render(flags);
 }
 
-void WFormWidget::updateEmptyText()
-{
-  WApplication *app = WApplication::instance();
-  const WEnvironment &env = app->environment();
-  if (env.agentIsIElt(10) && isRendered())
-    doJavaScript(jsRef() + ".wtObj"
-                 ".setEmptyText(" + emptyText_.jsStringLiteral() + ");");
-}
-
-void WFormWidget::applyEmptyText()
-{
-  WApplication *app = WApplication::instance();
-  const WEnvironment &env = app->environment();
-  if (env.agentIsIElt(10) && isRendered() && !emptyText_.empty())
-    doJavaScript(jsRef() + ".wtObj.applyEmptyText();");
-}
-
 void WFormWidget::refresh()
 {
-  if (emptyText_.refresh())
-    updateEmptyText();
-
-  WInteractWidget::refresh();
-}
-
-void WFormWidget::enableAjax()
-{
-  if (!emptyText_.empty() && toolTip() == emptyText_) {
-    setToolTip("");
-    setPlaceholderText(emptyText_);
+  if (placeholderText_.refresh()) {
+    flags_.set(BIT_PLACEHOLDER_CHANGED);
+    repaint();
   }
 
-  WInteractWidget::enableAjax();
+  WInteractWidget::refresh();
 }
 
 void WFormWidget::validatorChanged()
@@ -249,13 +165,6 @@ void WFormWidget::updateDom(DomElement& element, bool all)
     if (!all || !isEnabled())
       element.setProperty(Wt::Property::Disabled,
                           isEnabled() ? "false" : "true");
-
-    if (!all && isEnabled() && env.agentIsIE()) {
-      /*
-       * FIXME: implement a workaround for IE, reenabling a checkbox makes
-       * the input box loose interactivity.
-       */
-    }
     flags_.reset(BIT_ENABLED_CHANGED);
   }
 
@@ -267,8 +176,8 @@ void WFormWidget::updateDom(DomElement& element, bool all)
   }
 
   if (flags_.test(BIT_PLACEHOLDER_CHANGED) || all) {
-    if (!all || !emptyText_.empty())
-      element.setProperty(Wt::Property::Placeholder, emptyText_.toUTF8());
+    if (!all || !placeholderText_.empty())
+      element.setProperty(Wt::Property::Placeholder, placeholderText_.toUTF8());
     flags_.reset(BIT_PLACEHOLDER_CHANGED);
   }
 

src/Wt/WFormWidget.h

@@ -116,18 +116,6 @@ class WT_API WFormWidget : public WInteractWidget
    */
   bool isReadOnly() const;
 
-  /*! \brief Sets the placeholder text.
-   *
-   * This sets the text that is shown when the field is empty.
-   */
-  virtual void setPlaceholderText(const WString& placeholder);
-
-  /*! \brief Returns the placeholder text.
-   *
-   * \sa setPlaceholderText()
-   */
-  const WString& placeholderText() const { return emptyText_; }
-
   /*! \brief %Signal emitted when the value was changed.
    *
    * For a keyboard input, the signal is only emitted when the focus is lost
@@ -154,15 +142,23 @@ class WT_API WFormWidget : public WInteractWidget
 protected:
   WLabel *label_;
   std::shared_ptr<WValidator> validator_;
-  std::unique_ptr<JSlot> validateJs_, filterInput_, removeEmptyText_;
-  WString emptyText_;
+  std::unique_ptr<JSlot> validateJs_, filterInput_;
+  WString placeholderText_;
 
   // also used in WAbstractToggleButton
   static const char *CHANGE_SIGNAL;
 
-  void applyEmptyText();
+  /*! \brief Sets the placeholder text.
+   *
+   * This sets the text that is shown when the field is empty.
+   */
+  virtual void setPlaceholderText(const WString& placeholder);
 
-  virtual void enableAjax() override;
+  /*! \brief Returns the placeholder text.
+   *
+   * \sa setPlaceholderText()
+   */
+  const WString& placeholderText() const { return placeholderText_; }
 
   /*! \internal
    * \brief Called whenever the validator is changed
@@ -181,19 +177,15 @@ class WT_API WFormWidget : public WInteractWidget
   static const int BIT_ENABLED_CHANGED  = 0;
   static const int BIT_READONLY         = 1;
   static const int BIT_READONLY_CHANGED = 2;
-  static const int BIT_JS_OBJECT        = 3;
-  static const int BIT_VALIDATION_CHANGED = 4;
-  static const int BIT_PLACEHOLDER_CHANGED = 5;
+  static const int BIT_VALIDATION_CHANGED = 3;
+  static const int BIT_PLACEHOLDER_CHANGED = 4;
 
-  std::bitset<6> flags_;
+  std::bitset<5> flags_;
   Signal<WValidator::Result> validated_;
   WString validationToolTip_;
 
   void setLabel(WLabel *label);
 
-  void defineJavaScript(bool force = false);
-  void updateEmptyText();
-
 protected:
   virtual void updateDom(DomElement& element, bool all) override;
   virtual void propagateRenderOk(bool deep) override;

src/Wt/WInPlaceEdit.C

@@ -103,16 +103,14 @@ void WInPlaceEdit::setText(const WString& text)
 
 void WInPlaceEdit::setPlaceholderText(const WString& text)
 {
-  placeholderText_ = text;
-
   edit_->setPlaceholderText(text);
   if (empty_)
     text_->setText(text);
 }
 
 const WString& WInPlaceEdit::placeholderText() const
 {
-  return placeholderText_;
+  return edit_->placeholderText();
 }
 
 void WInPlaceEdit::save()

src/Wt/WInPlaceEdit.h

@@ -166,7 +166,6 @@ class WT_API WInPlaceEdit : public WCompositeWidget
   WText *text_;
   WLineEdit *edit_;
   WPushButton *save_, *cancel_;
-  WString placeholderText_;
   Wt::Signals::connection c2_;
   bool empty_;
 };

src/Wt/WLineEdit.C

@@ -70,8 +70,6 @@ void WLineEdit::setText(const WT_USTRING& text)
     repaint();
 
     validate();
-
-    applyEmptyText();
   }
 }
 

src/Wt/WLineEdit.h

@@ -114,6 +114,18 @@ class WT_API WLineEdit : public WFormWidget
    */
   const WT_USTRING& text() const { return content_; }
 
+  /*! \brief Sets the placeholder text.
+   *
+   * This sets the text that is shown when the field is empty.
+   */
+  using WFormWidget::setPlaceholderText;
+
+  /*! \brief Returns the placeholder text.
+   *
+   * \sa setPlaceholderText()
+   */
+  using WFormWidget::placeholderText;
+
   /*! \brief Returns the displayed text.
    *
    * If echoMode() is set to Normal, and no input mask is defined, this returns the same as

src/Wt/WTextArea.C

@@ -43,8 +43,6 @@ void WTextArea::setText(const WT_USTRING& text)
   repaint();
 
   validate();
-
-  applyEmptyText();
 }
 
 void WTextArea::setColumns(int columns)

src/Wt/WTextArea.h

@@ -88,6 +88,18 @@ class WT_API WTextArea : public WFormWidget
    */
   virtual void setText(const WT_USTRING& text);
 
+  /*! \brief Sets the placeholder text.
+   *
+   * This sets the text that is shown when the field is empty.
+   */
+  using WFormWidget::setPlaceholderText;
+
+  /*! \brief Returns the placeholder text.
+   *
+   * \sa setPlaceholderText()
+   */
+  using WFormWidget::placeholderText;
+
   /*! \brief Returns the current selection start.
    *
    * Returns -1 if there is no selected text.