diff options
6 files changed, 49 insertions, 49 deletions
diff --git a/client/src/main/java/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java index 0197c4f3f8..cf54a045f8 100644 --- a/client/src/main/java/com/vaadin/client/BrowserInfo.java +++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java @@ -112,10 +112,10 @@ public class BrowserInfo { private native int getIEDocumentMode() /*-{ - var mode = $wnd.document.documentMode; - if (!mode) - return -1; - return mode; + var mode = $wnd.document.documentMode; + if (!mode) + return -1; + return mode; }-*/; /** @@ -353,17 +353,17 @@ public class BrowserInfo { public static native String getBrowserString() /*-{ - return $wnd.navigator.userAgent; + return $wnd.navigator.userAgent; }-*/; public native int getScreenWidth() /*-{ - return $wnd.screen.width; + return $wnd.screen.width; }-*/; public native int getScreenHeight() /*-{ - return $wnd.screen.height; + return $wnd.screen.height; }-*/; /** diff --git a/client/src/main/java/com/vaadin/client/ui/VButton.java b/client/src/main/java/com/vaadin/client/ui/VButton.java index 611eb692cc..0e738032b5 100644 --- a/client/src/main/java/com/vaadin/client/ui/VButton.java +++ b/client/src/main/java/com/vaadin/client/ui/VButton.java @@ -434,8 +434,8 @@ public class VButton extends FocusWidget implements ClickHandler { /*-{ // THIS METHOD IS ONLY USED FOR INTERNET EXPLORER, IT DOESN'T WORK WITH OTHERS - var convertToPixel = function(elem, value) { - // From the awesome hack by Dean Edwards + var convertToPixel = function(elem, value) { + // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 // Remember the original values @@ -451,9 +451,9 @@ public class VButton extends FocusWidget implements ClickHandler { elem.runtimeStyle.left = rsLeft; return ret; - } + } - var ret = 0; + var ret = 0; var sides = ["Right","Left"]; for(var i=0; i<2; i++) { @@ -478,7 +478,7 @@ public class VButton extends FocusWidget implements ClickHandler { } } - return ret; + return ret; }-*/; } diff --git a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java index 22fd53d0a1..b12690dbff 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java +++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java @@ -232,7 +232,7 @@ public class VCustomLayout extends ComplexPanel { public static native void eval(String script) /*-{ try { - if (script != null) + if (script != null) eval("{ var document = $doc; var window = $wnd; "+ script + "}"); } catch (e) { } @@ -397,15 +397,15 @@ public class VCustomLayout extends ComplexPanel { private native void detachResizedFunction(Element element) /*-{ - element.notifyChildrenOfSizeChange = null; + element.notifyChildrenOfSizeChange = null; }-*/; private native void publishResizedFunction(Element element) /*-{ - var self = this; - element.notifyChildrenOfSizeChange = $entry(function() { - self.@com.vaadin.client.ui.VCustomLayout::notifyChildrenOfSizeChange()(); - }); + var self = this; + element.notifyChildrenOfSizeChange = $entry(function() { + self.@com.vaadin.client.ui.VCustomLayout::notifyChildrenOfSizeChange()(); + }); }-*/; /** @@ -427,16 +427,16 @@ public class VCustomLayout extends ComplexPanel { */ public native boolean iLayoutJS(com.google.gwt.user.client.Element el) /*-{ - if(el && el.iLayoutJS) { - try { - el.iLayoutJS(); - return true; - } catch (e) { - return false; - } - } else { - return false; - } + if(el && el.iLayoutJS) { + try { + el.iLayoutJS(); + return true; + } catch (e) { + return false; + } + } else { + return false; + } }-*/; @Override diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java index 8f62fc7525..e657eeeed7 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendar.java @@ -365,13 +365,13 @@ public class VCalendar extends Composite implements VHasDropHandler { */ private native void blockSelect(Element e) /*-{ - e.onselectstart = function() { - return false; - } + e.onselectstart = function() { + return false; + } - e.ondragstart = function() { - return false; - } + e.ondragstart = function() { + return false; + } }-*/; private void updateEventsToWeekGrid(CalendarEvent[] events) { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VDateField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VDateField.java index 23ad279b66..5bb07f45ef 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VDateField.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VDateField.java @@ -99,19 +99,19 @@ public class VDateField extends FlowPanel implements Field, HasEnabled { int s, int ms) /*-{ try { - var date = new Date(2000,1,1,1); // don't use current date here - if(y && y >= 0) date.setFullYear(y); - if(m && m >= 1) date.setMonth(m-1); - if(d && d >= 0) date.setDate(d); - if(h >= 0) date.setHours(h); - if(mi >= 0) date.setMinutes(mi); - if(s >= 0) date.setSeconds(s); - if(ms >= 0) date.setMilliseconds(ms); - return date.getTime(); + var date = new Date(2000,1,1,1); // don't use current date here + if(y && y >= 0) date.setFullYear(y); + if(m && m >= 1) date.setMonth(m-1); + if(d && d >= 0) date.setDate(d); + if(h >= 0) date.setHours(h); + if(mi >= 0) date.setMinutes(mi); + if(s >= 0) date.setSeconds(s); + if(ms >= 0) date.setMilliseconds(ms); + return date.getTime(); } catch (e) { - // TODO print some error message on the console - //console.log(e); - return (new Date()).getTime(); + // TODO print some error message on the console + //console.log(e); + return (new Date()).getTime(); } }-*/; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java index 088f1447a8..6e76ba589e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java @@ -267,7 +267,7 @@ public class GridSortingTest extends GridBasicFeaturesTest { sendKey(Keys.ENTER); releaseKey(Keys.SHIFT); assertColumnsAreSortedAs(getSortInfo(1, SortDirection.ASCENDING), - getSortInfo(2, SortDirection.ASCENDING)); + getSortInfo(2, SortDirection.ASCENDING)); // Move to next column sendKey(Keys.RIGHT); @@ -277,7 +277,7 @@ public class GridSortingTest extends GridBasicFeaturesTest { sendKey(Keys.ENTER); releaseKey(Keys.SHIFT); assertColumnsAreSortedAs(getSortInfo(1, SortDirection.ASCENDING), - getSortInfo(2, SortDirection.ASCENDING), getSortInfo(3, SortDirection.ASCENDING)); + getSortInfo(2, SortDirection.ASCENDING), getSortInfo(3, SortDirection.ASCENDING)); // Move back to the second column sendKey(Keys.LEFT); @@ -287,7 +287,7 @@ public class GridSortingTest extends GridBasicFeaturesTest { sendKey(Keys.ENTER); releaseKey(Keys.SHIFT); assertColumnsAreSortedAs(getSortInfo(1, SortDirection.ASCENDING), - getSortInfo(2, SortDirection.DESCENDING), getSortInfo(3, SortDirection.ASCENDING)); + getSortInfo(2, SortDirection.DESCENDING), getSortInfo(3, SortDirection.ASCENDING)); // Move back to the third column sendKey(Keys.RIGHT); |