some last doc/misc fixes for 3.3.3

Author: Koen Deforche

src/Wt/WAbstractItemView

@@ -491,6 +491,8 @@ public:
    *
    * The default column width is 150 pixels.
    *
+   * \note The height must be specified in WLength::Pixel units.
+   *
    * \note The actual space occupied by each column is the column width
    *       augmented by 7 pixels for internal padding and a border.
    */

src/Wt/WAbstractItemView.C

@@ -809,11 +809,21 @@ bool WAbstractItemView::internalSelect(const WModelIndex& index,
 
   if (option == ToggleSelect)
     option = isSelected(index) ? Deselect : Select;
-  else if (option == ClearAndSelect) {
+
+  if (selectionMode() == SingleSelection && option == Select)
+    option = ClearAndSelect;
+
+  if ((option == ClearAndSelect || option == Select) &&
+      selectionModel()->selection_.size() == 1 &&
+      isSelected(index))
+    return false;
+  else if (option == Deselect && !isSelected(index))
+    return false;
+
+  if (option == ClearAndSelect) {
     clearSelection();
     option = Select;
-  } else if (selectionMode() == SingleSelection && option == Select)
-    clearSelection();
+  }
 
   /*
    * now option is either Select or Deselect and we only need to do
@@ -822,8 +832,7 @@ bool WAbstractItemView::internalSelect(const WModelIndex& index,
   if (option == Select)
     selectionModel()->selection_.insert(index);
   else
-    if (!selectionModel()->selection_.erase(index))
-      return false;
+    selectionModel()->selection_.erase(index);
 
   return true;
 }
@@ -913,9 +922,10 @@ void WAbstractItemView::selectionHandleClick(const WModelIndex& index,
     }
   } else {
     if ((modifiers & (ControlModifier | MetaModifier)) &&
-	isSelected(index))
+	isSelected(index)) {
       clearSelection();
-    else
+      selectionChanged_.emit();
+    } else
       select(index, Select);
   }
 }

src/Wt/WApplication

@@ -165,7 +165,7 @@ public:
  *
  * Throughout the session, the instance is available through
  * WApplication::instance() (or through #wApp). The application may be
- * quited either using the method quit(), or because of a timeout
+ * exited either using the method quit(), or because of a timeout
  * after the user has closed the window, but not because the user does
  * not interact: keep-alive messages in the background will keep the
  * session around as long as the user has the page opened. In either
@@ -177,7 +177,7 @@ public:
  * Throughout the session, the instance is available through the
  * static method WApplication::instance(), which uses thread-specific
  * storage to keep track of the current session. The application may
- * be quited either using the method quit(), or because of a timeout
+ * be exited either using the method quit(), or because of a timeout
  * after the user has closed the window, but not because the user does
  * not interact: keep-alive messages in the background will keep the
  * session around as long as the user has the page opened.
@@ -1762,6 +1762,15 @@ public:
    */
   std::string docType() const;
 
+  /*! \brief Quits the application.
+   *
+   * This quits the application with a default restart message resolved
+   * as WString::tr("Wt.QuittedMessage").
+   *
+   * \sa quit(const WString&)
+   */
+  void quit();
+
   /*! \brief Quits the application.
    *
    * The method returns immediately, but has as effect that the
@@ -1772,28 +1781,27 @@ public:
    * pending and applied during the current event handling) will still
    * be rendered, after which the application is terminated.
    *
-   * You might want to make sure no more events can be received from
-   * the user, by not having anything clickable, for example by
-   * displaying only text. Even better is to redirect() the user to
-   * another, static, page in conjunction with %quit().
+   * If the restart message is not empty, then the user will be
+   * offered to restart the application (using the provided message)
+   * when further interacting with the application.
    *
    * \sa redirect()
    */
-  void quit();
+  void quit(const WString& restartMessage);
 
   /*! \brief Returns whether the application has quit. (<b>deprecated</b>)
    *
    * \sa quit()
    *
    * \deprecated hasQuit() is proper English
    */
-  bool isQuited() const { return quited_; }
+  bool isQuited() const { return quitted_; }
 
   /*! \brief Returns whether the application has quit.
    *
    * \sa quit()
    */
-  bool hasQuit() const { return quited_; }
+  bool hasQuit() const { return quitted_; }
 
   /*! \brief Returns the current maximum size of a request to the
    *         application.
@@ -1921,6 +1929,8 @@ public:
    */
   void setConfirmCloseMessage(const WString& message);
 
+  /*! \brief Sets the message for the user when the application was .
+   */
   void enableInternalPaths();
 
   // should we move this into an InternalPaths utility class / namespace ?
@@ -2180,7 +2190,8 @@ private:
 #endif // WT_TARGET_JAVA
   std::string            javaScriptClass_;
   AjaxMethod             ajaxMethod_;
-  bool                   quited_;
+  bool                   quitted_;
+  WString                quittedMessage_;
   std::string            onePixelGifUrl_;
   bool                   internalPathsEnabled_;
   WWidget               *exposedOnly_;

src/Wt/WApplication.C

@@ -98,7 +98,7 @@ WApplication::WApplication(const WEnvironment& env
     eventSignalPool_(new boost::pool<>(sizeof(EventSignal<>))),
 #endif // WT_CNOR
     javaScriptClass_("Wt"),
-    quited_(false),
+    quitted_(false),
     internalPathsEnabled_(false),
     exposedOnly_(0),
     loadingIndicator_(0),
@@ -673,7 +673,13 @@ std::string WApplication::resolveRelativeUrl(const std::string& url) const
 
 void WApplication::quit()
 {
-  quited_ = true;
+  quit(WString::tr("Wt.QuittedMessage"));
+}
+
+void WApplication::quit(const WString& restartMessage)
+{
+  quitted_ = true;
+  quittedMessage_ = restartMessage;
 }
 
 WWidget *WApplication::findWidget(const std::string& name)
@@ -928,7 +934,7 @@ void WApplication::refresh()
   if (domRoot2_) {
     domRoot2_->refresh();
   } else {
-    widgetRoot_->refresh();
+    domRoot_->refresh();
   }
 
   if (title_.refresh())

src/Wt/WCompositeWidget.C

@@ -218,7 +218,7 @@ bool WCompositeWidget::isVisible() const
   else if (parent())
     return parent()->isVisible();
   else
-    return true;
+    return impl_->isRendered();
 }
 
 void WCompositeWidget::setDisabled(bool disabled)

src/Wt/WTableView.C

@@ -1798,7 +1798,9 @@ void WTableView::scrollTo(const WModelIndex& index, ScrollHint hint)
       if (isRendered()) {
 	WStringStream s;
 
-	s << "setTimeout(function() { jQuery.data("
+	s << "jQuery.data("
+	  << jsRef() << ", 'obj').setScrollToPending();"
+	  << "setTimeout(function() { jQuery.data("
 	  << jsRef() << ", 'obj').scrollTo(-1, "
 	  << rowY << "," << (int)hint << "); }, 0);";
 

src/Wt/WWebWidget.C

@@ -1098,7 +1098,7 @@ bool WWebWidget::isVisible() const
     if (parent())
       return parent()->isVisible();
     else
-      return true;
+      return isRendered();
 }
 
 void WWebWidget::setDisabled(bool disabled)

src/js/WTableView.js

@@ -32,6 +32,7 @@ WT_DECLARE_WT_MEMBER
    }
 
    var scrollX1 = 0, scrollX2 = 0, scrollY1 = 0, scrollY2 = 0;
