summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JUnit tests should be supported for shared (#13081)Henrik Paul2013-12-123-3/+7
| | | | Change-Id: Ia6243005fba362970cb199ad2aab217e56b5822a
* Simplified support for null intermediate properties (#11435)Artur Signell2013-11-308-225/+35
| | | | | | | Removed support for explicitly throwing NPE for intermediate properties as no use case could be identified where this would be the expected or wanted behavior. Change-Id: I10696467f792e234326075bbcdd5aad487905a7e
* Merge changes from origin/7.1Johannes Dahlström2013-11-2926-391/+479
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84521fa Use correct type for UIDL value to avoid development mode problems (#12545) 3680505 Ensure generated parser is re-generated during build (#12937) f3fa6af Regenerated parser files (#12937) 011a2a0 Do not generate ParseException as it has been customized (#12937) 9be3b40 Workaround for missing value change event in chrome (#10109) 48034f6 Ensure alternate text is still visible (#11780) cbc9949 Added test case for #12726 07b1a9d Prevents accidental selection of window caption or content. (#12726) e05e10e Added extra asserts to make test more safer to blind refactorings 33e5897 Use localhost when running locally to avoid potential network issues 642818f Allow using @RunLocally to run on a local Firefox/Chrome/Safari 81a1c29 Revert "Fixed lost scrollLeft when row count changed in Table (#12652)." dde6a48 Output test results in XML reports instead of to standard output 012e649 Fix TB3 local testing and occasionally failing SliderDisableTest. Change-Id: I4f4e44e887e7e90dd04e6d7381280a997e9527cc
| * Fix TB3 local testing and occasionally failing SliderDisableTest.Teemu Suo-Anttila2013-11-192-7/+11
| | | | | | | | Change-Id: I58e60e55838c3339c934cf975e5e148c8f09a78b
| * Output test results in XML reports instead of to standard outputArtur Signell2013-11-185-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for a problem with the integrated TeamCity JUnit listener which is not thread safe. Without this the test results are completely mixed up in TeamCity. For more information, see http://youtrack.jetbrains.com/issue/TW-33176. All standard JUnit test reports is put in result/reports. For uitest there are three report directories: result/reports-tb2, result/reports-tb3 and result/reports-integration to be able to clean the directories before running a given type of tests. This change is based on the separate fixes by John. Change-Id: I2f0dee416f6745544636f2f3dcea0d0832ff8076
| * Revert "Fixed lost scrollLeft when row count changed in Table (#12652)."Leif Åstrand2013-11-154-294/+1
| | | | | | | | | | | | | | | | This reverts commit 533ddcda271b7226b38c035adf3073062c562653. Seems like the caused regressions are far from trivial to resolve. A new approach might be needed to resolve this issue. Change-Id: I88cf75608e8d47fffab5a366a8ad1b3b70c1c11f
| * Allow using @RunLocally to run on a local Firefox/Chrome/SafariArtur Signell2013-11-159-94/+140
| | | | | | | | Change-Id: Ibb1dfd12dc48637d8179f80322b5203ea5562805
| * Use localhost when running locally to avoid potential network issuesArtur Signell2013-11-151-0/+3
| | | | | | | | Change-Id: Ie43604a2b41d2214d55d0976ba3c81ea361c8c56
| * Added extra asserts to make test more safer to blind refactoringsMatti Tahvonen2013-11-141-4/+11
| | | | | | | | Change-Id: I5dd159640bdc4f188c291017032ca96ca8b85d11
| * Prevents accidental selection of window caption or content. (#12726)Felype Santiago Ferreira2013-11-141-0/+6
| | | | | | | | Change-Id: Ida479ef0c421cf67b2863cf78c76b495337f30cf
| * Added test case for #12726Matti Tahvonen2013-11-141-0/+97
| | | | | | | | Change-Id: I396bfa4f255d64dd1729afa1be6771ff35026ad9
| * Ensure alternate text is still visible (#11780)Artur Signell2013-11-141-0/+4
| | | | | | | | Change-Id: Icfa54ec612153c3a92f83d7cb083685f7e77d295
| * Workaround for missing value change event in chrome (#10109)Matti Tahvonen2013-11-122-0/+147
| | | | | | | | Change-Id: I019527041539fcd0083261b693767144492e626a
| * Do not generate ParseException as it has been customized (#12937)Artur Signell2013-11-122-169/+170
| | | | | | | | | | | | Reverted ParseException to the previous version Change-Id: Ic89eb4b65d1a78f40c4cb94e9b2a13a3250c1924
| * Regenerated parser files (#12937)Artur Signell2013-11-122-169/+168
| | | | | | | | Change-Id: I03e5f818c932d43be178008a4e857676bfed8f87
| * Ensure generated parser is re-generated during build (#12937)Artur Signell2013-11-122-3/+40
| | | | | | | | | | | | | | | | Ultimately we should remove Parser.java and other generated files from the project but this still needs tweaking ide.xml somehow so the parser is built. Change-Id: Iac491c6a50c87e1e8e0bb2f612e82186319a6de3
| * Use correct type for UIDL value to avoid development mode problems (#12545)Artur Signell2013-11-111-2/+2
| | | | | | | | Change-Id: Ib183e352fa64cb5c8f4d499ecb194768b18a16d6
* | Merge changes from origin/7.1Artur Signell2013-11-1112-20/+247
|\| | | | | | | | | | | | | | | | | | | 30e9b7c Add a test for @mixin { @font-face {...} } (#11649) 0a2cf2c Prevent showing "Session Expired" notification if navigating away (#12298) 8efc385 Fixes NPE in TreeTable.setContainerDS(null) (#12928) 23815e6 Remove broken JSch check c308d8a Fixes double scrollbar issue in browserframes (#11780) Fixed by adding font-size 0 to the base theme. Change-Id: I64ae167e8e6b61205718998b80d534fb2cf0cb3d
| * Fixes double scrollbar issue in browserframes (#11780)Thomas2013-11-115-0/+192
| | | | | | | | | | | | Fixed by adding font-size 0 to the base theme. Change-Id: I8d0224cb65f8ab36c50d2fd68157de4803c823e2
| * Remove broken JSch checkArtur Signell2013-11-111-5/+0
| | | | | | | | | | | | | | | | | | The current check requires ANT_HOME/lib to contain jsch-0.1.48. There are however other places, like .ant/lib where you can place the jar also. Additionally the build agents in TeamCity seems to wipe ANT_HOME/lib every now and then, which makes this a bad place to add extra jars. Change-Id: I83b8e0612e72d422d4341fc68b1ab6a0c98848a5
| * Fixes NPE in TreeTable.setContainerDS(null) (#12928)Thomas2013-11-082-2/+17
| | | | | | | | Change-Id: I7f3148e51d216dfe20a11c8a5fd922f43cbc673b
| * Prevent showing "Session Expired" notification if navigating away (#12298)Johannes Dahlström2013-11-082-13/+12
| | | | | | | | | | | | | | Currently only works if navigation initiated via Page.open(url, "_self"). Page.setLocation should be changed in 7.2 to use "_self" as well (#12925) Change-Id: I56ad66ffbbd1a83b64999307d23028cbd84bb508
| * Add a test for @mixin { @font-face {...} } (#11649)joheriks2013-11-082-0/+26
| | | | | | | | Change-Id: I7d089ea14b169481f943a1f44058ad47f9b8179a
* | Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'Artur Signell2013-11-1112-904/+1049
|\| | | | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj Change-Id: I3421c2d5c114765e924d7847cee46ebd370dfca6
| * Fixes for sass compiler, handling mixins (#11288).Mika Murtojarvi2013-11-0814-14261/+12657
| | | | | | | | | | | | | | | | Keyframe selectors can now be comma-separated lists, interpolation unquotes a quoted string and the parameters of an @include are no longer lost. Change-Id: I2622aca7471adc8004371affbb803d850e801307
* | Merge changes from origin/7.1Artur Signell2013-11-1112-61/+495
|\| | | | | | | | | | | | | | | | | | | | | | | 0d3c35b Forces redraw in IE 8 when table does post layout. (#12687) 533ddcd Fixed lost scrollLeft when row count changed in Table (#12652). c351b64 Revert "Make Panel scroll the correct div (#12736)" Revert "Reverted change in how hack works (#12727, #12736)" Revert "Fixes the handling of the scroll position of a Window (#12736)" Revert "Recovering scroll position after regression problems. (#12727)" Revert "Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide." 2e3e877 Fix scroll position handling in Window Webkit hack (#12736) 6b38173 Adds JBoss EAP 6 server to integration test suit (#12908) e933562 Minimal fix for error handling with streaming (#12578) 1385857 Do not apply fix on mobile devices or devices without scrollbars (#12736) Change-Id: I1e620342c936ea23eacd2082a0a92b15e453b924
| * Do not apply fix on mobile devices or devices without scrollbars (#12736)Artur Signell2013-11-082-1/+18
| | | | | | | | Change-Id: I38ef869d87418c18197a59a5ecd3fb7e12e1c02e
| * Minimal fix for error handling with streaming (#12578)Artur Signell2013-11-071-2/+14
| | | | | | | | | | | | There are still issues in PushHandler where the wrong resource is used but these should not be as critical. They will be fixed in #12920 Change-Id: Ife8d3694bdb6ee29c5b4adbd8988cc0346c4fe3f
| * Adds JBoss EAP 6 server to integration test suit (#12908)Thomas2013-11-061-0/+8
| | | | | | | | Change-Id: I2d31a0b446e40f0c221403dfb66a990e346e53c0
| * Fix scroll position handling in Window Webkit hack (#12736)Artur Signell2013-11-061-0/+10
| | | | | | | | Change-Id: If4d17c34b2d20ad983f21b892d3ab4c68f511780
| * Revert "Make Panel scroll the correct div (#12736)"Artur Signell2013-11-063-57/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Reverted change in how hack works (#12727, #12736)" Revert "Fixes the handling of the scroll position of a Window (#12736)" Revert "Recovering scroll position after regression problems. (#12727)" Revert "Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide." This reverts commit 6a63d12afc5a4bf3971dd016f8e2761cd27bcc74. This reverts commit c48c94dc23da22b6d885c69b0bc697257f9dbf11. This reverts commit 017bd0684c7d6c8475c8b43514e6f3998095c8d6. This reverts commit 51a46a038fe0353f4babfd8218153eb68e2602ca. This reverts commit ab5b20cf502f99944c82f619ffef387f0525e8ba. Test cases were left as-is as the issue (#12736) still needs a workaround Change-Id: I0b6c2afb4a9be8629f2a8f880a8ae8d0a6d5088f
| * Fixed lost scrollLeft when row count changed in Table (#12652).Tapio Aali2013-11-064-1/+294
| | | | | | Change-Id: I868f56c1e7003c6619859ba46619f4c53ef9744e
| * Forces redraw in IE 8 when table does post layout. (#12687)Jarno Rantala2013-11-063-0/+122
| | | | | | | | | | | | Without forcing the redraw, IE8 measures component sizes incorrectly in some cases. Change-Id: I38e8a70e18753714b00f5ca4492749d6c84f10dc
* | Merge commit 'fefedeab68461ebc04fd45f91a35835fc9026a56'Artur Signell2013-11-118-1/+275
|\| | | | | | | | | | | | | Conflicts: client/src/com/vaadin/client/ui/VWindow.java Change-Id: I03768d21133066aed5ff70b8c6df9e2761eb4e4e
| * Send window position data back to server after drag (#12885)Thomas2013-11-068-1/+274
| | | | | | | | Change-Id: I9ca766b0e06390c7ab90f9cbd4996b83032789db
* | Merge changes from origin/7.1Artur Signell2013-11-111-4/+15
|\| | | | | | | | | | | e0e00be Improve error message in createWidget() (#12901) Change-Id: Id744b5e9b19f6aca1e00d0d22ca90f2fe8efd033
| * Improve error message in createWidget() (#12901)Leif Åstrand2013-11-051-4/+15
| | | | | | | | Change-Id: If456a2be242754bcd1e0a8c5be00062a4355af35
* | Merge commit 'a2f255448e6a755892a97b7df9fc2b65efc5dccc'Artur Signell2013-11-114-215/+306
|\| | | | | | | | | | | | | Conflicts: theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java Change-Id: I6b295f9225785eb6bf07bf2cd2d5c1c3bc181afc
| * Allow @font-face and general @-directives inside @if-blocks (#11649)joheriks2013-11-054-222/+306
| | | | | | | | Change-Id: Ifa844e7bf8add886792b39c016cc2c9aa3d94b0c
* | Merge changes from origin/7.1Artur Signell2013-11-1129-1054/+776
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5a9131 Converted LayoutTesterApplication test to TB3 1376429 Fix compilation error in test 7b120fc Tests for validating reconnect works for streaming and websockets (#12868,#12853,#12852) 9e6a82d Force connection to closed state on reconnect (#12853) e365eee No longer require specifying Atmosphere js version in two places ca7e928 Update to Atmosphere js 2.0.3.vaadin2 (#12868, #12852) 1cc4dc1 Fix duplicate id issue in test and test more corner cases c21a684 Prepare for Safari 7 testing (#5288) 7615fd1 Made test more stable and added Firefox reconnect test (#12492) 186696d fix regression related to #12504 c48c94d Reverted change in how hack works (#12727, #12736) f328340 Fix NPE caused by setting ApplicationConnection too late (#12736) b47915f Extracted test to separate class e07e674 Remove possibility to use static inner classes for tests c4aff77 Fix NPE in fix (#12504) 15dce28 Make test more reliable by updating description which does not update the DOM 6a63d12 Make Panel scroll the correct div (#12736) cc796b0 Ensure testing Jetty does not run out of heap space f8da926 Updated to Atmosphere 1.0.18.vaadin1 (#12891) Change-Id: Ic30441d72c4e45551255724a0dcc3b3fa5a1729b
| * Updated to Atmosphere 1.0.18.vaadin1 (#12891)Artur Signell2013-11-053-3/+3
| | | | | | | | Change-Id: I5387c9f5eca1eb7941fbd4565d4b6f3cb95a5a0f
| * Ensure testing Jetty does not run out of heap spaceArtur Signell2013-11-051-1/+1
| | | | | | | | Change-Id: If4549c7bcb0a6518756aa42827340415c44a030c
| * Make Panel scroll the correct div (#12736)Artur Signell2013-11-052-7/+4
| | | | | | | | | | | | | | Redefined util method to take the scrollable instead of its parent to make it useful also for cases where the first child is not scrollable Change-Id: I301d260d26373b38fdee525f169347bb7b4c499e
| * Make test more reliable by updating description which does not update the DOMArtur Signell2013-11-041-1/+3
| | | | | | | | | | | | Many browsers (IE) choke quite easily when there is a 1MB string inside a div Change-Id: Ied9b27c17c5374b7cac36820be9cbe38e84448ee
| * Fix NPE in fix (#12504)Artur Signell2013-11-041-2/+10
| | | | | | | | Change-Id: I65960bcfae850955ea40584445125c0affa26848
| * Remove possibility to use static inner classes for testsArtur Signell2013-11-041-9/+0
| | | | | | | | Change-Id: I461568918bc09bd7a09abbf9c4a34f1a5f3b997f
| * Extracted test to separate classArtur Signell2013-11-042-55/+72
| | | | | | | | Change-Id: Ibfad0180e93e7f74b91427761b40c86938044c50
| * Fix NPE caused by setting ApplicationConnection too late (#12736)Artur Signell2013-11-041-3/+2
| | | | | | | | Change-Id: Ib5b3bc7123ffd2f212fb6e242ee07175ff743b0f
| * Reverted change in how hack works (#12727, #12736)Artur Signell2013-11-041-2/+2
| | | | | | | | | | | | The fix for Window slightly altered how the hack was done, breaking #12736 Change-Id: I2d33b45421c40ce011d2e728a573f7572e326c47
| * fix regression related to #12504Matti Tahvonen2013-11-042-8/+9
| | | | | | | | | | | | Cloning date instances passed from state to cal panel as they appear to be mutating Change-Id: I3775b8445ddc0a779b894b4e044bde93f4c5936c