diff options
author | Denis Anisimov <denis@vaadin.com> | 2016-09-19 16:26:32 +0300 |
---|---|---|
committer | Henri Sara <hesara@vaadin.com> | 2016-11-25 08:36:02 +0200 |
commit | 24b43d902c71ea469e2105f3a1c8be2f84610f04 (patch) | |
tree | 89ec5aa0c72433443b7ac5664d2ba293ba41e431 /client/src | |
parent | 4e8eb29c548128a50a000699f60259243e4695ed (diff) | |
download | vaadin-framework-24b43d902c71ea469e2105f3a1c8be2f84610f04.tar.gz vaadin-framework-24b43d902c71ea469e2105f3a1c8be2f84610f04.zip |
Data should be updated when it's set for disabled components.
Fixes vaadin/framework8-issues#286
Change-Id: I0d6cf49addfd558d43671ad2953dee54529392cd
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java index 9dd1a504ab..4ca363ea3c 100644 --- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -320,6 +320,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { * @return <code>true</code> if waiting for data; otherwise * <code>false</code> */ + @Override public boolean isWaitingForData() { return currentRequestCallback != null; } @@ -462,7 +463,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { currentRequestCallback = null; } - Range maxCacheRange = getMaxCacheRange(); + Range maxCacheRange = getMaxCacheRange(received); Range[] partition = received.partitionWith(maxCacheRange); @@ -698,9 +699,13 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { } private Range getMaxCacheRange() { + return getMaxCacheRange(getRequestedAvailability()); + } + + private Range getMaxCacheRange(Range range) { Range availableDataRange = getAvailableRangeForCache(); - Range maxCacheRange = cacheStrategy.getMaxCacheRange( - requestedAvailability, cached, availableDataRange); + Range maxCacheRange = cacheStrategy.getMaxCacheRange(range, cached, + availableDataRange); assert maxCacheRange.isSubsetOf(availableDataRange); |