Artur Signell [Thu, 30 May 2013 13:04:33 +0000 (16:04 +0300)]
Fix streaming issue with iOS6 (#11934)
It appears that iOS6 will not make new request (at least for images) to a server to which there is already a connection open which possibly will be kept alive after the current request is done (Connection: Keep-alive asked by the client and not denied by the server)
Leif Åstrand [Thu, 30 May 2013 07:25:23 +0000 (10:25 +0300)]
Make ProgressInidcatorConnector use VProgressIndicator (#11925)
When ProgressBar was split out from ProgressIndicator,
ProgressIndicatorConnector was accidentally left inheriting the
VProgressBar widget from ProgressBarConnector instead of using its own
VProgressIndicator.
John Ahlroos [Tue, 28 May 2013 09:39:20 +0000 (12:39 +0300)]
Fixes current text being overwritten in server update on RTA #11741
If the server happens to update the state of the RTA while a user is
typing then the users text will be replaced by the value on the server. To fix
this the RTA should not update if the value is the same as the one
cached on the client side.
Also moves blur handling and server<->client syncronization to the
connector.
Leif Åstrand [Tue, 28 May 2013 13:52:10 +0000 (16:52 +0300)]
Avoid deadlock checking in runPendingAccessTasks() (#11897)
The deadlock check in accessSynchronously() was triggered in cases where
one session was locked and tryLock() in access() did manage to lock
another session and thus attempted to run the runnable right away.
runPendingAccessTasks() needed accessSynchronously() just for setting up
the current session instance - the session was already locked and
cleaning up the CurrentInstance values afterwards was not needed. Just
setting the current session without accessSynchronously() gets rid of
the inappropriate deadlock detection as well as some overhead with
managing locks and CurrentInstance values.
Leif Åstrand [Tue, 28 May 2013 12:36:16 +0000 (15:36 +0300)]
Remove outdated testing (#11897)
* access is run right away instead of the next time there's a request
from the server.
* Non-inheritable CurrentInstance values are not carried over to access
Artur Signell [Tue, 21 May 2013 13:51:32 +0000 (16:51 +0300)]
Modified the logic in setPropertyDatasource which determines if a new converter is needed (#11863)
The previous logic had two flaws
* It allowed converter model type to be a sub type of the model type but not vice versa. Similarly for presentation type.
* If the user has set a converter it should be used and not be replaced unless it is absolutely sure that it cannot in any possible way handle conversion (e.g. converter from integer to double cannot handle string to list conversion). If there is a slight chance that it can handle conversion, let it be and let the user set another converter when needed.
Leif Åstrand [Tue, 21 May 2013 10:33:44 +0000 (13:33 +0300)]
Derive current servlet/portlet from the current service (#11779)
Implement VaadinPortlet.getCurrent() to use VaadinService.getCurrent()
instead of having a separate thread local variable. This is done to
avoid classloading issues when determining which instances to preserve
in CurrentInstance.setThreadLocals. The two current instances have
previously been kept in sync in all cases except during
VaadinPortlet.init where VaadinService has not yet been created.
VaadinPortlet.setCurrent() is removed as no way of preserving its
semantics has been found. This breaks API compatibility, but is probably
better than having a deprecated implementation that can not work as
expected in all situations.
The same changes have also been made to VaadinServlet to maintain the
symmetry.
Leif Åstrand [Fri, 17 May 2013 13:14:27 +0000 (16:14 +0300)]
Merge changes from origin/7.0
1a6200e Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7 67696f3 SQLContainer.indexOfId() also searches backwards (#11849, #10376) 611e5f9 Test for #11267 adapted from 6.8. 609acd1 Fixed table height rendering in Android 2.3 #11331 63dd611 Centers VOverlays in visual viewport on iOS, Android, fixes #11614 5a33d7d Test for #11775 0c8edf1 Avoid marking AbstractField dirty in primitive getters (#11201)
Leif Åstrand [Fri, 17 May 2013 12:10:48 +0000 (15:10 +0300)]
Merge changes from origin/7.0
55ea6dc More specific workaround for no rows in TreeTable with pagelenght = 0 (#9203) dca728c Warn if using old widgetset (#11836) 936439d Verify that tests are run with the expected JRE version (#11835) 29eeda5 Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840) 6d7f5e4 Eliminate unnecessary conversions of option keys b8c6a15 Clear items in ComboBox only if changed (#10924) 42545ac Fix NPE if there's no query in the URI (#11836)
Leif Åstrand [Fri, 10 May 2013 13:53:33 +0000 (16:53 +0300)]
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
John Alhroos [Tue, 30 Apr 2013 07:48:53 +0000 (07:48 +0000)]
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)
Leif Åstrand [Mon, 6 May 2013 11:24:04 +0000 (14:24 +0300)]
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
projects / vaadin-framework.git / log