dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/data/ItemFileReadStore.js.uncompressed.js

@@ -1,43 +1,41 @@
-define("dojo/data/ItemFileReadStore", ["../_base/kernel", "../_base/lang", "../_base/declare", "../_base/array", "../_base/xhr", 
-	"../Evented", "../_base/window", "./util/filter", "./util/simpleFetch", "../date/stamp"
-], function(kernel, lang, declare, array, xhr, Evented, window, filterUtil, simpleFetch, dateStamp) {
-	// module:
-	//		dojo/data/ItemFileReadStore
-	// summary:
-	//		TODOC
+define("dojo/data/ItemFileReadStore", ["../_base/kernel", "../_base/lang", "../_base/declare", "../_base/array", "../_base/xhr",
+	"../Evented", "./util/filter", "./util/simpleFetch", "../date/stamp"
+], function(kernel, lang, declare, array, xhr, Evented, filterUtil, simpleFetch, dateStamp){
 
+// module:
+//		dojo/data/ItemFileReadStore
 
 var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
-	//	summary:
-	//		The ItemFileReadStore implements the dojo.data.api.Read API and reads
+	// summary:
+	//		The ItemFileReadStore implements the dojo/data/api/Read API and reads
 	//		data from JSON files that have contents in this format --
-	//		{ items: [
-	//			{ name:'Kermit', color:'green', age:12, friends:['Gonzo', {_reference:{name:'Fozzie Bear'}}]},
-	//			{ name:'Fozzie Bear', wears:['hat', 'tie']},
-	//			{ name:'Miss Piggy', pets:'Foo-Foo'}
-	//		]}
-	//		Note that it can also contain an 'identifer' property that specified which attribute on the items
+	// |	{ items: [
+	// |		{ name:'Kermit', color:'green', age:12, friends:['Gonzo', {_reference:{name:'Fozzie Bear'}}]},
+	// |		{ name:'Fozzie Bear', wears:['hat', 'tie']},
+	// |		{ name:'Miss Piggy', pets:'Foo-Foo'}
+	// |	]}
+	//		Note that it can also contain an 'identifier' property that specified which attribute on the items
 	//		in the array of items that acts as the unique identifier for that item.
-	//
+
 	constructor: function(/* Object */ keywordParameters){
-		//	summary: constructor
-		//	keywordParameters: {url: String}
-		//	keywordParameters: {data: jsonObject}
-		//	keywordParameters: {typeMap: object)
+		// summary:
+		//		constructor
+		// keywordParameters:
+		//		{url: String} {data: jsonObject} {typeMap: object}
 		//		The structure of the typeMap object is as follows:
-		//		{
-		//			type0: function || object,
-		//			type1: function || object,
-		//			...
-		//			typeN: function || object
-		//		}
+		// |	{
+		// |		type0: function || object,
+		// |		type1: function || object,
+		// |		...
+		// |		typeN: function || object
+		// |	}
 		//		Where if it is a function, it is assumed to be an object constructor that takes the
 		//		value of _value as the initialization parameters.  If it is an object, then it is assumed
 		//		to be an object of general form:
-		//		{
-		//			type: function, //constructor.
-		//			deserialize:	function(value) //The function that parses the value and constructs the object defined by type appropriately.
-		//		}
+		// |	{
+		// |		type: function, //constructor.
+		// |		deserialize:	function(value) //The function that parses the value and constructs the object defined by type appropriately.
+		// |	}
 
 		this._arrayOfAllItems = [];
 		this._arrayOfTopLevelItems = [];
@@ -50,14 +48,14 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		this._datatypeMap = keywordParameters.typeMap || {};
 		if(!this._datatypeMap['Date']){
 			//If no default mapping for dates, then set this as default.
-			//We use the dojo.date.stamp here because the ISO format is the 'dojo way'
+			//We use the dojo/date/stamp here because the ISO format is the 'dojo way'
 			//of generically representing dates.
 			this._datatypeMap['Date'] = {
-											type: Date,
-											deserialize: function(value){
-												return dateStamp.fromISOString(value);
-											}
-										};
+				type: Date,
+				deserialize: function(value){
+					return dateStamp.fromISOString(value);
+				}
+			};
 		}
 		this._features = {'dojo.data.api.Read':true, 'dojo.data.api.Identity':true};
 		this._itemsByIdentity = null;
@@ -91,60 +89,64 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 
 	typeMap: null, //Define so parser can populate.
 
-	//Parameter to allow users to specify if a close call should force a reload or not.
-	//By default, it retains the old behavior of not clearing if close is called.  But
-	//if set true, the store will be reset to default state.  Note that by doing this,
-	//all item handles will become invalid and a new fetch must be issued.
+	// clearOnClose: Boolean
+	//		Parameter to allow users to specify if a close call should force a reload or not.
+	//		By default, it retains the old behavior of not clearing if close is called.  But
+	//		if set true, the store will be reset to default state.  Note that by doing this,
+	//		all item handles will become invalid and a new fetch must be issued.
 	clearOnClose: false,
 
-	//Parameter to allow specifying if preventCache should be passed to the xhrGet call or not when loading data from a url.
-	//Note this does not mean the store calls the server on each fetch, only that the data load has preventCache set as an option.
-	//Added for tracker: #6072
+	// urlPreventCache: Boolean
+	//		Parameter to allow specifying if preventCache should be passed to the xhrGet call or not when loading data from a url.
+	//		Note this does not mean the store calls the server on each fetch, only that the data load has preventCache set as an option.
+	//		Added for tracker: #6072
 	urlPreventCache: false,
 
-	//Parameter for specifying that it is OK for the xhrGet call to fail silently.
+	// failOk: Boolean
+	//		Parameter for specifying that it is OK for the xhrGet call to fail silently.
 	failOk: false,
 
-	//Parameter to indicate to process data from the url as hierarchical
-	//(data items can contain other data items in js form).  Default is true
-	//for backwards compatibility.  False means only root items are processed
-	//as items, all child objects outside of type-mapped objects and those in
-	//specific reference format, are left straight JS data objects.
+	// hierarchical: Boolean
+	//		Parameter to indicate to process data from the url as hierarchical
+	//		(data items can contain other data items in js form).  Default is true
+	//		for backwards compatibility.  False means only root items are processed
+	//		as items, all child objects outside of type-mapped objects and those in
+	//		specific reference format, are left straight JS data objects.
 	hierarchical: true,
 
-	_assertIsItem: function(/* item */ item){
-		//	summary:
+	_assertIsItem: function(/* dojo/data/api/Item */ item){
+		// summary:
 		//		This function tests whether the item passed in is indeed an item in the store.
-		//	item:
+		// item:
 		//		The item to test for being contained by the store.
 		if(!this.isItem(item)){
-			throw new Error("dojo.data.ItemFileReadStore: Invalid item argument.");
+			throw new Error(this.declaredClass + ": Invalid item argument.");
 		}
 	},
 
 	_assertIsAttribute: function(/* attribute-name-string */ attribute){
-		//	summary:
+		// summary:
 		//		This function tests whether the item passed in is indeed a valid 'attribute' like type for the store.
-		//	attribute:
+		// attribute:
 		//		The attribute to test for being contained by the store.
 		if(typeof attribute !== "string"){
-			throw new Error("dojo.data.ItemFileReadStore: Invalid attribute argument.");
+			throw new Error(this.declaredClass + ": Invalid attribute argument.");
 		}
 	},
 
-	getValue: function(	/* item */ item,
-						/* attribute-name-string */ attribute,
-						/* value? */ defaultValue){
-		//	summary:
-		//		See dojo.data.api.Read.getValue()
+	getValue: function(	/* dojo/data/api/Item */ item,
+						   /* attribute-name-string */ attribute,
+						   /* value? */ defaultValue){
+		// summary:
+		//		See dojo/data/api/Read.getValue()
 		var values = this.getValues(item, attribute);
 		return (values.length > 0)?values[0]:defaultValue; // mixed
 	},
 
-	getValues: function(/* item */ item,
+	getValues: function(/* dojo/data/api/Item */ item,
 						/* attribute-name-string */ attribute){
-		//	summary:
-		//		See dojo.data.api.Read.getValues()
+		// summary:
+		//		See dojo/data/api/Read.getValues()
 
 		this._assertIsItem(item);
 		this._assertIsAttribute(attribute);
@@ -152,9 +154,9 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		return (item[attribute] || []).slice(0); // Array
 	},
 
-	getAttributes: function(/* item */ item){
-		//	summary:
-		//		See dojo.data.api.Read.getAttributes()
+	getAttributes: function(/* dojo/data/api/Item */ item){
+		// summary:
+		//		See dojo/data/api/Read.getAttributes()
 		this._assertIsItem(item);
 		var attributes = [];
 		for(var key in item){
@@ -166,20 +168,20 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		return attributes; // Array
 	},
 
-	hasAttribute: function(	/* item */ item,
-							/* attribute-name-string */ attribute){
-		//	summary:
-		//		See dojo.data.api.Read.hasAttribute()
+	hasAttribute: function(	/* dojo/data/api/Item */ item,
+							   /* attribute-name-string */ attribute){
+		// summary:
+		//		See dojo/data/api/Read.hasAttribute()
 		this._assertIsItem(item);
 		this._assertIsAttribute(attribute);
 		return (attribute in item);
 	},
 
-	containsValue: function(/* item */ item,
+	containsValue: function(/* dojo/data/api/Item */ item,
 							/* attribute-name-string */ attribute,
 							/* anything */ value){
-		//	summary:
-		//		See dojo.data.api.Read.containsValue()
+		// summary:
+		//		See dojo/data/api/Read.containsValue()
 		var regexp = undefined;
 		if(typeof value === "string"){
 			regexp = filterUtil.patternToRegExp(value, false);
@@ -187,24 +189,23 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		return this._containsValue(item, attribute, value, regexp); //boolean.
 	},
 
-	_containsValue: function(	/* item */ item,
-								/* attribute-name-string */ attribute,
-								/* anything */ value,
-								/* RegExp?*/ regexp){
-		//	summary:
+	_containsValue: function(	/* dojo/data/api/Item */ item,
+								 /* attribute-name-string */ attribute,
+								 /* anything */ value,
+								 /* RegExp?*/ regexp){
+		// summary:
 		//		Internal function for looking at the values contained by the item.
-		//	description:
+		// description:
 		//		Internal function for looking at the values contained by the item.  This
 		//		function allows for denoting if the comparison should be case sensitive for
 		//		strings or not (for handling filtering cases where string case should not matter)
-		//
-		//	item:
+		// item:
 		//		The data item to examine for attribute values.
-		//	attribute:
+		// attribute:
 		//		The attribute to inspect.
-		//	value:
+		// value:
 		//		The value to match.
-		//	regexp:
+		// regexp:
 		//		Optional regular expression generated off value if value was of string type to handle wildcarding.
 		//		If present and attribute values are string, then it can be used for comparison instead of 'value'
 		return array.some(this.getValues(item, attribute), function(possibleValue){
@@ -219,8 +220,8 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 	},
 
 	isItem: function(/* anything */ something){
-		//	summary:
-		//		See dojo.data.api.Read.isItem()
+		// summary:
+		//		See dojo/data/api/Read.isItem()
 		if(something && something[this._storeRefPropName] === this){
 			if(this._arrayOfAllItems[something[this._itemNumPropName]] === something){
 				return true;
@@ -230,101 +231,105 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 	},
 
 	isItemLoaded: function(/* anything */ something){
-		//	summary:
-		//		See dojo.data.api.Read.isItemLoaded()
+		// summary:
+		//		See dojo/data/api/Read.isItemLoaded()
 		return this.isItem(something); //boolean
 	},
 
 	loadItem: function(/* object */ keywordArgs){
-		//	summary:
-		//		See dojo.data.api.Read.loadItem()
+		// summary:
+		//		See dojo/data/api/Read.loadItem()
 		this._assertIsItem(keywordArgs.item);
 	},
 
 	getFeatures: function(){
-		//	summary:
-		//		See dojo.data.api.Read.getFeatures()
+		// summary:
+		//		See dojo/data/api/Read.getFeatures()
 		return this._features; //Object
 	},
 
-	getLabel: function(/* item */ item){
-		//	summary:
-		//		See dojo.data.api.Read.getLabel()
+	getLabel: function(/* dojo/data/api/Item */ item){
+		// summary:
+		//		See dojo/data/api/Read.getLabel()
 		if(this._labelAttr && this.isItem(item)){
 			return this.getValue(item,this._labelAttr); //String
 		}
 		return undefined; //undefined
 	},
 
-	getLabelAttributes: function(/* item */ item){
-		//	summary:
-		//		See dojo.data.api.Read.getLabelAttributes()
+	getLabelAttributes: function(/* dojo/data/api/Item */ item){
+		// summary:
+		//		See dojo/data/api/Read.getLabelAttributes()
 		if(this._labelAttr){
 			return [this._labelAttr]; //array
 		}
 		return null; //null
 	},
 
-	_fetchItems: function(	/* Object */ keywordArgs,
-							/* Function */ findCallback,
-							/* Function */ errorCallback){
-		//	summary:
-		//		See dojo.data.util.simpleFetch.fetch()
-		var self = this,
-		    filter = function(requestArgs, arrayOfItems){
-			var items = [],
-			    i, key;
-			if(requestArgs.query){
-				var value,
-				    ignoreCase = requestArgs.queryOptions ? requestArgs.queryOptions.ignoreCase : false;
-
-				//See if there are any string values that can be regexp parsed first to avoid multiple regexp gens on the
-				//same value for each item examined.  Much more efficient.
-				var regexpList = {};
-				for(key in requestArgs.query){
-					value = requestArgs.query[key];
-					if(typeof value === "string"){
-						regexpList[key] = filterUtil.patternToRegExp(value, ignoreCase);
-					}else if(value instanceof RegExp){
-						regexpList[key] = value;
-					}
+	filter: function(/* Object */ requestArgs, /* item[] */ arrayOfItems, /* Function */ findCallback){
+		// summary:
+		//		This method handles the basic filtering needs for ItemFile* based stores.
+		var items = [],
+			i, key;
+
+		if(requestArgs.query){
+			var value,
+				ignoreCase = requestArgs.queryOptions ? requestArgs.queryOptions.ignoreCase : false;
+
+			//See if there are any string values that can be regexp parsed first to avoid multiple regexp gens on the
+			//same value for each item examined.  Much more efficient.
+			var regexpList = {};
+			for(key in requestArgs.query){
+				value = requestArgs.query[key];
+				if(typeof value === "string"){
+					regexpList[key] = filterUtil.patternToRegExp(value, ignoreCase);
+				}else if(value instanceof RegExp){
+					regexpList[key] = value;
 				}
-				for(i = 0; i < arrayOfItems.length; ++i){
-					var match = true;
-					var candidateItem = arrayOfItems[i];
-					if(candidateItem === null){
-						match = false;
-					}else{
-						for(key in requestArgs.query){
-							value = requestArgs.query[key];
-							if(!self._containsValue(candidateItem, key, value, regexpList[key])){
-								match = false;
-							}
+			}
+			for(i = 0; i < arrayOfItems.length; ++i){
+				var match = true;
+				var candidateItem = arrayOfItems[i];
+				if(candidateItem === null){
+					match = false;
+				}else{
+					for(key in requestArgs.query){
+						value = requestArgs.query[key];
+						if(!this._containsValue(candidateItem, key, value, regexpList[key])){
+							match = false;
 						}
 					}
-					if(match){
-						items.push(candidateItem);
-					}
 				}
-				findCallback(items, requestArgs);
-			}else{
-				// We want a copy to pass back in case the parent wishes to sort the array.
-				// We shouldn't allow resort of the internal list, so that multiple callers
-				// can get lists and sort without affecting each other.  We also need to
-				// filter out any null values that have been left as a result of deleteItem()
-				// calls in ItemFileWriteStore.
-				for(i = 0; i < arrayOfItems.length; ++i){
-					var item = arrayOfItems[i];
-					if(item !== null){
-						items.push(item);
-					}
+				if(match){
+					items.push(candidateItem);
+				}
+			}
+			findCallback(items, requestArgs);
+		}else{
+			// We want a copy to pass back in case the parent wishes to sort the array.
+			// We shouldn't allow resort of the internal list, so that multiple callers
+			// can get lists and sort without affecting each other.  We also need to
+			// filter out any null values that have been left as a result of deleteItem()
+			// calls in ItemFileWriteStore.
+			for(i = 0; i < arrayOfItems.length; ++i){
+				var item = arrayOfItems[i];
+				if(item !== null){
+					items.push(item);
 				}
-				findCallback(items, requestArgs);
 			}
-		};
+			findCallback(items, requestArgs);
+		}
+	},
+
+	_fetchItems: function(	/* Object */ keywordArgs,
+							  /* Function */ findCallback,
+							  /* Function */ errorCallback){
+		// summary:
+		//		See dojo/data/util.simpleFetch.fetch()
+		var self = this;
 
 		if(this._loadFinished){
-			filter(keywordArgs, this._getItemsArray(keywordArgs.queryOptions));
+			this.filter(keywordArgs, this._getItemsArray(keywordArgs.queryOptions), findCallback);
 		}else{
 			//Do a check on the JsonFileUrl and crosscheck it.
 			//If it doesn't match the cross-check, it needs to be updated
@@ -333,9 +338,9 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 			//compatibility.  People use _jsonFileUrl (even though officially
 			//private.
 			if(this._jsonFileUrl !== this._ccUrl){
-				kernel.deprecated("dojo.data.ItemFileReadStore: ",
+				kernel.deprecated(this.declaredClass + ": ",
 					"To change the url, set the url property of the store," +
-					" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+						" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 				this._ccUrl = this._jsonFileUrl;
 				this.url = this._jsonFileUrl;
 			}else if(this.url !== this._ccUrl){
@@ -354,15 +359,15 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 				//a load is in progress, we have to defer the fetching to be
 				//invoked in the callback.
 				if(this._loadInProgress){
-					this._queuedFetches.push({args: keywordArgs, filter: filter});
+					this._queuedFetches.push({args: keywordArgs, filter: lang.hitch(self, "filter"), findCallback: lang.hitch(self, findCallback)});
 				}else{
 					this._loadInProgress = true;
 					var getArgs = {
-							url: self._jsonFileUrl,
-							handleAs: "json-comment-optional",
-							preventCache: this.urlPreventCache,
-							failOk: this.failOk
-						};
+						url: self._jsonFileUrl,
+						handleAs: "json-comment-optional",
+						preventCache: this.urlPreventCache,
+						failOk: this.failOk
+					};
 					var getHandler = xhr.get(getArgs);
 					getHandler.addCallback(function(data){
 						try{
@@ -370,7 +375,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 							self._loadFinished = true;
 							self._loadInProgress = false;
 
-							filter(keywordArgs, self._getItemsArray(keywordArgs.queryOptions));
+							self.filter(keywordArgs, self._getItemsArray(keywordArgs.queryOptions), findCallback);
 							self._handleQueuedFetches();
 						}catch(e){
 							self._loadFinished = true;
@@ -407,27 +412,29 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 					this._loadFinished = true;
 					this._getItemsFromLoadedData(this._jsonData);
 					this._jsonData = null;
-					filter(keywordArgs, this._getItemsArray(keywordArgs.queryOptions));
+					self.filter(keywordArgs, this._getItemsArray(keywordArgs.queryOptions), findCallback);
 				}catch(e){
 					errorCallback(e, keywordArgs);
 				}
 			}else{
-				errorCallback(new Error("dojo.data.ItemFileReadStore: No JSON source data was provided as either URL or a nested Javascript object."), keywordArgs);
+				errorCallback(new Error(this.declaredClass + ": No JSON source data was provided as either URL or a nested Javascript object."), keywordArgs);
 			}
 		}
 	},
 
 	_handleQueuedFetches: function(){
-		//	summary:
+		// summary:
 		//		Internal function to execute delayed request in the store.
+		
 		//Execute any deferred fetches now.
 		if(this._queuedFetches.length > 0){
 			for(var i = 0; i < this._queuedFetches.length; i++){
 				var fData = this._queuedFetches[i],
-				    delayedQuery = fData.args,
-				    delayedFilter = fData.filter;
+					delayedQuery = fData.args,
+					delayedFilter = fData.filter,
+					delayedFindCallback = fData.findCallback;
 				if(delayedFilter){
-					delayedFilter(delayedQuery, this._getItemsArray(delayedQuery.queryOptions));
+					delayedFilter(delayedQuery, this._getItemsArray(delayedQuery.queryOptions), delayedFindCallback);
 				}else{
 					this.fetchItemByIdentity(delayedQuery);
 				}
@@ -437,58 +444,56 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 	},
 
 	_getItemsArray: function(/*object?*/queryOptions){
-		//	summary:
+		// summary:
 		//		Internal function to determine which list of items to search over.
-		//	queryOptions: The query options parameter, if any.
+		// queryOptions: The query options parameter, if any.
 		if(queryOptions && queryOptions.deep){
 			return this._arrayOfAllItems;
 		}
 		return this._arrayOfTopLevelItems;
 	},
 
-	close: function(/*dojo.data.api.Request || keywordArgs || null */ request){
-		 //	summary:
-		 //		See dojo.data.api.Read.close()
-		 if(this.clearOnClose &&
+	close: function(/*dojo/data/api/Request|Object?*/ request){
+		// summary:
+		//		See dojo/data/api/Read.close()
+		if(this.clearOnClose &&
 			this._loadFinished &&
 			!this._loadInProgress){
-			 //Reset all internalsback to default state.  This will force a reload
-			 //on next fetch.  This also checks that the data or url param was set
-			 //so that the store knows it can get data.  Without one of those being set,
-			 //the next fetch will trigger an error.
+			//Reset all internalsback to default state.  This will force a reload
+			//on next fetch.  This also checks that the data or url param was set
+			//so that the store knows it can get data.  Without one of those being set,
+			//the next fetch will trigger an error.
 
-			 if(((this._jsonFileUrl == "" || this._jsonFileUrl == null) &&
-				 (this.url == "" || this.url == null)
+			if(((this._jsonFileUrl == "" || this._jsonFileUrl == null) &&
+				(this.url == "" || this.url == null)
 				) && this.data == null){
-				 console.debug("dojo.data.ItemFileReadStore: WARNING!  Data reload " +
+				console.debug(this.declaredClass + ": WARNING!  Data reload " +
 					" information has not been provided." +
 					"  Please set 'url' or 'data' to the appropriate value before" +
 					" the next fetch");
-			 }
-			 this._arrayOfAllItems = [];
-			 this._arrayOfTopLevelItems = [];
-			 this._loadFinished = false;
-			 this._itemsByIdentity = null;
-			 this._loadInProgress = false;
-			 this._queuedFetches = [];
-		 }
+			}
+			this._arrayOfAllItems = [];
+			this._arrayOfTopLevelItems = [];
+			this._loadFinished = false;
+			this._itemsByIdentity = null;
+			this._loadInProgress = false;
+			this._queuedFetches = [];
+		}
 	},
 
 	_getItemsFromLoadedData: function(/* Object */ dataObject){
-		//	summary:
+		// summary:
 		//		Function to parse the loaded data into item format and build the internal items array.
-		//	description:
+		// description:
 		//		Function to parse the loaded data into item format and build the internal items array.
-		//
-		//	dataObject:
+		// dataObject:
 		//		The JS data object containing the raw data to convery into item format.
-		//
-		// 	returns: array
+		// returns: Array
 		//		Array of items in store item format.
 
 		// First, we define a couple little utility functions...
 		var addingArrays = false,
-		    self = this;
+			self = this;
 
 		function valueIsAnItem(/* anything */ aValue){
 			// summary:
@@ -515,7 +520,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 				self.hierarchical;
 		}
 
-		function addItemAndSubItemsToArrayOfAllItems(/* Item */ anItem){
+		function addItemAndSubItemsToArrayOfAllItems(/* dojo/data/api/Item */ anItem){
 			self._arrayOfAllItems.push(anItem);
 			for(var attribute in anItem){
 				var valueForAttribute = anItem[attribute];
@@ -545,7 +550,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 
 		// Step 1: Walk through the object hierarchy and build a list of all items
 		var i,
-		    item;
+			item;
 		this._arrayOfAllItems = [];
 		this._arrayOfTopLevelItems = dataObject.items;
 
@@ -567,7 +572,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		// We also store the attribute names so we can validate our store
 		// reference and item id special properties for the O(1) isItem
 		var allAttributeNames = {},
-		    key;
+			key;
 
 		for(i = 0; i < this._arrayOfAllItems.length; ++i){
 			item = this._arrayOfAllItems[i];
@@ -616,9 +621,9 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 					this._itemsByIdentity[identity] = item;
 				}else{
 					if(this._jsonFileUrl){
-						throw new Error("dojo.data.ItemFileReadStore:  The json data as specified by: [" + this._jsonFileUrl + "] is malformed.  Items within the list have identifier: [" + identifier + "].  Value collided: [" + identity + "]");
+						throw new Error(this.declaredClass + ":  The json data as specified by: [" + this._jsonFileUrl + "] is malformed.  Items within the list have identifier: [" + identifier + "].  Value collided: [" + identity + "]");
 					}else if(this._jsonData){
-						throw new Error("dojo.data.ItemFileReadStore:  The json data provided by the creation arguments is malformed.  Items within the list have identifier: [" + identifier + "].  Value collided: [" + identity + "]");
+						throw new Error(this.declaredClass + ":  The json data provided by the creation arguments is malformed.  Items within the list have identifier: [" + identifier + "].  Value collided: [" + identity + "]");
 					}
 				}
 			}
@@ -680,7 +685,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 								// from an item like: { name:['Kermit'], friends:[{_reference:{name:'Miss Piggy'}}] }
 								for(var k = 0; k < this._arrayOfAllItems.length; ++k){
 									var candidateItem = this._arrayOfAllItems[k],
-									    found = true;
+										found = true;
 									for(var refKey in referenceDescription){
 										if(candidateItem[refKey] != referenceDescription[refKey]){
 											found = false;
@@ -712,42 +717,42 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 	},
 
 	_addReferenceToMap: function(/*item*/ refItem, /*item*/ parentItem, /*string*/ attribute){
-		 //	summary:
-		 //		Method to add an reference map entry for an item and attribute.
-		 //	description:
-		 //		Method to add an reference map entry for an item and attribute. 		 //
-		 //	refItem:
-		 //		The item that is referenced.
-		 //	parentItem:
-		 //		The item that holds the new reference to refItem.
-		 //	attribute:
-		 //		The attribute on parentItem that contains the new reference.
-
-		 //Stub function, does nothing.  Real processing is in ItemFileWriteStore.
+		// summary:
+		//		Method to add an reference map entry for an item and attribute.
+		// description:
+		//		Method to add an reference map entry for an item and attribute.
+		// refItem:
+		//		The item that is referenced.
+		// parentItem:
+		//		The item that holds the new reference to refItem.
+		// attribute:
+		//		The attribute on parentItem that contains the new reference.
+
+		//Stub function, does nothing.  Real processing is in ItemFileWriteStore.
 	},
 
-	getIdentity: function(/* item */ item){
-		//	summary:
-		//		See dojo.data.api.Identity.getIdentity()
+	getIdentity: function(/* dojo/data/api/Item */ item){
+		// summary:
+		//		See dojo/data/api/Identity.getIdentity()
 		var identifier = this._features['dojo.data.api.Identity'];
 		if(identifier === Number){
 			return item[this._itemNumPropName]; // Number
 		}else{
 			var arrayOfValues = item[identifier];
 			if(arrayOfValues){
-				return arrayOfValues[0]; // Object || String
+				return arrayOfValues[0]; // Object|String
 			}
 		}
 		return null; // null
 	},
 
 	fetchItemByIdentity: function(/* Object */ keywordArgs){
-		//	summary:
-		//		See dojo.data.api.Identity.fetchItemByIdentity()
+		// summary:
+		//		See dojo/data/api/Identity.fetchItemByIdentity()
 
 		// Hasn't loaded yet, we have to trigger the load.
 		var item,
-		    scope;
+			scope;
 		if(!this._loadFinished){
 			var self = this;
 			//Do a check on the JsonFileUrl and crosscheck it.
@@ -757,9 +762,9 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 			//compatibility.  People use _jsonFileUrl (even though officially
 			//private.
 			if(this._jsonFileUrl !== this._ccUrl){
-				kernel.deprecated("dojo.data.ItemFileReadStore: ",
+				kernel.deprecated(this.declaredClass + ": ",
 					"To change the url, set the url property of the store," +
-					" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+						" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 				this._ccUrl = this._jsonFileUrl;
 				this.url = this._jsonFileUrl;
 			}else if(this.url !== this._ccUrl){
@@ -780,14 +785,14 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 				}else{
 					this._loadInProgress = true;
 					var getArgs = {
-							url: self._jsonFileUrl,
-							handleAs: "json-comment-optional",
-							preventCache: this.urlPreventCache,
-							failOk: this.failOk
+						url: self._jsonFileUrl,
+						handleAs: "json-comment-optional",
+						preventCache: this.urlPreventCache,
+						failOk: this.failOk
 					};
 					var getHandler = xhr.get(getArgs);
 					getHandler.addCallback(function(data){
-						var scope = keywordArgs.scope?keywordArgs.scope:window.global;
+						var scope = keywordArgs.scope?keywordArgs.scope:kernel.global;
 						try{
 							self._getItemsFromLoadedData(data);
 							self._loadFinished = true;
@@ -807,7 +812,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 					getHandler.addErrback(function(error){
 						self._loadInProgress = false;
 						if(keywordArgs.onError){
-							var scope = keywordArgs.scope?keywordArgs.scope:window.global;
+							var scope = keywordArgs.scope?keywordArgs.scope:kernel.global;
 							keywordArgs.onError.call(scope, error);
 						}
 					});
@@ -820,7 +825,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 				self._loadFinished = true;
 				item = self._getItemByIdentity(keywordArgs.identity);
 				if(keywordArgs.onItem){
-					scope = keywordArgs.scope?keywordArgs.scope:window.global;
+					scope = keywordArgs.scope?keywordArgs.scope:kernel.global;
 					keywordArgs.onItem.call(scope, item);
 				}
 			}
@@ -828,14 +833,14 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 			// Already loaded.  We can just look it up and call back.
 			item = this._getItemByIdentity(keywordArgs.identity);
 			if(keywordArgs.onItem){
-				scope = keywordArgs.scope?keywordArgs.scope:window.global;
+				scope = keywordArgs.scope?keywordArgs.scope:kernel.global;
 				keywordArgs.onItem.call(scope, item);
 			}
 		}
 	},
 
 	_getItemByIdentity: function(/* Object */ identity){
-		//	summary:
+		// summary:
 		//		Internal function to look an item up by its identity map.
 		var item = null;
 		if(this._itemsByIdentity){
@@ -853,14 +858,14 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		return item; // Object
 	},
 
-	getIdentityAttributes: function(/* item */ item){
-		//	summary:
-		//		See dojo.data.api.Identity.getIdentityAttributes()
+	getIdentityAttributes: function(/* dojo/data/api/Item */ item){
+		// summary:
+		//		See dojo/data/api/Identity.getIdentityAttributes()
 
 		var identifier = this._features['dojo.data.api.Identity'];
 		if(identifier === Number){
 			// If (identifier === Number) it means getIdentity() just returns
-			// an integer item-number for each item.  The dojo.data.api.Identity
+			// an integer item-number for each item.  The dojo/data/api/Identity
 			// spec says we need to return null if the identity is not composed
 			// of attributes
 			return null; // null
@@ -870,7 +875,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 	},
 
 	_forceLoad: function(){
-		//	summary:
+		// summary:
 		//		Internal function to force a load of the store if it hasn't occurred yet.  This is required
 		//		for specific functions to work properly.
 		var self = this;
@@ -881,9 +886,9 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		//compatibility.  People use _jsonFileUrl (even though officially
 		//private.
 		if(this._jsonFileUrl !== this._ccUrl){
-			kernel.deprecated("dojo.data.ItemFileReadStore: ",
+			kernel.deprecated(this.declaredClass + ": ",
 				"To change the url, set the url property of the store," +
-				" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+					" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 			this._ccUrl = this._jsonFileUrl;
 			this.url = this._jsonFileUrl;
 		}else if(this.url !== this._ccUrl){
@@ -898,13 +903,13 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 		}
 
 		if(this._jsonFileUrl){
-				var getArgs = {
-					url: this._jsonFileUrl,
-					handleAs: "json-comment-optional",
-					preventCache: this.urlPreventCache,
-					failOk: this.failOk,
-					sync: true
-				};
+			var getArgs = {
+				url: this._jsonFileUrl,
+				handleAs: "json-comment-optional",
+				preventCache: this.urlPreventCache,
+				failOk: this.failOk,
+				sync: true
+			};
 			var getHandler = xhr.get(getArgs);
 			getHandler.addCallback(function(data){
 				try{
@@ -921,7 +926,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 						//Okay, we hit an error state we can't recover from.  A forced load occurred
 						//while an async load was occurring.  Since we cannot block at this point, the best
 						//that can be managed is to throw an error.
-						throw new Error("dojo.data.ItemFileReadStore:  Unable to perform a synchronous load, an async load is in progress.");
+						throw new Error(this.declaredClass + ":  Unable to perform a synchronous load, an async load is in progress.");
 					}
 				}catch(e){
 					console.log(e);
@@ -942,4 +947,5 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
 lang.extend(ItemFileReadStore,simpleFetch);
 
 return ItemFileReadStore;
+
 });