From: Jouni Koivuviita Date: Tue, 3 Jun 2014 09:58:56 +0000 (+0300) Subject: Merge branch 'master' into valo X-Git-Tag: 7.3.0.alpha3~1^2~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad452a36795b764aeea2b00e3ceed2bae75d7949;p=vaadin-framework.git Merge branch 'master' into valo Conflicts: WebContent/release-notes.html build.properties client/src/com/vaadin/client/ApplicationConfiguration.java Change-Id: I36f075a03350e45c8666832142d7368891af3e59 --- ad452a36795b764aeea2b00e3ceed2bae75d7949 diff --cc WebContent/release-notes.html index eeeea1071d,baa91232b2..356675726e --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@@ -46,6 -45,12 +45,8 @@@ @version@

Incompatible changes in - @version-minor@

Behavior altering - changes in @version-minor@

Known issues in - @version-minor@

++ @version-minor@

Limitations in @version-minor@

Vaadin Installation

@@@ -150,61 -125,55 +112,73 @@@ href="http://vaadin.com/download/release/7.0/7.0.0/release-notes.html">Release Notes for Vaadin 7.0.0.

- -

Incompatible changes

It is assumed that the UI will no longer be used afterÂ Page.setLocation - is called. Do not use this to start downloads.
The portlet requests class VaadinGateinRequest is now called - VaadinGateInRequest
The JSON library has been changed from org.json to the json implementation - from the Android SDK. They are 99% compatible.
StringToNumberConverter has been removed in favor of more specific - converters such as StringToBigDecimalConverter.
There is no longer support for "multiple variable bursts" - in the UIDL communication.

Behavior altering changes

+ +

Valo theme

+ +

Valo is a brand new built-in theme for Vaadin. It leverages + the Sass CSS preprocessor heavily, + providing a variety of ways to customize the look and feel of your theme. + Read the introductory blog post describing the features for the + Vaadin 7.x series.

+ +

Using Valo

+ +

The Java-based Sass compiler bundled with this Vaadin release + does not support all the features that Valo requires at the moment. + The compiler in the release version of Vaadin 7.3 will support Valo, + but for this alpha release, you need to use the original Ruby-based + compiler (or any other Sass 3.2 compatible Sass compiler). See + instructions below.

Default push fallback is now long-polling
VerticalLayout and HorizontalLayout.replaceComponent now applies old - component parameters (e.g. expand ratio) to the new component. This is - now consistent between all layouts in the framework, where relevant - properties are applied to the replacement.
All GWT permutations are collapsed when using DefaultWidgetSet. To use - separate permutations, inherit Vaadin instead of DefaultWidgetSet and - add the needed entry-point.
Requests to "/context;jsessionid=xyz" are redirected to - "/context/;jsessionid=xyz" which is against specifications but based - on how jsessionid is used
Adding a ValueChangeListener to a component will make it immediate
ComboBox is immediate by default
Install the command-line version of the Sass compiler by following + the instructions in http://sass-lang.com/install
Unpack the VAADIN/themes/valo folder from + vaadin-themes-7.3.0.alpha1.jar and place it under your + project's VAADIN/themes folder
In your project's custom theme, import Valo and do any modifications + you wish using the Sass API in Valo (i.e., variables, mixins, and functions), + and then include the main valo mixin
+
Example (in my-theme-name.scss):
+
```
// Any variables you wish to override should be done before importing Valo
 +
 +// Modify the base color of the theme
 +$v-app-background-color: hsl(200, 50%, 50%);
 +
 +@import "../valo/valo";
 +
 +.my-theme-name {
 +  @include valo;
 +}
 +
```
+
From the command-line, navigate to your project's + VAADIN/themes/my-theme-name folder and use the following command + to compile the theme:

+ $ sass styles.scss styles.css

Known issues

Reconnecting a dropped push connection sometimes fails when using + Firefox and streaming or long polling. + (#13578) +
Drag'n'drop in a Table doesn't work on touch devices running + Internet Explorer (Windows Phone, Surface) + (#13737) +

Limitations

It is currently not possible to specify font-size +
It is currently not possible to specify font-size as em or %, or layout component sizes with em (#10634) + href="http://dev.vaadin.com/ticket/10634">#10634).
This + does not apply to Valo, but using em sizes to size layouts is discouraged, + because it results in fractional component sizes in many cases, which + might cause unwanted 1px gaps between components.
Push is currently not supported in portals (See #11493) diff --cc build.properties index 374b1a8345,043407b85d..c041d3639c --- a/build.properties +++ b/build.properties @@@ -5,5 -5,5 +5,5 @@@ vaadin.vendor=Vaadin Lt vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build -vaadin.sass.version=0.9.2 +vaadin.sass.version=0.9.4 - commons-io.version=2.4 + commons-io.version=2.4 diff --cc client/src/com/vaadin/client/ApplicationConfiguration.java index 16cdc759fa,543a48f61b..c7ef9586c5 --- a/client/src/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/client/ApplicationConfiguration.java @@@ -44,7 -43,7 +44,8 @@@ import com.vaadin.client.debug.internal import com.vaadin.client.debug.internal.Section; import com.vaadin.client.debug.internal.TestBenchSection; import com.vaadin.client.debug.internal.VDebugWindow; +import com.vaadin.client.debug.internal.theme.DebugWindowStyles; + import com.vaadin.client.event.PointerEventSupport; import com.vaadin.client.metadata.BundleLoadCallback; import com.vaadin.client.metadata.ConnectorBundleLoader; import com.vaadin.client.metadata.NoDataException; diff --cc client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java index 0afc46d0f3,0000000000..249b24a938 mode 100644,000000..100644 --- a/client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java +++ b/client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java @@@ -1,34 -1,0 +1,49 @@@ ++/* ++ * Copyright 2000-2014 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.client.debug.internal.theme; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.resources.client.CssResource.NotStrict; +import com.google.gwt.resources.client.DataResource; +import com.google.gwt.resources.client.DataResource.DoNotEmbed; + +public interface DebugWindowStyles extends ClientBundle { + + @Source({ "debugwindow.css" }) + @NotStrict + public CssResource css(); + + // Can't embed because IE8 doesn't support datauri for fonts (images only) + @Source("font.eot") + @DoNotEmbed + DataResource iconFontEot(); + + // Can't embed because GWT compiler doesn't know the mimetype for these + // (ends up as content/unknown) + @Source("font.ttf") + @DoNotEmbed + DataResource iconFontTtf(); + + @Source("font.woff") + @DoNotEmbed + DataResource iconFontWoff(); + + @Source("font.svg") + @DoNotEmbed + DataResource iconFontSvg(); + +}