-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for event listeners in template elements
- Loading branch information
Showing
11 changed files
with
244 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...-context/src/main/java/com/vaadin/hummingbird/uitest/ui/TemplateComponentMappingView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2000-2016 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.hummingbird.uitest.ui; | ||
|
|
||
| import com.vaadin.annotations.Id; | ||
| import com.vaadin.hummingbird.dom.Element; | ||
| import com.vaadin.hummingbird.html.Button; | ||
| import com.vaadin.hummingbird.html.Div; | ||
| import com.vaadin.hummingbird.html.Span; | ||
| import com.vaadin.ui.Template; | ||
|
|
||
| public class TemplateComponentMappingView extends Template { | ||
|
|
||
| static final String LOG_ID = "log"; | ||
|
|
||
| static final String BUTTON_ID = "button"; | ||
|
|
||
| static final String SPAN_ID = "span"; | ||
|
|
||
| static final String INPUT_ID = "input"; | ||
|
|
||
| @Id(LOG_ID) | ||
| private Div log; | ||
| @Id(SPAN_ID) | ||
| private Span span; | ||
| @Id(BUTTON_ID) | ||
| private Button button; | ||
|
|
||
| public TemplateComponentMappingView() { | ||
| span.getElement().addEventListener("click", | ||
| e -> logClick(e.getSource())); | ||
| button.addClickListener(e -> { | ||
| logClick(e.getSource().getElement()); | ||
| }); | ||
| } | ||
|
|
||
| private void logClick(Element source) { | ||
| log(source.getAttribute("id") + " was clicked"); | ||
| } | ||
|
|
||
| private void log(String message) { | ||
| getUI().get().getPage().executeJavaScript("log($0);", | ||
| "server: " + message); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...ext/src/main/resources/com/vaadin/hummingbird/uitest/ui/TemplateComponentMappingView.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <div> | ||
| <script> | ||
| var log = function(msg) { | ||
| var d = document.createElement('div'); | ||
| d.innerText = msg; | ||
| document.getElementById("log").insertBefore(d, null); | ||
| } | ||
| var logClick = function(element) { | ||
| log('client: ' + element.id + ' was clicked'); | ||
| } | ||
| </script> | ||
| <div>Main page</div> | ||
| <span id="span" (click)="logClick($event.target);">Span</span> | ||
| <button id="button" (click)="logClick($event.target);">Button</button> | ||
| <hr /> | ||
| <div id="log"></div> | ||
| </div> |
48 changes: 48 additions & 0 deletions
48
...ot-context/src/test/java/com/vaadin/hummingbird/uitest/ui/TemplateComponentMappingIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2000-2016 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.hummingbird.uitest.ui; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.openqa.selenium.By; | ||
| import org.openqa.selenium.WebElement; | ||
|
|
||
| import com.vaadin.hummingbird.testutil.PhantomJSTest; | ||
|
|
||
| public class TemplateComponentMappingIT extends PhantomJSTest { | ||
|
|
||
| @Test | ||
| public void eventHandler() { | ||
| open(); | ||
| WebElement button = findElement( | ||
| By.id(TemplateComponentMappingView.BUTTON_ID)); | ||
| button.click(); | ||
| Assert.assertEquals("client: button was clicked\n" // | ||
| + "" + "server: button was clicked", getLog()); | ||
| WebElement span = findElement( | ||
| By.id(TemplateComponentMappingView.SPAN_ID)); | ||
| span.click(); | ||
| Assert.assertEquals("client: button was clicked\n" // | ||
| + "" + "server: button was clicked\n" // | ||
| + "client: span was clicked\n" // | ||
| + "server: span was clicked", getLog()); | ||
| } | ||
|
|
||
| private String getLog() { | ||
| return findElement(By.id(TemplateComponentMappingView.LOG_ID)) | ||
| .getText(); | ||
| } | ||
| } |