|
|
@@ -702,13 +702,13 @@ public class Escalator extends Widget |
|
|
|
/*-{ |
|
|
|
var vScroll = esc.@com.vaadin.client.widgets.Escalator::verticalScrollbar; |
|
|
|
var vScrollElem = vScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()(); |
|
|
|
|
|
|
|
|
|
|
|
var hScroll = esc.@com.vaadin.client.widgets.Escalator::horizontalScrollbar; |
|
|
|
var hScrollElem = hScroll.@com.vaadin.client.widget.escalator.ScrollbarBundle::getElement()(); |
|
|
|
|
|
|
|
|
|
|
|
return $entry(function(e) { |
|
|
|
var target = e.target; |
|
|
|
|
|
|
|
|
|
|
|
// in case the scroll event was native (i.e. scrollbars were dragged, or |
|
|
|
// the scrollTop/Left was manually modified), the bundles have old cache |
|
|
|
// values. We need to make sure that the caches are kept up to date. |
|
|
@@ -729,29 +729,29 @@ public class Escalator extends Widget |
|
|
|
return $entry(function(e) { |
|
|
|
var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX; |
|
|
|
var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY; |
|
|
|
|
|
|
|
|
|
|
|
// Delta mode 0 is in pixels; we don't need to do anything... |
|
|
|
|
|
|
|
|
|
|
|
// A delta mode of 1 means we're scrolling by lines instead of pixels |
|
|
|
// We need to scale the number of lines by the default line height |
|
|
|
if(e.deltaMode === 1) { |
|
|
|
var brc = esc.@com.vaadin.client.widgets.Escalator::body; |
|
|
|
deltaY *= brc.@com.vaadin.client.widgets.Escalator.AbstractRowContainer::getDefaultRowHeight()(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Other delta modes aren't supported |
|
|
|
if((e.deltaMode !== undefined) && (e.deltaMode >= 2 || e.deltaMode < 0)) { |
|
|
|
var msg = "Unsupported wheel delta mode \"" + e.deltaMode + "\""; |
|
|
|
|
|
|
|
|
|
|
|
// Print warning message |
|
|
|
esc.@com.vaadin.client.widgets.Escalator::logWarning(*)(msg); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// IE8 has only delta y |
|
|
|
if (isNaN(deltaY)) { |
|
|
|
deltaY = -0.5*e.wheelDelta; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@com.vaadin.client.widgets.Escalator.JsniUtil::moveScrollFromEvent(*)(esc, deltaX, deltaY, e); |
|
|
|
}); |
|
|
|
}-*/; |
|
|
@@ -6461,7 +6461,6 @@ public class Escalator extends Widget |
|
|
|
* @see #setHeightMode(HeightMode) |
|
|
|
*/ |
|
|
|
public void setHeightByRows(double rows) throws IllegalArgumentException { |
|
|
|
getLogger().warning("HeightByRows: " + rows); |
|
|
|
if (rows <= 0) { |
|
|
|
throw new IllegalArgumentException( |
|
|
|
"The number of rows must be a positive number."); |