summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelmot <elmot@vaadin.com>2015-12-01 19:29:35 +0200
committerIlia Motornyi <elmot@vaadin.com>2015-12-03 14:55:55 +0000
commit462888ade7ba9757c72f2276007c7e80cc965b18 (patch)
tree3b884010ffdc8ba259c7a667998b2153c0b08d36
parent71fe8b49d0e5411ff37eef8101487c3f994b64de (diff)
downloadvaadin-framework-462888ade7ba9757c72f2276007c7e80cc965b18.tar.gz
vaadin-framework-462888ade7ba9757c72f2276007c7e80cc965b18.zip
BoV 7.6 update - misc changes(#19318)
Change-Id: I5c85594ea3691b0e3a5b0e3021c47bc446cbfad9
-rw-r--r--documentation/advanced/advanced-push.asciidoc14
-rw-r--r--documentation/application/application-errors.asciidoc7
-rw-r--r--documentation/layout/layout-sub-window.asciidoc5
3 files changed, 24 insertions, 2 deletions
diff --git a/documentation/advanced/advanced-push.asciidoc b/documentation/advanced/advanced-push.asciidoc
index df9279c6bb..f81900ce3b 100644
--- a/documentation/advanced/advanced-push.asciidoc
+++ b/documentation/advanced/advanced-push.asciidoc
@@ -81,13 +81,16 @@ To enable server push, you need to define the push mode either in the deployment
descriptor or with the [classname]#@Push# annotation for the UI.
[[advanced.push.enabling.pushmode]]
-=== Push Modes
+=== Push Modes and Transports
You can use server push in two modes: [literal]#++automatic++# and
[literal]#++manual++#. The automatic mode pushes changes to the browser
automatically after access() finishes. With the manual mode, you can do the push
explicitly with [methodname]#push()#, which allows more flexibility.
+Sever push can use several transports - WebSockets, long polling, or combined WebSockets+XHR.
+Default is [literal]#++WebSockets++#.
+
[[advanced.push.enabling.pushmode]]
=== The [classname]#@Push# annotation
@@ -112,6 +115,15 @@ parameter as follows:
public class PushyUI extends UI {
----
+To use the long polling transport, you need to set the [parameter]#Transport.LONG_POLLING#
+parameter as follows:
+
+
+[source, java]
+----
+@Push(transport=Transport.LONG_POLLING)
+public class PushyUI extends UI {
+----
[[advanced.push.enabling.servlet]]
=== Servlet Configuration
diff --git a/documentation/application/application-errors.asciidoc b/documentation/application/application-errors.asciidoc
index a6d873e8cf..22f962a07c 100644
--- a/documentation/application/application-errors.asciidoc
+++ b/documentation/application/application-errors.asciidoc
@@ -31,6 +31,13 @@ The result is shown in <<figure.application.errors.error-indicator>>.
.Error Indicator Active
image::img/errorindicator-example2.png[]
+[[application.errors.reconnect]]
+== Connection Fault
+
+If the connection to the server is lost, Vaadin application shows a "lost connection" notification
+and tries to restore the connection. After several retries, an error message is shown.
+You can customize the messages, timeouts and the number of reconnect attempts using [classname]#ReconnectDialogConfiguration#
+class. Use [methodname]#getReconnectDialogConfiguration# of your [classname]#UI# object.
ifdef::web[]
[[application.errors.systemmessages]]
diff --git a/documentation/layout/layout-sub-window.asciidoc b/documentation/layout/layout-sub-window.asciidoc
index 09ec09ead0..fdff68541e 100644
--- a/documentation/layout/layout-sub-window.asciidoc
+++ b/documentation/layout/layout-sub-window.asciidoc
@@ -63,7 +63,10 @@ content.
The user can close a sub-window by clicking the close button in the upper-right
corner of the window. The button is controlled by the __closable__ property, so
-you can disable it with [methodname]#setClosable(false)#.
+you can disable it with [methodname]#setClosable(false)#. You can also use keyboard
+shortcuts for closing a sub-window. You can manage the shortcuts with the [methodname]#addCloseShortcut()#,
+[methodname]#removeCloseShortcut()#, [methodname]#removeAllCloseShortcuts()#,
+[methodname]#hasCloseShortcut()# and [methodname]#getCloseShortcuts()# methods.
You close a sub-window also programmatically by calling the
[methodname]#close()# for the sub-window, typically in a click listener for an