diff options
| -rw-r--r-- | WebContent/VAADIN/themes/base/accordion/accordion.scss | 10 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss | 11 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss | 12 | ||||
| -rw-r--r-- | buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java | 16 | ||||
| -rw-r--r-- | common.xml | 1 | ||||
| -rw-r--r-- | uitest/ivy.xml | 7 |
6 files changed, 44 insertions, 13 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss index 6f4825f16b..694f5ca930 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.scss +++ b/WebContent/VAADIN/themes/base/accordion/accordion.scss @@ -27,4 +27,14 @@ width: 100%; } +/* + * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely + * support the HTML5 doctype. Changing the contained element to a block element will not add + * magical bottom paddings to the contained element and cause scrollbars. Doing this for + * all browsers for consistency. + */ +.v-accordion .v-accordion-item-content > .v-widget { + display: block; +} + }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss index 11b4da48d8..b29f596e36 100644 --- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss +++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss @@ -33,13 +33,14 @@ } /* - * In IE8 we need to do magic things to avoid scrollbars since it does not completely + * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely * support the HTML5 doctype. Changing the contained element to a block element will not add - * magical bottom paddings to the contained element and cause scrollbars. + * magical bottom paddings to the contained element and cause scrollbars. Doing this for all + * browsers for consistency. */ -.v-ie8 .v-splitpanel-first-container > .v-widget, -.v-ie8 .v-splitpanel-second-container > .v-widget{ +.v-splitpanel-first-container > .v-widget, +.v-splitpanel-second-container > .v-widget{ display:block; } - + }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss index a001605f27..6fcb3d1705 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss @@ -125,4 +125,16 @@ height: 0; } +/* + * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely + * support the HTML5 doctype. Changing the contained element to a block element will not add + * magical bottom paddings to the contained element and cause scrollbars. Doing this for + * all browsers for consistency. + */ +.#{$name} .v-scrollable > .v-widget { + display: block; +} + + + }
\ No newline at end of file diff --git a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java b/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java index bf9bd7e068..33c822193a 100644 --- a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java +++ b/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java @@ -29,9 +29,11 @@ public class GeneratePackageExports { if (args.length < 2) { System.err .println("Invalid number of parameters\n" - + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>"); + + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>\n" + + "Use -Dvaadin.version to specify the version to be used for the packages"); System.exit(1); } + String vaadinVersion = System.getProperty("vaadin.version"); // Open the JAR String jarFilename = args[0]; @@ -57,7 +59,7 @@ public class GeneratePackageExports { return; } - String exportPackage = sortAndJoinPackages(packages); + String exportPackage = sortAndJoinPackages(packages, vaadinVersion); // Read old manifest Manifest oldMF = null; @@ -95,7 +97,8 @@ public class GeneratePackageExports { } } - private static String sortAndJoinPackages(HashSet<String> packages) { + private static String sortAndJoinPackages(HashSet<String> packages, + String vaadinVersion) { // Produce an ordered listing of the package names String packageArray[] = new String[packages.size()]; packages.toArray(packageArray); @@ -105,8 +108,11 @@ public class GeneratePackageExports { if (i != 0) { joinedPackages.append(","); } - - joinedPackages.append(packageArray[i]); + String packageAndVersion = packageArray[i]; + if (vaadinVersion != null) { + packageAndVersion += ";version=\"" + vaadinVersion + "\""; + } + joinedPackages.append(packageAndVersion); } return joinedPackages.toString(); diff --git a/common.xml b/common.xml index 4b86bfaa33..0875fea71a 100644 --- a/common.xml +++ b/common.xml @@ -244,6 +244,7 @@ <arg value="com/vaadin" /> <arg value="com/google" /> <classpath refid="vaadin.buildhelpers.classpath" /> + <jvmarg value="-Dvaadin.version=${vaadin.version}" /> </java> </target> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index ce80832689..04488459f3 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -48,13 +48,14 @@ <!-- Newest Jetty does not work with Ivy currently (orbit -> jar mapping problem) --> <dependency org="org.eclipse.jetty" name="jetty-server" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide, jetty-run->default" /> + <!-- jetty-servlets needed in .war by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide->default" /> <!-- <dependency org="org.mortbay.jetty" name="jetty-util" --> <!-- rev="8.1.5.v20120716" conf="build,ide,jetty-run->default" /> --> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="7.4.5.v20110725" conf="build-provided, ide,jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide,jetty-run->default" /> <dependency org="org.mortbay.jetty" name="jetty-runner" rev="7.4.5.v20110725" conf="jetty-run->default" /> <dependency org="junit" name="junit" rev="4.5" |