Merge changes from origin/7.1

16d17f9 Fix native scrolling regression in iOS 6 homescreen apps (#12295)
7212e02 Fix race in VaadinService.lockSession() (#12282)
2d5a107 Update "lastRequestedFirstvisible" field value right away (#10666).
325cdf9 Disable failing calendar Actions Menu Test (#12181)
8ba4117 Split UiAccess test (#12332)

Change-Id: I30e7aaacaf0ecbdc1a6dbdf956a6e48f4846de32

9 files changed, 246 insertions, 44 deletions

diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index c32116cda8..cb3645c9d8 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -228,8 +228,8 @@ input::-ms-clear {
 	line-height: normal;
 }
 
-/* Enable kinetic scrolling on Mobile Safari 6 */ 
-.v-ios.v-sa6 & .v-scrollable { 
+/* Enable kinetic scrolling on iOS 6 */
+.v-ios6.v-webkit & .v-scrollable {
 	-webkit-overflow-scrolling: touch; 
 }
 
diff --git a/client/src/com/vaadin/client/BrowserInfo.java b/client/src/com/vaadin/client/BrowserInfo.java
index c733f38481..5d588f6f8b 100644
--- a/client/src/com/vaadin/client/BrowserInfo.java
+++ b/client/src/com/vaadin/client/BrowserInfo.java
@@ -190,7 +190,7 @@ public class BrowserInfo {
             }
             String osClass = getOperatingSystemClass();
             if (osClass != null) {
-                cssClass = cssClass + " " + prefix + osClass;
+                cssClass = cssClass + " " + osClass;
             }
             if (isTouchDevice()) {
                 cssClass = cssClass + " " + prefix + UI_TOUCH;
@@ -201,16 +201,22 @@ public class BrowserInfo {
     }
 
     private String getOperatingSystemClass() {
+        String prefix = "v-";
+
         if (browserDetails.isAndroid()) {
-            return OS_ANDROID;
+            return prefix + OS_ANDROID;
         } else if (browserDetails.isIOS()) {
-            return OS_IOS;
+            String iosClass = prefix + OS_IOS;
+            if (isIOS6()) {
+                iosClass += " " + prefix + OS_IOS + "6";
+            }
+            return iosClass;
         } else if (browserDetails.isWindows()) {
-            return OS_WINDOWS;
+            return prefix + OS_WINDOWS;
         } else if (browserDetails.isLinux()) {
-            return OS_LINUX;
+            return prefix + OS_LINUX;
         } else if (browserDetails.isMacOSX()) {
-            return OS_MACOSX;
+            return prefix + OS_MACOSX;
         }
         // Unknown OS
         return null;
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 2d177f29b5..3733ee204a 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -1123,6 +1123,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         if (firstvisible != lastRequestedFirstvisible && scrollBody != null) {
             // received 'surprising' firstvisible from server: scroll there
             firstRowInViewPort = firstvisible;
+            // Update lastRequestedFirstvisible right away here
+            // (don't rely on update in the timer which could be cancelled).
+            lastRequestedFirstvisible = firstRowInViewPort;
 
             /*
              * Schedule the scrolling to be executed last so no updates to the
@@ -2406,12 +2409,16 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                         firstToBeRendered, false);
                 client.updateVariable(paintableId, "lastToBeRendered",
                         lastToBeRendered, false);
-                // remember which firstvisible we requested, in case the server
-                // has
-                // a differing opinion
-                lastRequestedFirstvisible = firstRowInViewPort;
-                client.updateVariable(paintableId, "firstvisible",
-                        firstRowInViewPort, false);
+
+                // don't request server to update page first index in case it
+                // has not been changed
+                if (firstRowInViewPort != firstvisible) {
+                    // remember which firstvisible we requested, in case the
+                    // server has a differing opinion
+                    lastRequestedFirstvisible = firstRowInViewPort;
+                    client.updateVariable(paintableId, "firstvisible",
+                            firstRowInViewPort, false);
+                }
                 client.updateVariable(paintableId, "reqfirstrow", reqFirstRow,
                         false);
                 client.updateVariable(paintableId, "reqrows", reqRows, true);
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index bd4637c407..cf6c806ead 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -570,6 +570,9 @@ public abstract class VaadinService implements Serializable {
      * 
      * @param wrappedSession
      *            The session to lock
+     * 
+     * @throws IllegalStateException
+     *             if the session is invalidated before it can be locked
      */
     protected void lockSession(WrappedSession wrappedSession) {
         Lock lock = getSessionLock(wrappedSession);
@@ -590,6 +593,17 @@ public abstract class VaadinService implements Serializable {
             }
         }
         lock.lock();
+
+        try {
+            // Someone might have invalidated the session between fetching the
+            // lock and acquiring it. Guard for this by calling a method that's
+            // specified to throw IllegalStateException if invalidated
+            // (#12282)
+            wrappedSession.getAttribute(getLockAttributeName());
+        } catch (IllegalStateException e) {
+            lock.unlock();
+            throw e;
+        }
     }
 
     /**
@@ -613,7 +627,12 @@ public abstract class VaadinService implements Serializable {
         WrappedSession wrappedSession = getWrappedSession(request,
                 requestCanCreateSession);
 
-        lockSession(wrappedSession);
+        try {
+            lockSession(wrappedSession);
+        } catch (IllegalStateException e) {
+            throw new SessionExpiredException();
+        }
+
         try {
             return doFindOrCreateVaadinSession(request, requestCanCreateSession);
         } finally {
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.html b/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.htm
index 3830faa7de..95f9137b79 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.html
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.htm
@@ -23,7 +23,7 @@
 </tr>
 <tr>
     <td>assertText</td>
-    <td>//td[@id='gwt-uid-5']/div</td>
+    <td>//td[@class='gwt-MenuItem']/div</td>
     <td>ACTION</td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
     <td>assertText</td>
-    <td>//td[@id='gwt-uid-6']/div</td>
+    <td>//td[@class='gwt-MenuItem']/div</td>
     <td>ACTION</td>
 </tr>
 <tr>
@@ -58,7 +58,7 @@
 </tr>
 <tr>
     <td>assertText</td>
-    <td>//td[@id='gwt-uid-14']/div</td>
+    <td>//td[@class='gwt-MenuItem']/div</td>
     <td>ACTION</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html
new file mode 100644
index 0000000000..904f3b0470
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.html
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+
+<tr>
+	<td>open</td>
+	<td>run/com.vaadin.tests.components.table.SetCurrentPageFirstItemIndex?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableSetCurrentPageFirstItemIndex::/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>6</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
new file mode 100644
index 0000000000..574f1d1862
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2000-2013 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.tests.components.table;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.ui.Table.ColumnHeaderMode;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class SetCurrentPageFirstItemIndex extends AbstractTestUI {
+
+    private int index = 5;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout vl = new VerticalLayout();
+        setContent(vl);
+
+        final Table imageTable = new Table();
+        vl.addComponent(imageTable);
+
+        imageTable.setColumnHeaderMode(ColumnHeaderMode.HIDDEN);
+        imageTable.setPageLength(1);
+        imageTable.addGeneratedColumn("image", new ImageGenerator());
+        imageTable.setWidth(500, Unit.PIXELS);
+
+        for (int i = 1; i <= 25; i++) {
+            imageTable.addItem(new Integer(i));
+        }
+
+        imageTable.setCurrentPageFirstItemIndex(index);
+
+        vl.addComponent(new Button("Click", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                }
+                if (index != 5) {
+                    index = 5;
+                    imageTable.setCurrentPageFirstItemIndex(index);
+                } else {
+                    index = 20;
+                    imageTable.setCurrentPageFirstItemIndex(index);
+                }
+            }
+        }));
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Field lastRequestedFirstvisible should be updated out of timer.";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 10666;
+    }
+
+    public class ImageGenerator implements ColumnGenerator {
+
+        @Override
+        public Object generateCell(Table source, Object itemId, Object columnId) {
+            return "" + itemId;
+        }
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html b/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
index 734b95952a..613691623c 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
+++ b/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
@@ -161,32 +161,6 @@
 	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
 	<td>3. Test value after access: Set before run pending</td>
 </tr>
-<!-- Run last part with push enabled -->
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.ui.UiAccess?restartApplication&amp;transport=websocket</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForNotText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>exact:1. Current session matches in beforeResponse? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>exact:0. Current UI matches in beforeResponse? true</td>
-</tr>
 </tbody></table>
 </body>
 </html>
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html b/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html
new file mode 100644
index 0000000000..bc29534ee4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.ui.UiAccess?restartApplication&amp;transport=websocket</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
+	<td>exact:1. Current session matches in beforeResponse? true</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
+	<td>exact:0. Current UI matches in beforeResponse? true</td>
+</tr>
+</tbody></table>
+</body>
+</html>