Fix dojo#519: Ensure OnDemandList displays noDataMessage for async st…

…ores
GordonSmith · Apr 10, 2013 · d0e680f · d0e680f
1 parent 08dc0eb
commit d0e680f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,11 @@ This document outlines changes since 0.3.0.  For older changelogs, see the
 
 ## Significant changes
 
+### General/Core
+
+* Fixed a regression (present since 0.3.5) in `OnDemandList` which prevented
+  `noDataMessage` from being displayed for async stores. (#519)
+
 ### Extensions
 
 * Fixed a regression in the `ColumnResizer` extension where columns were no

diff --git a/OnDemandList.js b/OnDemandList.js
@@ -158,7 +158,9 @@ return declare([List, _StoreMixin], {
 
 		// Render the result set
 		Deferred.when(self.renderArray(results, preloadNode, options), function(trs){
-			return Deferred.when(results.total || results.length, function(total){
+			var total = typeof results.total === "undefined" ?
+				results.length : results.total;
+			return Deferred.when(total, function(total){
 				// remove loading node
 				put(loadingNode, "!");
 				// now we need to adjust the height and total count based on the first result set