}
if (browserDetails.isChrome()) {
- touchDevice = detectChromeTouchDevice();
+ touchDevice = detectChromeTouchDevice();
} else {
- touchDevice = detectTouchDevice();
+ touchDevice = detectTouchDevice();
}
}
-
+
private native boolean detectTouchDevice()
/*-{
try { document.createEvent("TouchEvent");return true;} catch(e){return false;};
return touchDevice;
}
- /**
- * @return true if browser needs TouchScrollDelegate javascript scrolling
- * handler
- */
- public boolean requiresTouchScrollDelegate() {
- return !(isTouchDevice() && isWebkit() && getWebkitVersion() >= 534 && getBrowserString()
- .contains("Android"));
- }
-
}
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.FontWeight;
import com.google.gwt.dom.client.Style.Overflow;
+import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
height = Integer.parseInt(split[3]);
autoScrollValue = Boolean.valueOf(split[4]);
} else {
- width = 500;
- height = 500;
- top = Window.getClientHeight() - 510;
- left = Window.getClientWidth() - 510;
+ width = 400;
+ height = 150;
+ top = Window.getClientHeight() - 160;
+ left = Window.getClientWidth() - 410;
}
setPixelSize(width, height);
setPopupPosition(left, top);
actions = new HorizontalPanel();
Style style = actions.getElement().getStyle();
- // style.setPosition(Position.ABSOLUTE);
+ style.setPosition(Position.ABSOLUTE);
style.setBackgroundColor("#666");
style.setLeft(135, Unit.PX);
style.setHeight(25, Unit.PX);
private void addHMParameter() {
UrlBuilder createUrlBuilder = Location.createUrlBuilder();
createUrlBuilder.setParameter("gwt.codesvr",
- Location.getHostName() + ":9997");
+ "localhost:9997");
Location.assign(createUrlBuilder.buildString());
}
Touch touch = event.getTouches().get(0);
if (detectScrolledElement(touch)) {
- VConsole.log("<hr>TouchDelegate takes over");
+ VConsole.log("TouchDelegate takes over");
event.stopPropagation();
handlerRegistration = Event.addNativePreviewHandler(this);
activeScrollDelegate = this;
}-*/;
private void onTransitionEnd() {
- VConsole.log("transitionEnd");
if (finalScrollTop < 0) {
animateToScrollPosition(0, finalScrollTop);
finalScrollTop = 0;
private void onTouchEnd(NativeEvent event) {
if (!moved) {
- VConsole.log("TouchEnd - not moved");
activeScrollDelegate = null;
handlerRegistration.removeHandler();
handlerRegistration = null;
return;
}
- VConsole.log("TouchEnd - moved");
int currentY = origScrollTop + deltaScrollPos;
* @param translateY
*/
private void translateTo(int duration, int translateY) {
- // VConsole.log("translateTo " + duration + "ms " + translateY + "px");
for (Element el : layers) {
final Style style = el.getStyle();
if (duration > 0) {
}
public void onPreviewNativeEvent(NativePreviewEvent event) {
- VConsole.log("previewNativeEvent "
- + Integer.toHexString(event.getTypeInt()));
if (transitionOn) {
/*
* TODO allow starting new events. See issue in onTouchStart
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Document;
import com.google.gwt.event.dom.client.DomEvent.Type;
-import com.google.gwt.event.dom.client.TouchEvent;
+import com.google.gwt.event.dom.client.TouchStartEvent;
+import com.google.gwt.event.dom.client.TouchStartHandler;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.touch.client.TouchScroller;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Event;
};
private TouchScrollDelegate touchScrollDelegate;
- private TouchScroller touchScroller = new TouchScroller() {
- @Override
- protected void onTouchStart(TouchEvent<?> event) {
- if (event.getEventTarget() == contentNode) {
- super.onTouchStart(event);
- }
- }
-
- @Override
- protected void onTouchMove(TouchEvent<?> event) {
- if (event.getSource() == contentNode) {
- super.onTouchMove(event);
- }
- }
-
- @Override
- protected void onTouchEnd(TouchEvent<?> event) {
- if (event.getSource() == contentNode) {
- super.onTouchEnd(event);
- }
- }
-
- @Override
- protected void onTouchCancel(TouchEvent<?> event) {
- if (event.getSource() == contentNode) {
- super.onTouchCancel(event);
- }
- }
- };
-
public VPanel() {
super();
DivElement captionWrap = Document.get().createDivElement();
getElement().appendChild(bottomDecoration);
setStyleName(CLASSNAME);
DOM.sinkEvents(getElement(), Event.ONKEYDOWN);
- DOM.sinkEvents(contentNode, Event.ONSCROLL);
+ DOM.sinkEvents(contentNode, Event.ONSCROLL | Event.TOUCHEVENTS);
contentNode.getStyle().setProperty("position", "relative");
getElement().getStyle().setProperty("overflow", "hidden");
-
- // if (BrowserInfo.get().requiresTouchScrollDelegate()) {
- //
- // DOM.sinkEvents(contentNode, Event.TOUCHEVENTS);
- // addHandler(new TouchStartHandler() {
- // public void onTouchStart(TouchStartEvent event) {
- // getTouchScrollDelegate().onTouchStart(event);
- // }
- // }, TouchStartEvent.getType());
- // }
+ addHandler(new TouchStartHandler() {
+ public void onTouchStart(TouchStartEvent event) {
+ getTouchScrollDelegate().onTouchStart(event);
+ }
+ }, TouchStartEvent.getType());
}
/**
}
scrollBodyPanel.addKeyUpHandler(navKeyUpHandler);
- if (BrowserInfo.get().requiresTouchScrollDelegate()) {
- scrollBodyPanel.sinkEvents(Event.TOUCHEVENTS);
- scrollBodyPanel.addDomHandler(new TouchStartHandler() {
- public void onTouchStart(TouchStartEvent event) {
- getTouchScrollDelegate().onTouchStart(event);
- }
- }, TouchStartEvent.getType());
- }
+ scrollBodyPanel.sinkEvents(Event.TOUCHEVENTS);
+ scrollBodyPanel.addDomHandler(new TouchStartHandler() {
+ public void onTouchStart(TouchStartEvent event) {
+ getTouchScrollDelegate().onTouchStart(event);
+ }
+ }, TouchStartEvent.getType());
scrollBodyPanel.sinkEvents(Event.ONCONTEXTMENU);
scrollBodyPanel.addDomHandler(new ContextMenuHandler() {
VConsole.log("TOUCH CANCEL");
}
}, TouchCancelEvent.getType());
-
- if (BrowserInfo.get().requiresTouchScrollDelegate()) {
- addDomHandler(new TouchStartHandler() {
- public void onTouchStart(TouchStartEvent event) {
- Node target = event.getTouches().get(0).getTarget().cast();
- if (splitter.isOrHasChild(target)) {
- onMouseDown(Event.as(event.getNativeEvent()));
- } else {
- getTouchScrollDelegate().onTouchStart(event);
- }
+ addDomHandler(new TouchStartHandler() {
+ public void onTouchStart(TouchStartEvent event) {
+ Node target = event.getTouches().get(0).getTarget().cast();
+ if (splitter.isOrHasChild(target)) {
+ onMouseDown(Event.as(event.getNativeEvent()));
+ } else {
+ getTouchScrollDelegate().onTouchStart(event);
}
+ }
- }, TouchStartEvent.getType());
- }
+ }, TouchStartEvent.getType());
addDomHandler(new TouchMoveHandler() {
public void onTouchMove(TouchMoveEvent event) {
if (resizing) {
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.ComplexPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
import com.vaadin.terminal.gwt.client.Util;
/**
*/
public VTabsheetPanel() {
setElement(DOM.createDiv());
-
- if (BrowserInfo.get().requiresTouchScrollDelegate()) {
- sinkEvents(Event.TOUCHEVENTS);
- addDomHandler(new TouchStartHandler() {
- public void onTouchStart(TouchStartEvent event) {
- /*
- * All container elements needs to be scrollable by one
- * finger. Update the scrollable element list of touch
- * delegate on each touch start.
- */
- NodeList<Node> childNodes = getElement().getChildNodes();
- Element[] elements = new Element[childNodes.getLength()];
- for (int i = 0; i < elements.length; i++) {
- elements[i] = (Element) childNodes.getItem(i);
- }
- getTouchScrollDelegate().setElements(elements);
- getTouchScrollDelegate().onTouchStart(event);
+ sinkEvents(Event.TOUCHEVENTS);
+ addDomHandler(new TouchStartHandler() {
+ public void onTouchStart(TouchStartEvent event) {
+ /*
+ * All container elements needs to be scrollable by one finger.
+ * Update the scrollable element list of touch delegate on each
+ * touch start.
+ */
+ NodeList<Node> childNodes = getElement().getChildNodes();
+ Element[] elements = new Element[childNodes.getLength()];
+ for (int i = 0; i < elements.length; i++) {
+ elements[i] = (Element) childNodes.getItem(i);
}
- }, TouchStartEvent.getType());
- }
+ getTouchScrollDelegate().setElements(elements);
+ getTouchScrollDelegate().onTouchStart(event);
+ }
+ }, TouchStartEvent.getType());
}
protected TouchScrollDelegate getTouchScrollDelegate() {
AbstractField field = new AbstractField() {
@Override
public Class<?> getType() {
- return int.class;
+ return null;
}
@Override
};
Property property = new AbstractProperty() {
- private int value;
-
public Object getValue() {
- return value;
+ return null;
}
public void setValue(Object newValue) throws ReadOnlyException,
ConversionException {
- value = (Integer) newValue;
fireValueChange();
}
public Class<?> getType() {
- return int.class;
+ return null;
}
};
public void testAttachDetach() {
field.setPropertyDataSource(property);
- property.setValue(1);
+ property.setValue(null);
property.setReadOnly(true);
- assertEquals(1, field.getValue());
assertEquals(1, numValueChanges);
assertEquals(1, numReadOnlyChanges);
field.attach();
- property.setValue(2);
+ property.setValue(null);
property.setReadOnly(false);
- assertEquals(2, field.getValue());
assertEquals(2, numValueChanges);
assertEquals(2, numReadOnlyChanges);
field.detach();
- property.setValue(3);
+ property.setValue(null);
property.setReadOnly(true);
- assertEquals(3, field.getValue());
assertEquals(2, numValueChanges);
assertEquals(2, numReadOnlyChanges);
-
- field.attach();
- assertEquals(3, field.getValue());
- assertEquals(3, numValueChanges);
}
}
projects / vaadin-framework.git / commitdiff