summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorArtur <artur@vaadin.com>2017-02-01 16:49:16 +0200
committerPekka Hyvönen <pekka@vaadin.com>2017-02-01 16:49:16 +0200
commit697cfcf3d1720022d3b8ea1380ba76b50b2f8e3f (patch)
tree559f8dc6123fbb7999d5a8129267c1134d93075e /server
parent32c3c84e8476955792d0e08965ccdd006d8f3a18 (diff)
downloadvaadin-framework-697cfcf3d1720022d3b8ea1380ba76b50b2f8e3f.tar.gz
vaadin-framework-697cfcf3d1720022d3b8ea1380ba76b50b2f8e3f.zip
Call "destroy" instead of "destory" in JavaScriptRenders (#8263)
* Call "destroy" instead of "destory" in JavaScriptRenders For backwards compatibility, calls "destory" if no "destroy" exists Fixes #8162 * Merge branch '7.7' into _js-renderer-destory * Merge branch '7.7' into _js-renderer-destory * Merge branch '7.7' into _js-renderer-destory * Merge branch '7.7' into _js-renderer-destory * Merge branch '7.7' into _js-renderer-destory
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
index e196d861c1..c13e303212 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
@@ -71,7 +71,7 @@ import elemental.json.JsonValue;
* <li><code>init(cell)</code> - Prepares a cell for rendering. Corresponds to
* {@link com.vaadin.client.renderers.ComplexRenderer#init(com.vaadin.client.widget.grid.RendererCellReference)}
* .</li>
- * <li><code>destory(cell)</code> - Allows the renderer to release resources
+ * <li><code>destroy(cell)</code> - Allows the renderer to release resources
* allocate for a cell that will no longer be used. Corresponds to
* {@link com.vaadin.client.renderers.ComplexRenderer#destroy(com.vaadin.client.widget.grid.RendererCellReference)}
* .</li>