import java.util.ArrayList;
import java.util.Collection;
+import java.util.logging.Logger;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArrayString;
"JavaScriptRenderer " + helper.getInitFunctionName()
+ " must have a function named 'render'");
}
+ if (hasFunction("destory")) {
+ getLogger().severe("Your JavaScript connector ("
+ + helper.getInitFunctionName()
+ + ") has a typo. The destory method should be renamed to destroy.");
+ }
final boolean hasInit = hasFunction("init");
- final boolean hasDestroy = hasFunction("destroy");
+ final boolean hasDestroy = hasFunction("destroy")
+ || hasFunction("destory");
final boolean hasOnActivate = hasFunction("onActivate");
final boolean hasGetConsumedEvents = hasFunction("getConsumedEvents");
final boolean hasOnBrowserEvent = hasFunction("onBrowserEvent");
@Override
public void destroy(RendererCellReference cell) {
if (hasDestroy) {
- destory(helper.getConnectorWrapper(), getJsCell(cell));
+ destroy(helper.getConnectorWrapper(), getJsCell(cell));
} else {
super.destroy(cell);
}
}
- private native void destory(JavaScriptObject wrapper,
+ private native void destroy(JavaScriptObject wrapper,
JavaScriptObject cell)
/*-{
- wrapper.destory(cell);
+ if (wrapper.destroy) {
+ wrapper.destroy(cell);
+ } else {
+ wrapper.destory(cell);
+ }
}-*/;
@Override
};
}
+ private Logger getLogger() {
+ return Logger.getLogger(JavaScriptRendererConnector.class.getName());
+ }
+
@Override
public Object decode(JsonValue value) {
// Let the js logic decode the raw json that the server sent
* <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>
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Grid;
+import com.vaadin.ui.Label;
public class JavaScriptRenderers extends AbstractTestUI {
+ private Grid grid;
+
public static class MyBean {
private int integer;
private String string;
@Override
protected void setup(VaadinRequest request) {
- IndexedContainer container = new IndexedContainer();
+ final IndexedContainer container = new IndexedContainer();
container.addContainerProperty("id", Integer.class, Integer.valueOf(0));
container.addContainerProperty("bean", MyBean.class, null);
container.addContainerProperty("string", String.class, "");
+ container.addContainerProperty("string2", String.class, "");
for (int i = 0; i < 1000; i++) {
Integer itemId = Integer.valueOf(i);
.setValue(new MyBean(i + 1, Integer.toString(i - 1)));
item.getItemProperty("string").setValue("string" + i);
}
+ Label clientLog = new Label();
+ clientLog.setId("clientLog");
+ addComponent(clientLog);
+ grid = createGrid(container);
+ addComponent(grid);
+
+ addComponent(new Button("Recreate grid", new ClickListener() {
+
+ @Override
+ public void buttonClick(ClickEvent event) {
+ Grid newGrid = createGrid(container);
+ replaceComponent(grid, newGrid);
+ grid = newGrid;
+ }
+ }));
+ }
+
+ private Grid createGrid(IndexedContainer container) {
Grid grid = new Grid(container);
grid.getColumn("bean").setRenderer(new MyBeanJSRenderer());
grid.getColumn("bean").setWidth(250);
grid.getColumn("string").setRenderer(new JavaScriptStringRenderer());
-
- addComponent(grid);
+ grid.getColumn("string2")
+ .setRenderer(new JavaScriptStringRendererWithDestoryMethod());
+ return grid;
}
}
--- /dev/null
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.annotations.JavaScript;
+import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
+
+@JavaScript("JavaScriptStringRendererWithDestoryMethod.js")
+public class JavaScriptStringRendererWithDestoryMethod
+ extends AbstractJavaScriptRenderer<String> {
+
+ protected JavaScriptStringRendererWithDestoryMethod() {
+ super(String.class);
+ }
+
+}
// This one is for IE8
cell.element.innerText = data;
}
+
+ this.destroy = function(cell) {
+ document.getElementById("clientLog").innerHTML += "destroy: "+cell.rowIndex+"/"+cell.columnIndex+"<br>";
+ }
+
}
\ No newline at end of file
--- /dev/null
+com_vaadin_tests_components_grid_JavaScriptStringRendererWithDestoryMethod = function() {
+ this.render = function(cell, data) {
+ cell.element.textContent = data;
+ // This one is for IE8
+ cell.element.innerText = data;
+ }
+
+ this.destory = function(cell) {
+ document.getElementById("clientLog").innerHTML += "destory: "+cell.rowIndex+"/"+cell.columnIndex+"<br>";
+ }
+
+}
\ No newline at end of file
import org.junit.Assert;
import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
Assert.assertTrue(
cell_1_1.getText().startsWith("Clicked 1 with key 2 at"));
}
+
+ @Test
+ public void testJavaScriptRendererDestroy() {
+ openTestURL("debug");
+ waitForDebugMessage(
+ "Your JavaScript connector (com_vaadin_tests_components_grid_JavaScriptStringRendererWithDestoryMethod) has a typo. The destory method should be renamed to destroy.");
+
+ $(ButtonElement.class).first().click();
+
+ WebElement log = findElement(By.id("clientLog"));
+ String text = log.getText();
+ Assert.assertTrue(text.contains("destory: 19/3"));
+ Assert.assertTrue(text.contains("destroy: 19/2"));
+ Assert.assertTrue(text.contains("destroy: 0/2"));
+ Assert.assertTrue(text.contains("destory: 0/3"));
+ }
+
}
projects / vaadin-framework.git / commitdiff