Leif Åstrand
7a1ab60fee
Revert "Assert that connector needing layout is attached ( #11698 )"
...
This reverts commit cb7b02d4e5
The assert is not a good idea because it is triggered when a connector registers a dependency in its init method.
Merge: no
Change-Id: I1f5a99af8f0af7b3329a1a596073ba09e55e18dc
2013-05-13 16:42:26 +03:00
Leif Åstrand
42d94768bf
Merge changes from origin/7.0
...
7d9f544
Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB.
1b18807
Remove pre-loader element after pre-loading, fixes #10863
ce9c818
Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776 )
3f5d022
Liferay 6.2 compatibility (#11751 )
ffd1c1b
Don't ignore child component margins in AbstractOrderedLayout (#11553 )
62ae5e1
More verbose output from running Jetty
21d9b67
Add a large number of debug calls to VFilterSelect (disabled by default)
bdb7931
Merge test for #11623 to 7.0.
19e27a1
Move suggestion popup width calculation from connector to VFilterSelect
Change-Id: I2d980126599e55fa5e4f6ec523dca16ba54107b5
2013-05-10 16:53:33 +03:00
Henri Sara
19e27a15ca
Move suggestion popup width calculation from connector to VFilterSelect
...
Change-Id: I846b71c453524ecc525c6ab6c528dffcc7715558
2013-05-10 13:27:57 +00:00
Johannes Dahlström
bdb793187c
Merge test for #11623 to 7.0.
...
The fix itself is not required due to the changed style name handling.
svn changeset:25902/svn branch:6.8
svn changeset:25903/svn branch:6.8
Change-Id: I95a9adbcac82236017369003765735bbaacfe980
2013-05-10 13:27:29 +00:00
Henri Sara
21d9b67d8b
Add a large number of debug calls to VFilterSelect (disabled by default)
...
Change-Id: Idd2d20ad01d4715a9f4693af8a7c293786dbae4b
2013-05-10 13:40:04 +03:00
Leif Åstrand
62ae5e19a1
More verbose output from running Jetty
...
This is an attempt to find what it is that sometimes seems to cause
Jetty to terminate before all the tests have run.
Change-Id: Id33e42c49d7528034b2859294e52111df218763a
2013-05-10 10:09:54 +00:00
Johannes Dahlström
ffd1c1bff5
Don't ignore child component margins in AbstractOrderedLayout ( #11553 )
...
Change-Id: I89d8364b97bfe7d072cc7e5221b35ab3cdb3c58b
2013-05-10 09:58:59 +00:00
Henri Sara
3f5d022e7f
Liferay 6.2 compatibility ( #11751 )
...
Change-Id: I5a14aba47f3e92249b245392acaf5ff9bda62083
2013-05-10 09:58:12 +00:00
John Alhroos
ce9c818b8c
Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 ( #10776 )
...
svn changeset:25899/svn branch:6.8
Change-Id: Ib3cb61e024ba461bcc146b9beb4a52cb6df9ce28
2013-05-10 12:37:28 +03:00
Leif Åstrand
762c924a8b
Update test to work with the new debug window
...
Change-Id: I9a1f7791faa3bbd8aae13c0d21c505570dfa131b
2013-05-08 13:14:46 +00:00
Leif Åstrand
e2851196c3
Move .v-assistive-device-only out of @mixin base-common
...
Change-Id: Ic75bb693077640ff9c93f09ad0341d9b24f85d1e
2013-05-08 14:04:04 +03:00
Marc Englund
1b188073c4
Remove pre-loader element after pre-loading, fixes #10863
...
Change-Id: Ibd2009315aadb25e574c82f3b4b54c501d9b1395
Ticket: 10863
2013-05-08 09:31:09 +03:00
Leif Åstrand
571792ed9d
Remove old widget hierarchy hack that caused problems ( #11752 )
...
Change-Id: Icd66755512a2c1ab490e58f80389ed35966d3e3b
2013-05-07 12:59:11 +00:00
John Ahlroos
f2c2236cf8
Replaced css inject hack in TestUtils with Page.Styles.add() #11798
...
Change-Id: Ifb43fd1d2226756e104e2f5955e23151100e9357
2013-05-07 14:57:03 +03:00
John Ahlroos
9bd7c2bbec
Fixed order of tests in LayoutTesterApplication #11796
...
Change-Id: I9fc1224df33a66f065594de4ae09a027ddaaa895
2013-05-07 13:01:46 +03:00
michaelvogt
96b6250039
Form field and layout Aria corrections ( #11785 )
...
Change-Id: I7625128dd02911230ffc50d5045a88489daa85b4
2013-05-07 10:58:21 +03:00
John Ahlroos
5388dce378
Fixed IllegalSyntaxException when using spaces in path #11782
...
Change-Id: I105b2835d44c94f00b847f342fd0a6e0ef571e97
2013-05-06 12:51:59 +00:00
Leif Åstrand
d09b586ece
Don't start merging if there are uncommitted changes
...
Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
2013-05-06 14:54:41 +03:00
Leif Åstrand
888d34c55c
Update merge script to merge 7.0 to 7.1
...
* Refactor so that source and target branches are defined in
variables in the beginning of the script.
* Pass a dummy commit message to the merge to avoid opening an editor
while running the script
Merge: manual
Change-Id: I76c001b3bfcfd2dbb1ce2e9ec1b730641df31a77
2013-05-06 14:43:48 +03:00
Leif Åstrand
0f5831df6f
Update state before purging outgoing queue ( #11768 )
...
Change-Id: I83ad088da0aa173e5e912b9059757274526d5c25
2013-05-03 11:44:11 +03:00
Leif Åstrand
fbb0da7b88
Mention asserts and experimental plugin in release notes ( #11530 )
...
Change-Id: I25ee810c72ba32e8087f0da6ca3b72575505740d
2013-05-03 10:03:35 +03:00
Leif Åstrand
05ede5caa8
Only complain about other session if it is locked ( #11757 )
...
Change-Id: I94ff6cecc52ae79724e45bb1c246401d9521a7cf
2013-05-03 09:26:16 +03:00
Artur Signell
68d3f0ac04
Fixed scss file resolving issue in Windows ( #11762 )
...
Change-Id: I63484865ce56a54cc8f3fb673c03ffd0be6c8dc1
2013-05-03 08:57:24 +03:00
Artur Signell
f7e41e74bf
Enable sources and javadoc building for push ( #11498 )
...
Change-Id: I65cb0a0cdaf4c63ab14740f3c3012b7e19f54d7a
2013-05-02 18:41:51 +03:00
Artur Signell
5d11c5badb
Build sources and javadoc jars for push ( #11498 )
...
Change-Id: Ia1621376ff86935e5f9db3d54d64de3dfb85fb6c
2013-05-02 17:00:20 +03:00
Leif Åstrand
ba81387369
Fix typo ( #11754 )
...
Change-Id: Ib9f75c81a18a555b34cd620260f85063c58c90ce
2013-05-02 11:30:45 +00:00
Johannes Dahlström
087756f1a6
Allow setting push mode in UI.init ( #11739 )
...
Change-Id: Ied24bc42a25800033351fcbacdc5fc5e0be8eda1
2013-05-02 11:29:34 +00:00
Leif Åstrand
79e9ddc524
Make access() throw if another session is already locked ( #11757 )
...
Change-Id: Ic8571b0d078c3ff64e8b9914e55c51766ae49024
2013-05-02 14:19:06 +03:00
Leif Åstrand
80d96608dd
Rename runSafely() to access() ( #11756 )
...
Change-Id: I640244732fb561d9f55da58f8ba94fd02875c191
2013-05-02 14:05:16 +03:00
Henri Sara
a4e9ec1ea6
Fix order in web.xml to pass validation ( #11688 , #11672 )
...
Change-Id: I84ae6cbded5982da9e9a67b58e9ff9a1617627b8
2013-05-02 09:58:19 +03:00
Artur Signell
a50cc42cb3
Fixed invalid xml ( #11688 )
...
Change-Id: I68f74ecbaf0ee2795dc3d80a96b5333232b3d1f4
2013-05-02 06:57:06 +00:00
Artur Signell
9589abe8ee
Made test work also when current month is not April 2013
...
Change-Id: I4998dd4e146d5520c814e78e3456b2d37e446cef
2013-05-02 09:17:25 +03:00
Artur Signell
c076ae42e4
Updated release notes for beta1 ( #11530 )
...
Change-Id: I539cf45e23059723a7adbedd92169969748f1052
2013-05-02 09:16:42 +03:00
Artur Signell
57358ba8a4
Updated web.xml to use servlet 3.0 and added a 2.4 compatible web.xml for older test servers ( #11688 )
...
Change-Id: Iff9a4b0bbe70832ced7d71e1cfc0855cc0026320
2013-05-02 08:42:52 +03:00
Artur Signell
b6844e0985
Removed changing session id from test
...
Change-Id: I851df9f3b3743263267b4a434f846fcc789997e0
2013-05-02 08:42:50 +03:00
Henri Sara
b43525e117
Add Jetty to compilation class path of uitest WAR ( #11688 )
...
Change-Id: I0f185e9bb1f91f7eca7e93f6a42c413be48fdeec
2013-04-30 13:02:46 +03:00
Artur Signell
0b250923b4
Revert "Imported new Atmosphere JS from Atmosphere 1.0.x ( #11642 )"
...
This reverts commit 17a60afd6e
Causes regressions in IE10
Change-Id: Icd1073898f668b3f0ab61123c2a92f45675160fb
2013-04-30 08:43:21 +00:00
Henri Sara
329b899bc1
Remove Jetty JARs from uitest WAR (related to #11688 )
...
Otherwise, Atmosphere may auto-detect Jetty at least on some
other servers.
Change-Id: I12552af49bb07ee84705b785abb2bef53f9278ed
2013-04-30 11:37:41 +03:00
Johannes Dahlström
a430180f6f
Split client-to-server messages when websockets are used ( #11648 )
...
* First part of a fragmented message prefixed by total message length plus '|'
* Atmosphere websocket buffer size set to 65536
* Fragment size is 65535 characters (Jetty requires less than buffer size)
Change-Id: I8bf872bbb03b86386070fdc99c14ea805dd2ef3a
2013-04-29 15:56:47 +00:00
Artur Signell
1f08e16589
Fixed test (gwt-id-X not stable)
...
Change-Id: I4def9e78d3985d6f1c28fe7eb816120615cec057
2013-04-29 11:57:29 +00:00
Artur Signell
fcad91d2c8
Added workaround for #11737 to test
...
Change-Id: I9541abb5835c6851c3eea0d7567b4a848dc605d0
2013-04-29 11:54:21 +00:00
Artur Signell
235d0200c0
Fixed test (gwt-id-X not stable)
...
Change-Id: I5509c39e1461453d6c75e9fce477e2c202a986c2
2013-04-29 11:53:33 +00:00
Henri Sara
747c99eea9
Merge commit 'd214efa39a011002eb88e683676508e438842fe4'
...
Conflicts:
client/src/com/vaadin/client/ui/orderedlayout/Slot.java
Change-Id: I2fb5d1ac4b5c10a1fe5b1a6f976c1f59283b9169
2013-04-29 14:19:02 +03:00
Henri Sara
7d9f544d58
Test for #11396 (merged from 6.8 branch).
...
Depends on a blur event so cannot be autotested with TB.
svn changeset:25882/svn branch:6.8
Change-Id: I2db788e60397162a29f7802f772609e65a832d3f
2013-04-29 13:44:18 +03:00
Henri Sara
d214efa39a
Ensure actions are handled in a deterministic order ( #11735 ) (merged
...
from #11432 in 6.8 branch)
svn changeset:25867/svn branch:6.8
Change-Id: Ie34cc4c4fe6524a23b2e7692b9e73a421443ac4f
2013-04-29 13:36:32 +03:00
Artur Signell
97e5714b0a
Fixed test (maximize button added to DOM)
...
Change-Id: Id4319afc6eaef6f0afc65400d1208937c89fabbc
2013-04-29 12:31:13 +03:00
Artur Signell
57d9f9d801
Fixed test (gwt-id-X not stable)
...
Change-Id: I6da73c4dcbe61573b21a54423ba0f86d41ded607
2013-04-29 12:30:52 +03:00
Artur Signell
6af7ba3ba8
Stack windows when no position has been given ( #11729 )
...
Change-Id: I5841de4554a35af158764551f022bda1eaddb3c0
2013-04-29 12:06:48 +03:00
Artur Signell
17a60afd6e
Imported new Atmosphere JS from Atmosphere 1.0.x ( #11642 )
...
* Atmosphere change 2a6b6ce0f5fc1185df6d293d1c919840fabbadf9
Change-Id: I5460cc75045d78930c2a5e0ac0a0199cb1bea100
2013-04-29 11:46:45 +03:00
Artur Signell
f3f6ab0df5
Try almost indefinitely to re-establish a push connection ( #11727 )
...
Change-Id: I11e5affdda794dbb3ab63796f3a682fea76c6e44
2013-04-29 11:18:56 +03:00