assorted DnD and pref layout fixes

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/CheckBoxTree.js b/lib/CheckBoxTree.js
index 35e7039ba..fb532801c 100644
--- a/lib/CheckBoxTree.js
+++ b/lib/CheckBoxTree.js
@@ -104,9 +104,10 @@ dojo.declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
 		//	| var currState = model.getCheckboxState(item);
 		//		
 		var currState = undefined;
-		
+	
 		// Special handling required for the 'fake' root entry (the root is NOT a dojo.data.item).
-		if ( storeItem == this.root ) {
+		// this stuff is only relevant for Forest store -fox
+/*		if ( storeItem == this.root ) {
 			if( typeof(storeItem.checkbox) == "undefined" ) {
 				this.root.checkbox = undefined;		// create a new checbox reference as undefined.
 				if( this.checkboxRoot ) {
@@ -121,7 +122,14 @@ dojo.declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
 				this._setCheckboxState( storeItem, this.checkboxState );
 				currState = this.checkboxState;
 			}
+		} */
+
+		currState = this.store.getValue(storeItem, this.checkboxIdent);
+		if( currState == undefined && this.checkboxAll) {
+			this._setCheckboxState( storeItem, this.checkboxState );
+			currState = this.checkboxState;
 		}
+
 		return currState  // the current state of the checkbox (true/false or undefined)
 	},