[Pkg-javascript-commits] [dojo] 05/23: Only set idProperty if identifier provided, fixes #17557

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.9.4
in repository dojo.

commit 9ecce2c040bde3ca49c95bb5f2aabb5fe7f1b0ef
Author: Kris Zyp <kriszyp at gmail.com>
Date:   Mon Nov 25 06:38:53 2013 -0700

    Only set idProperty if identifier provided, fixes #17557
    
    (cherry picked from commit 5c86aadf89e576075dfb27898a7897112751edad)
---
 store/Memory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/store/Memory.js b/store/Memory.js
index e135a4e..c5fa356 100644
--- a/store/Memory.js
+++ b/store/Memory.js
@@ -149,7 +149,7 @@ return declare("dojo.store.Memory", base, {
 		//		An array of objects to use as the source of data.
 		if(data.items){
 			// just for convenience with the data format IFRS expects
-			this.idProperty = data.identifier;
+			this.idProperty = data.identifier || this.idProperty;
 			data = this.data = data.items;
 		}else{
 			this.data = data;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git