Merge branch 'master' into gwt

7 files changed, 42 insertions, 18 deletions

diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.css b/WebContent/VAADIN/themes/base/accordion/accordion.css
index 10c205ae24..ad762ee0ac 100644
--- a/WebContent/VAADIN/themes/base/accordion/accordion.css
+++ b/WebContent/VAADIN/themes/base/accordion/accordion.css
@@ -22,6 +22,5 @@
 }
 .v-accordion-item-content {
 	position: absolute;
-	overflow: auto;
 	width: 100%;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index 3c08a9d584..d2695a8015 100644
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -29,7 +29,6 @@ div.v-app-loading {
 .v-view {
 	height: 100%;
 	width: 100%;
-	overflow: auto;
 	/* avoid scrollbars with margins in root layout */
 	outline: none;
 	position: relative;
@@ -236,12 +235,17 @@ div.v-app-loading {
 
 .v-drag-element {
 	z-index: 60000;
-	position: absolute;
-    opacity: 0.5;
-    filter: alpha(opacity=50);
-    cursor: default;
+	/* override any other position: properties */
+	position: absolute !important;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	cursor: default;
 }
 
 .v-clip {
 	overflow: hidden;
-}
\ No newline at end of file
+}
+
+.v-scrollable {
+	overflow: auto;
+}
diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css
index 489d6bc015..d5a9915490 100644
--- a/WebContent/VAADIN/themes/base/panel/panel.css
+++ b/WebContent/VAADIN/themes/base/panel/panel.css
@@ -29,7 +29,6 @@
 	overflow: hidden;
 }
 .v-panel-content {
-	overflow: auto;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 1b56b7fb9c..6f2eb8c2cc 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -76,7 +76,7 @@
         purpose of receiving feedback about the changes.
       </p>
 
-      <p>The major changes in this second alpha phase are:
+      <p>The major changes in this second alpha phase are:</p>
 
       <ul>
         <li>Complete overhaul of the client-server communication architecture
@@ -354,15 +354,25 @@
       </p>
 
       <p>
-        Vaadin supports the following <b>browsers</b>:
+        Vaadin supports the following <b>desktop browsers</b>:
       </p>
 
       <ul>
-        <li>Mozilla Firefox 11</li>
+        <li>Mozilla Firefox 12</li>
         <li>Internet Explorer 8-9</li>
         <li>Safari 5</li>
         <li>Opera 11</li>
-        <li>Google Chrome 18</li>
+        <li>Google Chrome 19</li>
+      </ul>
+
+      <p>
+        Additionally, Vaadin supports the built-in browsers in the following 
+        <b>mobile operating systems</b>:
+      </p>
+
+      <ul>
+        <li>iOS 4-5</li>
+        <li>Android 2-4</li>
       </ul>
 
       <h2 id="vaadinontheweb">Vaadin on the Web</h2>
diff --git a/WebContent/statictestfiles/dummy.zip b/WebContent/statictestfiles/dummy.zip
new file mode 100644
index 0000000000..e6e34282fe
--- /dev/null
+++ b/WebContent/statictestfiles/dummy.zip
diff --git a/WebContent/statictestfiles/jsconnector.js b/WebContent/statictestfiles/jsconnector.js
index db8a065e86..d7f697dbf5 100644
--- a/WebContent/statictestfiles/jsconnector.js
+++ b/WebContent/statictestfiles/jsconnector.js
@@ -1,10 +1,11 @@
-window.com_vaadin_tests_components_javascriptcomponent_BasicJavascriptComponent_ExampleWidget = function() {
+window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ExampleWidget = function() {
 	var connector = this;
 	
 	var rootElement = connector.getWidgetElement();
 	rootElement.innerHTML = 'Hello world!';
 	rootElement.onclick = function() {
-		connector.getRpcProxyFunction("com.vaadin.tests.components.javascriptcomponent.BasicJavascriptComponent$ExampleClickRpc", "onClick")("message");
+		connector.getRpcProxy().onClick("message");
+		connector.onclick("another message");
 	}
 	connector.onStateChange = function() {
 		console.log('state change:', this.getState());
diff --git a/WebContent/statictestfiles/jsextension.js b/WebContent/statictestfiles/jsextension.js
index df67db8927..1a46300e45 100644
--- a/WebContent/statictestfiles/jsextension.js
+++ b/WebContent/statictestfiles/jsextension.js
@@ -1,13 +1,24 @@
-window.com_vaadin_tests_features_SimpleJavascriptExtensionTest_SimpleJavascriptExtension = function() {
+window.com_vaadin_tests_extensions_SimpleJavaScriptExtensionTest_SimpleJavascriptExtension = function() {
+	var self = this;
 	var state = this.getState();
-	var greetBack = this.getRpcProxyFunction('com.vaadin.tests.features.SimpleJavascriptExtensionTest$SimpleJavascriptExtensionServerRpc', 'greet');
+	
+	//var rpc = this.getRpcProxy("com.vaadin.tests.extensions.SimpleJavaScriptExtensionTest.SimpleJavaScriptExtensionServerRpc");
+	var rpc = this.getRpcProxy();
 
-	this.registerRpc("com.vaadin.tests.features.SimpleJavascriptExtensionTest.SimpleJavascriptExtensionClientRpc", {
+//	this.registerRpc("com.vaadin.tests.extensions.SimpleJavaScriptExtensionTest.SimpleJavaScriptExtensionClientRpc", {
+	this.registerRpc({
 		'greet': function(greeting) {
 			var response = window.prompt(state.prefix + greeting);
 			if (response !== null) {
-				greetBack(response);
+				rpc.greet(response);
 			}
 		}
 	});
+	
+	this.greetToClient = function(greeting) {
+		var response = window.prompt(state.prefix + greeting);
+		if (response !== null) {
+			self.greetToServer(response);
+		}
+	} 
 }
\ No newline at end of file