+   var scrollToPending = false;
 
    /*
     * We need to remember this for when going through a hide()
@@ -49,6 +50,7 @@ WT_DECLARE_WT_MEMBER
        return;
 
      if (contentsContainer.clientWidth && contentsContainer.clientHeight
+         && (!scrollToPending)
          && (contentsContainer.scrollTop < scrollY1
 	 || contentsContainer.scrollTop > scrollY2
 	 || contentsContainer.scrollLeft < scrollX1
@@ -205,13 +207,18 @@ WT_DECLARE_WT_MEMBER
      headerColumnsContainer.scrollTop = scrollTop;
    };
 
+   this.setScrollToPending = function() {
+     scrollToPending = true;
+   };
+
    this.scrollToPx = function(x, y) {
      scrollTop = y;
      scrollLeft = x;
      this.resetScroll();
    };
 
    this.scrollTo = function(x, y, hint) {
+     scrollToPending = false;
      if (y != -1) {
        var top = contentsContainer.scrollTop,
 	   height = contentsContainer.clientHeight;

src/js/WTableView.min.js

@@ -216,7 +216,7 @@ void WebRenderer::letReloadJS(WebResponse& response, bool newSession,
 
   // FIXME: we should foresee something independent of app->javaScriptClass()
   response.out() <<
-    "if (window.Wt) window.Wt._p_.quit(); window.location.reload(true);";
+    "if (window.Wt) window.Wt._p_.quit(null); window.location.reload(true);";
 }
 
 void WebRenderer::letReloadHTML(WebResponse& response, bool newSession)
@@ -434,7 +434,7 @@ void WebRenderer::serveError(int status, WebResponse& response,
       << '\n';
   } else {
     response.out() << app->javaScriptClass()
-		   << "._p_.quit();"
+		   << "._p_.quit(null);"
 		   << "document.title = 'Error occurred.';"
 		   << "document.body.innerHtml='<h2>Error occurred.</h2>' +"
 		   <<  WWebWidget::jsStringLiteral(message)
@@ -887,6 +887,8 @@ void WebRenderer::serveMainscript(WebResponse& response)
     script.setVar("INNER_HTML", innerHtml);
     script.setVar("ACK_UPDATE_ID", expectedAckId_);
     script.setVar("SESSION_URL", WWebWidget::jsStringLiteral(sessionUrl()));
+    script.setVar("QUITTED_STR",
+		  WString::tr("Wt.QuittedMessage").jsStringLiteral());
 
     std::string deployPath = session_.env().publicDeploymentPath_;
     if (deployPath.empty())
@@ -1111,8 +1113,10 @@ void WebRenderer::serveMainAjax(WStringStream& out)
 
   addResponseAckPuzzle(s);
 
-  if (app->isQuited())
-    s << app->javaScriptClass() << "._p_.quit();";
+  if (app->hasQuit())
+    s << app->javaScriptClass() << "._p_.quit("
+      << (app->quittedMessage_.empty() ? "null" :
+	  app->quittedMessage_.jsStringLiteral()) + ");";
 
   if (widgetset)
     app->domRoot2_->rootAsJavaScript(app, s, true);
@@ -1559,7 +1563,9 @@ void WebRenderer::collectJavaScriptUpdate(WStringStream& out)
   app->streamAfterLoadJavaScript(out);
 
   if (app->isQuited())
-    out << app->javaScriptClass() << "._p_.quit();";
+    out << app->javaScriptClass() << "._p_.quit("
+	<< (app->quittedMessage_.empty() ? "null" :
+	    app->quittedMessage_.jsStringLiteral()) + ");";
 
   if (updateLayout_) {
     out << "window.onresize();";