Parcourir la source

Remove unnecessary logging from setHeightByRows in Escalator

tags/8.1.0.alpha7
Teemu Suo-Anttila il y a 7 ans
Parent
révision
b5b7bb7021
1 fichiers modifiés avec 9 ajouts et 10 suppressions
  1. 9
    10
      client/src/main/java/com/vaadin/client/widgets/Escalator.java

+ 9
- 10
client/src/main/java/com/vaadin/client/widgets/Escalator.java Voir le fichier

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

Chargement…
Annuler
Enregistrer