dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/colors.js

@@ -6,7 +6,8 @@
 
 //>>built
 define("dojo/colors",["./_base/kernel","./_base/lang","./_base/Color","./_base/array"],function(_1,_2,_3,_4){
-var _5=_2.getObject("dojo.colors",true);
+var _5={};
+_2.setObject("dojo.colors",_5);
 var _6=function(m1,m2,h){
 if(h<0){
 ++h;

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

@@ -1,20 +1,18 @@
-define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_base/array"], function(dojo, lang, Color, ArrayUtil) {
+define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_base/array"], function(dojo, lang, Color, ArrayUtil){
 	// module:
 	//		dojo/colors
-	// summary:
-	//		TODOC
 
-	var ColorExt = lang.getObject("dojo.colors", true);
+	/*=====
+	return {
+		// summary:
+		//		Color utilities, extending Base dojo.Color
+	};
+	=====*/
 
-//TODO: this module appears to break naming conventions
+	var ColorExt = {};
+	lang.setObject("dojo.colors", ColorExt);
 
-/*=====
-	lang.mixin(dojo, {
-		colors: {
-			// summary: Color utilities, extending Base dojo.Color
-		}
-	});
-=====*/
+//TODO: this module appears to break naming conventions
 
 	// this is a standard conversion prescribed by the CSS3 Color Module
 	var hue2rgb = function(m1, m2, h){
@@ -27,7 +25,7 @@ define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_ba
 		return m1;
 	};
 	// Override base Color.fromRgb with the impl in this module
-	dojo.colorFromRgb = Color.fromRgb = function(/*String*/ color, /*dojo.Color?*/ obj){
+	dojo.colorFromRgb = Color.fromRgb = function(/*String*/ color, /*dojo/_base/Color?*/ obj){
 		// summary:
 		//		get rgb(a) array from css-style color declarations
 		// description:
@@ -44,9 +42,9 @@ define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_ba
 						return parseFloat(x) * 2.56;
 					});
 					if(l == 4){ a[3] = c[3]; }
-					return Color.fromArray(a, obj); // dojo.Color
+					return Color.fromArray(a, obj); // dojo/_base/Color
 				}
-				return Color.fromArray(c, obj); // dojo.Color
+				return Color.fromArray(c, obj); // dojo/_base/Color
 			}
 			if((t == "hsl" && l == 3) || (t == "hsla" && l == 4)){
 				// normalize hsl values
@@ -64,10 +62,10 @@ define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_ba
 					1
 				];
 				if(l == 4){ a[3] = c[3]; }
-				return Color.fromArray(a, obj); // dojo.Color
+				return Color.fromArray(a, obj); // dojo/_base/Color
 			}
 		}
-		return null;	// dojo.Color
+		return null;	// dojo/_base/Color
 	};
 
 	var confine = function(c, low, high){
@@ -79,18 +77,20 @@ define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_ba
 	};
 
 	Color.prototype.sanitize = function(){
-		// summary: makes sure that the object has correct attributes
+		// summary:
+		//		makes sure that the object has correct attributes
 		var t = this;
 		t.r = Math.round(confine(t.r, 0, 255));
 		t.g = Math.round(confine(t.g, 0, 255));
 		t.b = Math.round(confine(t.b, 0, 255));
 		t.a = confine(t.a, 0, 1);
-		return this;	// dojo.Color
+		return this;	// dojo/_base/Color
 	};
 
 	ColorExt.makeGrey = Color.makeGrey = function(/*Number*/ g, /*Number?*/ a){
-		// summary: creates a greyscale color with an optional alpha
-		return Color.fromArray([g, g, g, a]);	// dojo.Color
+		// summary:
+		//		creates a greyscale color with an optional alpha
+		return Color.fromArray([g, g, g, a]);	// dojo/_base/Color
 	};
 
 	// mixin all CSS3 named colors not already in _base, along with SVG 1.0 variant spellings
@@ -228,5 +228,5 @@ define("dojo/colors", ["./_base/kernel", "./_base/lang", "./_base/Color", "./_ba
 		"yellowgreen":	[154,205,50]
 	});
 
-	return Color;
+	return Color;	// TODO: return ColorExt, not Color
 });

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

@@ -1,55 +1,55 @@
-define("dojo/cookie", ["./_base/kernel", "./regexp"], function(dojo, regexp) {
-	// module:
-	//		dojo/cookie
-	// summary:
-	//		TODOC
+define("dojo/cookie", ["./_base/kernel", "./regexp"], function(dojo, regexp){
 
+// module:
+//		dojo/cookie
 
 /*=====
-dojo.__cookieProps = function(){
-	//	expires: Date|String|Number?
+var __cookieProps = {
+	// expires: Date|String|Number?
 	//		If a number, the number of days from today at which the cookie
 	//		will expire. If a date, the date past which the cookie will expire.
 	//		If expires is in the past, the cookie will be deleted.
 	//		If expires is omitted or is 0, the cookie will expire when the browser closes.
-	//	path: String?
+	// path: String?
 	//		The path to use for the cookie.
-	//	domain: String?
+	// domain: String?
 	//		The domain to use for the cookie.
-	//	secure: Boolean?
+	// secure: Boolean?
 	//		Whether to only send the cookie on secure connections
-	this.expires = expires;
-	this.path = path;
-	this.domain = domain;
-	this.secure = secure;
-}
+};
 =====*/
 
 
-dojo.cookie = function(/*String*/name, /*String?*/value, /*dojo.__cookieProps?*/props){
-	//	summary:
+dojo.cookie = function(/*String*/name, /*String?*/ value, /*__cookieProps?*/ props){
+	// summary:
 	//		Get or set a cookie.
-	//	description:
-	// 		If one argument is passed, returns the value of the cookie
-	// 		For two or more arguments, acts as a setter.
-	//	name:
+	// description:
+	//		If one argument is passed, returns the value of the cookie
+	//		For two or more arguments, acts as a setter.
+	// name:
 	//		Name of the cookie
-	//	value:
+	// value:
 	//		Value for the cookie
-	//	props:
+	// props:
 	//		Properties for the cookie
-	//	example:
+	// example:
 	//		set a cookie with the JSON-serialized contents of an object which
 	//		will expire 5 days from now:
-	//	|	dojo.cookie("configObj", dojo.toJson(config), { expires: 5 });
+	//	|	require(["dojo/cookie", "dojo/json"], function(cookie, json){
+	//	|		cookie("configObj", json.stringify(config, {expires: 5 }));
+	//	|	});
 	//
-	//	example:
+	// example:
 	//		de-serialize a cookie back into a JavaScript object:
-	//	|	var config = dojo.fromJson(dojo.cookie("configObj"));
+	//	|	require(["dojo/cookie", "dojo/json"], function(cookie, json){
+	//	|		config = json.parse(cookie("configObj"));
+	//	|	});
 	//
-	//	example:
+	// example:
 	//		delete a cookie:
-	//	|	dojo.cookie("configObj", null, {expires: -1});
+	//	|	require(["dojo/cookie"], function(cookie){
+	//	|		cookie("configObj", null, {expires: -1});
+	//	|	});
 	var c = document.cookie, ret;
 	if(arguments.length == 1){
 		var matches = c.match(new RegExp("(?:^|; )" + regexp.escapeString(name) + "=([^;]*)"));
@@ -78,7 +78,7 @@ dojo.cookie = function(/*String*/name, /*String?*/value, /*dojo.__cookieProps?*/
 };
 
 dojo.cookie.isSupported = function(){
-	//	summary:
+	// summary:
 	//		Use to determine if the current browser supports cookies or not.
 	//
 	//		Returns true if user allows cookies.

data/vendor/assets/javascripts/dojo/currency.js

@@ -5,28 +5,29 @@
 */
 
 //>>built
-define("dojo/currency",["./_base/kernel","./_base/lang","./_base/array","./number","./i18n","./i18n!./cldr/nls/currency","./cldr/monetary"],function(_1,_2,_3,_4,_5,_6,_7){
-_2.getObject("currency",true,_1);
-_1.currency._mixInDefaults=function(_8){
+define("dojo/currency",["./_base/array","./_base/lang","./number","./i18n","./i18n!./cldr/nls/currency","./cldr/monetary"],function(_1,_2,_3,_4,_5,_6){
+var _7={};
+_2.setObject("dojo.currency",_7);
+_7._mixInDefaults=function(_8){
 _8=_8||{};
 _8.type="currency";
-var _9=_5.getLocalization("dojo.cldr","currency",_8.locale)||{};
+var _9=_4.getLocalization("dojo.cldr","currency",_8.locale)||{};
 var _a=_8.currency;
-var _b=_7.getData(_a);
-_3.forEach(["displayName","symbol","group","decimal"],function(_c){
+var _b=_6.getData(_a);
+_1.forEach(["displayName","symbol","group","decimal"],function(_c){
 _b[_c]=_9[_a+"_"+_c];
 });
 _b.fractional=[true,false];
 return _2.mixin(_b,_8);
 };
-_1.currency.format=function(_d,_e){
-return _4.format(_d,_1.currency._mixInDefaults(_e));
+_7.format=function(_d,_e){
+return _3.format(_d,_7._mixInDefaults(_e));
 };
-_1.currency.regexp=function(_f){
-return _4.regexp(_1.currency._mixInDefaults(_f));
+_7.regexp=function(_f){
+return _3.regexp(_7._mixInDefaults(_f));
 };
-_1.currency.parse=function(_10,_11){
-return _4.parse(_10,_1.currency._mixInDefaults(_11));
+_7.parse=function(_10,_11){
+return _3.parse(_10,_7._mixInDefaults(_11));
 };
-return _1.currency;
+return _7;
 });

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

@@ -1,26 +1,30 @@
-define("dojo/currency", ["./_base/kernel", "./_base/lang", "./_base/array", "./number", "./i18n", "./i18n!./cldr/nls/currency", "./cldr/monetary"], function(dojo, lang, darray, dnumber, i18n, nlsCurrency, cldrMonetary) {
-	// module:
-	//		dojo/currency
+define("dojo/currency", [
+	"./_base/array",
+	"./_base/lang",
+	/*===== "./_base/declare", =====*/
+	"./number",
+	"./i18n", "./i18n!./cldr/nls/currency",
+	"./cldr/monetary"
+], function(darray, lang, /*===== declare, =====*/ dnumber, i18n, nlsCurrency, cldrMonetary){
+
+// module:
+//		dojo/currency
+
+var currency = {
 	// summary:
-	//		TODOC
-
-lang.getObject("currency", true, dojo);
-
-/*=====
-dojo.currency = {
-	// summary: localized formatting and parsing routines for currencies
-	//
-	// description: extends dojo.number to provide culturally-appropriate formatting of values
-	//	in various world currencies, including use of a currency symbol.  The currencies are specified
-	//	by a three-letter international symbol in all uppercase, and support for the currencies is
-	//	provided by the data in `dojo.cldr`.  The scripts generating dojo.cldr specify which
-	//	currency support is included.  A fixed number of decimal places is determined based
-	//	on the currency type and is not determined by the 'pattern' argument.  The fractional
-	//	portion is optional, by default, and variable length decimals are not supported.
-}
-=====*/
+	//		localized formatting and parsing routines for currencies
+	// description:
+	//		extends dojo.number to provide culturally-appropriate formatting of values
+	//		in various world currencies, including use of a currency symbol.  The currencies are specified
+	//		by a three-letter international symbol in all uppercase, and support for the currencies is
+	//		provided by the data in `dojo.cldr`.  The scripts generating dojo.cldr specify which
+	//		currency support is included.  A fixed number of decimal places is determined based
+	//		on the currency type and is not determined by the 'pattern' argument.  The fractional
+	//		portion is optional, by default, and variable length decimals are not supported.
+};
+lang.setObject("dojo.currency", currency);
 
-dojo.currency._mixInDefaults = function(options){
+currency._mixInDefaults = function(options){
 	options = options || {};
 	options.type = "currency";
 
@@ -42,16 +46,16 @@ dojo.currency._mixInDefaults = function(options){
 };
 
 /*=====
-dojo.declare("dojo.currency.__FormatOptions", [dojo.number.__FormatOptions], {
-	//	type: String?
+currency.__FormatOptions = declare([dnumber.__FormatOptions], {
+	// type: String?
 	//		Should not be set.  Value is assumed to be "currency".
-	//	symbol: String?
+	// symbol: String?
 	//		localized currency symbol. The default will be looked up in table of supported currencies in `dojo.cldr`
 	//		A [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code will be used if not found.
-	//	currency: String?
+	// currency: String?
 	//		an [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD".
 	//		For use with dojo.currency only.
-	//	places: Number?
+	// places: Number?
 	//		number of decimal places to show.  Default is defined based on which currency is used.
 	type: "",
 	symbol: "",
@@ -60,73 +64,67 @@ dojo.declare("dojo.currency.__FormatOptions", [dojo.number.__FormatOptions], {
 });
 =====*/
 
-dojo.currency.format = function(/*Number*/value, /*dojo.currency.__FormatOptions?*/options){
-// summary:
-//		Format a Number as a currency, using locale-specific settings
-//
-// description:
-//		Create a string from a Number using a known, localized pattern.
-//		[Formatting patterns](http://www.unicode.org/reports/tr35/#Number_Elements)
-//		appropriate to the locale are chosen from the [CLDR](http://unicode.org/cldr)
-//		as well as the appropriate symbols and delimiters and number of decimal places.
-//
-// value:
-//		the number to be formatted.
-
-	return dnumber.format(value, dojo.currency._mixInDefaults(options));
+currency.format = function(/*Number*/ value, /*__FormatOptions?*/ options){
+	// summary:
+	//		Format a Number as a currency, using locale-specific settings
+	//
+	// description:
+	//		Create a string from a Number using a known, localized pattern.
+	//		[Formatting patterns](http://www.unicode.org/reports/tr35/#Number_Elements)
+	//		appropriate to the locale are chosen from the [CLDR](http://unicode.org/cldr)
+	//		as well as the appropriate symbols and delimiters and number of decimal places.
+	//
+	// value:
+	//		the number to be formatted.
+
+	return dnumber.format(value, currency._mixInDefaults(options));
 };
 
-dojo.currency.regexp = function(/*dojo.number.__RegexpOptions?*/options){
-//
-// summary:
-//		Builds the regular needed to parse a currency value
-//
-// description:
-//		Returns regular expression with positive and negative match, group and decimal separators
-//		Note: the options.places default, the number of decimal places to accept, is defined by the currency type.
-	return dnumber.regexp(dojo.currency._mixInDefaults(options)); // String
+currency.regexp = function(/*dnumber.__RegexpOptions?*/ options){
+	//
+	// summary:
+	//		Builds the regular needed to parse a currency value
+	//
+	// description:
+	//		Returns regular expression with positive and negative match, group and decimal separators
+	//		Note: the options.places default, the number of decimal places to accept, is defined by the currency type.
+	return dnumber.regexp(currency._mixInDefaults(options)); // String
 };
 
 /*=====
-dojo.declare("dojo.currency.__ParseOptions", [dojo.number.__ParseOptions], {
-	//	type: String?
+var __ParseOptions = currency.__ParseOptions = declare(dnumber.__ParseOptions, {
+	// type: String?
 	//		Should not be set.  Value is assumed to be currency.
-	//	currency: String?
+	// currency: String?
 	//		an [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD".
 	//		For use with dojo.currency only.
-	//	symbol: String?
+	// symbol: String?
 	//		localized currency symbol. The default will be looked up in table of supported currencies in `dojo.cldr`
 	//		A [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code will be used if not found.
-	//	places: Number?
+	// places: Number?
 	//		fixed number of decimal places to accept.  The default is determined based on which currency is used.
-	//	fractional: Boolean?|Array?
+	// fractional: Boolean|Array?
 	//		Whether to include the fractional portion, where the number of decimal places are implied by the currency
 	//		or explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.
 	//		By default for currencies, it the fractional portion is optional.
-	type: "",
-	currency: "",
-	symbol: "",
-	places: "",
-	fractional: ""
 });
 =====*/
 
-dojo.currency.parse = function(/*String*/expression, /*dojo.currency.__ParseOptions?*/options){
+currency.parse = function(/*String*/ expression, /*__ParseOptions?*/ options){
 	//
 	// summary:
 	//		Convert a properly formatted currency string to a primitive Number,
 	//		using locale-specific settings.
-	//
 	// description:
 	//		Create a Number from a string using a known, localized pattern.
 	//		[Formatting patterns](http://www.unicode.org/reports/tr35/#Number_Format_Patterns)
 	//		are chosen appropriate to the locale, as well as the appropriate symbols and delimiters
 	//		and number of decimal places.
-	//
-	// expression: A string representation of a currency value
+	// expression:
+	//		A string representation of a currency value
 
-	return dnumber.parse(expression, dojo.currency._mixInDefaults(options));
+	return dnumber.parse(expression, currency._mixInDefaults(options));
 };
 
-return dojo.currency;
+return currency;
 });

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

@@ -5,20 +5,20 @@
 */
 
 //>>built
-define("dojo/data/ItemFileReadStore",["../_base/kernel","../_base/lang","../_base/declare","../_base/array","../_base/xhr","../Evented","../_base/window","./util/filter","./util/simpleFetch","../date/stamp"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a){
-var _b=_3("dojo.data.ItemFileReadStore",[_6],{constructor:function(_c){
+define("dojo/data/ItemFileReadStore",["../_base/kernel","../_base/lang","../_base/declare","../_base/array","../_base/xhr","../Evented","./util/filter","./util/simpleFetch","../date/stamp"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9){
+var _a=_3("dojo.data.ItemFileReadStore",[_6],{constructor:function(_b){
 this._arrayOfAllItems=[];
 this._arrayOfTopLevelItems=[];
 this._loadFinished=false;
-this._jsonFileUrl=_c.url;
-this._ccUrl=_c.url;
-this.url=_c.url;
-this._jsonData=_c.data;
+this._jsonFileUrl=_b.url;
+this._ccUrl=_b.url;
+this.url=_b.url;
+this._jsonData=_b.data;
 this.data=null;
-this._datatypeMap=_c.typeMap||{};
+this._datatypeMap=_b.typeMap||{};
 if(!this._datatypeMap["Date"]){
-this._datatypeMap["Date"]={type:Date,deserialize:function(_d){
-return _a.fromISOString(_d);
+this._datatypeMap["Date"]={type:Date,deserialize:function(_c){
+return _9.fromISOString(_c);
 }};
 }
 this._features={"dojo.data.api.Read":true,"dojo.data.api.Identity":true};
@@ -29,136 +29,136 @@ this._rootItemPropName="_RI";
 this._reverseRefMap="_RRM";
 this._loadInProgress=false;
 this._queuedFetches=[];
-if(_c.urlPreventCache!==undefined){
-this.urlPreventCache=_c.urlPreventCache?true:false;
+if(_b.urlPreventCache!==undefined){
+this.urlPreventCache=_b.urlPreventCache?true:false;
 }
-if(_c.hierarchical!==undefined){
-this.hierarchical=_c.hierarchical?true:false;
+if(_b.hierarchical!==undefined){
+this.hierarchical=_b.hierarchical?true:false;
 }
-if(_c.clearOnClose){
+if(_b.clearOnClose){
 this.clearOnClose=true;
 }
-if("failOk" in _c){
-this.failOk=_c.failOk?true:false;
-}
-},url:"",_ccUrl:"",data:null,typeMap:null,clearOnClose:false,urlPreventCache:false,failOk:false,hierarchical:true,_assertIsItem:function(_e){
-if(!this.isItem(_e)){
-throw new Error("dojo.data.ItemFileReadStore: Invalid item argument.");
-}
-},_assertIsAttribute:function(_f){
-if(typeof _f!=="string"){
-throw new Error("dojo.data.ItemFileReadStore: Invalid attribute argument.");
-}
-},getValue:function(_10,_11,_12){
-var _13=this.getValues(_10,_11);
-return (_13.length>0)?_13[0]:_12;
-},getValues:function(_14,_15){
-this._assertIsItem(_14);
-this._assertIsAttribute(_15);
-return (_14[_15]||[]).slice(0);
-},getAttributes:function(_16){
-this._assertIsItem(_16);
-var _17=[];
-for(var key in _16){
+if("failOk" in _b){
+this.failOk=_b.failOk?true:false;
+}
+},url:"",_ccUrl:"",data:null,typeMap:null,clearOnClose:false,urlPreventCache:false,failOk:false,hierarchical:true,_assertIsItem:function(_d){
+if(!this.isItem(_d)){
+throw new Error(this.declaredClass+": Invalid item argument.");
+}
+},_assertIsAttribute:function(_e){
+if(typeof _e!=="string"){
+throw new Error(this.declaredClass+": Invalid attribute argument.");
+}
+},getValue:function(_f,_10,_11){
+var _12=this.getValues(_f,_10);
+return (_12.length>0)?_12[0]:_11;
+},getValues:function(_13,_14){
+this._assertIsItem(_13);
+this._assertIsAttribute(_14);
+return (_13[_14]||[]).slice(0);
+},getAttributes:function(_15){
+this._assertIsItem(_15);
+var _16=[];
+for(var key in _15){
 if((key!==this._storeRefPropName)&&(key!==this._itemNumPropName)&&(key!==this._rootItemPropName)&&(key!==this._reverseRefMap)){
-_17.push(key);
-}
-}
-return _17;
-},hasAttribute:function(_18,_19){
-this._assertIsItem(_18);
-this._assertIsAttribute(_19);
-return (_19 in _18);
-},containsValue:function(_1a,_1b,_1c){
-var _1d=undefined;
-if(typeof _1c==="string"){
-_1d=_8.patternToRegExp(_1c,false);
-}
-return this._containsValue(_1a,_1b,_1c,_1d);
-},_containsValue:function(_1e,_1f,_20,_21){
-return _4.some(this.getValues(_1e,_1f),function(_22){
-if(_22!==null&&!_2.isObject(_22)&&_21){
-if(_22.toString().match(_21)){
+_16.push(key);
+}
+}
+return _16;
+},hasAttribute:function(_17,_18){
+this._assertIsItem(_17);
+this._assertIsAttribute(_18);
+return (_18 in _17);
+},containsValue:function(_19,_1a,_1b){
+var _1c=undefined;
+if(typeof _1b==="string"){
+_1c=_7.patternToRegExp(_1b,false);
+}
+return this._containsValue(_19,_1a,_1b,_1c);
+},_containsValue:function(_1d,_1e,_1f,_20){
+return _4.some(this.getValues(_1d,_1e),function(_21){
+if(_21!==null&&!_2.isObject(_21)&&_20){
+if(_21.toString().match(_20)){
 return true;
 }
 }else{
-if(_20===_22){
+if(_1f===_21){
 return true;
 }
 }
 });
-},isItem:function(_23){
-if(_23&&_23[this._storeRefPropName]===this){
-if(this._arrayOfAllItems[_23[this._itemNumPropName]]===_23){
+},isItem:function(_22){
+if(_22&&_22[this._storeRefPropName]===this){
+if(this._arrayOfAllItems[_22[this._itemNumPropName]]===_22){
 return true;
 }
 }
 return false;
-},isItemLoaded:function(_24){
-return this.isItem(_24);
-},loadItem:function(_25){
-this._assertIsItem(_25.item);
+},isItemLoaded:function(_23){
+return this.isItem(_23);
+},loadItem:function(_24){
+this._assertIsItem(_24.item);
 },getFeatures:function(){
 return this._features;
-},getLabel:function(_26){
-if(this._labelAttr&&this.isItem(_26)){
-return this.getValue(_26,this._labelAttr);
+},getLabel:function(_25){
+if(this._labelAttr&&this.isItem(_25)){
+return this.getValue(_25,this._labelAttr);
 }
 return undefined;
-},getLabelAttributes:function(_27){
+},getLabelAttributes:function(_26){
 if(this._labelAttr){
 return [this._labelAttr];
 }
 return null;
-},_fetchItems:function(_28,_29,_2a){
-var _2b=this,_2c=function(_2d,_2e){
-var _2f=[],i,key;
-if(_2d.query){
-var _30,_31=_2d.queryOptions?_2d.queryOptions.ignoreCase:false;
-var _32={};
-for(key in _2d.query){
-_30=_2d.query[key];
-if(typeof _30==="string"){
-_32[key]=_8.patternToRegExp(_30,_31);
+},filter:function(_27,_28,_29){
+var _2a=[],i,key;
+if(_27.query){
+var _2b,_2c=_27.queryOptions?_27.queryOptions.ignoreCase:false;
+var _2d={};
+for(key in _27.query){
+_2b=_27.query[key];
+if(typeof _2b==="string"){
+_2d[key]=_7.patternToRegExp(_2b,_2c);
 }else{
-if(_30 instanceof RegExp){
-_32[key]=_30;
+if(_2b instanceof RegExp){
+_2d[key]=_2b;
 }
 }
 }
-for(i=0;i<_2e.length;++i){
-var _33=true;
-var _34=_2e[i];
-if(_34===null){
-_33=false;
+for(i=0;i<_28.length;++i){
+var _2e=true;
+var _2f=_28[i];
+if(_2f===null){
+_2e=false;
 }else{
-for(key in _2d.query){
-_30=_2d.query[key];
-if(!_2b._containsValue(_34,key,_30,_32[key])){
-_33=false;
+for(key in _27.query){
+_2b=_27.query[key];
+if(!this._containsValue(_2f,key,_2b,_2d[key])){
+_2e=false;
 }
 }
 }
-if(_33){
-_2f.push(_34);
+if(_2e){
+_2a.push(_2f);
 }
 }
-_29(_2f,_2d);
+_29(_2a,_27);
 }else{
-for(i=0;i<_2e.length;++i){
-var _35=_2e[i];
-if(_35!==null){
-_2f.push(_35);
+for(i=0;i<_28.length;++i){
+var _30=_28[i];
+if(_30!==null){
+_2a.push(_30);
 }
 }
-_29(_2f,_2d);
+_29(_2a,_27);
 }
-};
+},_fetchItems:function(_31,_32,_33){
+var _34=this;
 if(this._loadFinished){
-_2c(_28,this._getItemsArray(_28.queryOptions));
+this.filter(_31,this._getItemsArray(_31.queryOptions),_32);
 }else{
 if(this._jsonFileUrl!==this._ccUrl){
-_1.deprecated("dojo.data.ItemFileReadStore: ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+_1.deprecated(this.declaredClass+": ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 this._ccUrl=this._jsonFileUrl;
 this.url=this._jsonFileUrl;
 }else{
@@ -173,41 +173,41 @@ this.data=null;
 }
 if(this._jsonFileUrl){
 if(this._loadInProgress){
-this._queuedFetches.push({args:_28,filter:_2c});
+this._queuedFetches.push({args:_31,filter:_2.hitch(_34,"filter"),findCallback:_2.hitch(_34,_32)});
 }else{
 this._loadInProgress=true;
-var _36={url:_2b._jsonFileUrl,handleAs:"json-comment-optional",preventCache:this.urlPreventCache,failOk:this.failOk};
-var _37=_5.get(_36);
-_37.addCallback(function(_38){
+var _35={url:_34._jsonFileUrl,handleAs:"json-comment-optional",preventCache:this.urlPreventCache,failOk:this.failOk};
+var _36=_5.get(_35);
+_36.addCallback(function(_37){
 try{
-_2b._getItemsFromLoadedData(_38);
-_2b._loadFinished=true;
-_2b._loadInProgress=false;
-_2c(_28,_2b._getItemsArray(_28.queryOptions));
-_2b._handleQueuedFetches();
+_34._getItemsFromLoadedData(_37);
+_34._loadFinished=true;
+_34._loadInProgress=false;
+_34.filter(_31,_34._getItemsArray(_31.queryOptions),_32);
+_34._handleQueuedFetches();
 }
 catch(e){
-_2b._loadFinished=true;
-_2b._loadInProgress=false;
-_2a(e,_28);
+_34._loadFinished=true;
+_34._loadInProgress=false;
+_33(e,_31);
 }
 });
-_37.addErrback(function(_39){
-_2b._loadInProgress=false;
-_2a(_39,_28);
+_36.addErrback(function(_38){
+_34._loadInProgress=false;
+_33(_38,_31);
 });
-var _3a=null;
-if(_28.abort){
-_3a=_28.abort;
+var _39=null;
+if(_31.abort){
+_39=_31.abort;
 }
-_28.abort=function(){
-var df=_37;
+_31.abort=function(){
+var df=_36;
 if(df&&df.fired===-1){
 df.cancel();
 df=null;
 }
-if(_3a){
-_3a.call(_28);
+if(_39){
+_39.call(_31);
 }
 };
 }
@@ -217,24 +217,24 @@ try{
 this._loadFinished=true;
 this._getItemsFromLoadedData(this._jsonData);
 this._jsonData=null;
-_2c(_28,this._getItemsArray(_28.queryOptions));
+_34.filter(_31,this._getItemsArray(_31.queryOptions),_32);
 }
 catch(e){
-_2a(e,_28);
+_33(e,_31);
 }
 }else{
-_2a(new Error("dojo.data.ItemFileReadStore: No JSON source data was provided as either URL or a nested Javascript object."),_28);
+_33(new Error(this.declaredClass+": No JSON source data was provided as either URL or a nested Javascript object."),_31);
 }
 }
 }
 },_handleQueuedFetches:function(){
 if(this._queuedFetches.length>0){
 for(var i=0;i<this._queuedFetches.length;i++){
-var _3b=this._queuedFetches[i],_3c=_3b.args,_3d=_3b.filter;
-if(_3d){
-_3d(_3c,this._getItemsArray(_3c.queryOptions));
+var _3a=this._queuedFetches[i],_3b=_3a.args,_3c=_3a.filter,_3d=_3a.findCallback;
+if(_3c){
+_3c(_3b,this._getItemsArray(_3b.queryOptions),_3d);
 }else{
-this.fetchItemByIdentity(_3c);
+this.fetchItemByIdentity(_3b);
 }
 }
 this._queuedFetches=[];
@@ -332,10 +332,10 @@ if(!Object.hasOwnProperty.call(this._itemsByIdentity,_50)){
 this._itemsByIdentity[_50]=_4b;
 }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: ["+_4f+"].  Value collided: ["+_50+"]");
+throw new Error(this.declaredClass+":  The json data as specified by: ["+this._jsonFileUrl+"] is malformed.  Items within the list have identifier: ["+_4f+"].  Value collided: ["+_50+"]");
 }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: ["+_4f+"].  Value collided: ["+_50+"]");
+throw new Error(this.declaredClass+":  The json data provided by the creation arguments is malformed.  Items within the list have identifier: ["+_4f+"].  Value collided: ["+_50+"]");
 }
 }
 }
@@ -423,7 +423,7 @@ var _5f,_60;
 if(!this._loadFinished){
 var _61=this;
 if(this._jsonFileUrl!==this._ccUrl){
-_1.deprecated("dojo.data.ItemFileReadStore: ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+_1.deprecated(this.declaredClass+": ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 this._ccUrl=this._jsonFileUrl;
 this.url=this._jsonFileUrl;
 }else{
@@ -444,7 +444,7 @@ this._loadInProgress=true;
 var _62={url:_61._jsonFileUrl,handleAs:"json-comment-optional",preventCache:this.urlPreventCache,failOk:this.failOk};
 var _63=_5.get(_62);
 _63.addCallback(function(_64){
-var _65=_5e.scope?_5e.scope:_7.global;
+var _65=_5e.scope?_5e.scope:_1.global;
 try{
 _61._getItemsFromLoadedData(_64);
 _61._loadFinished=true;
@@ -465,7 +465,7 @@ _5e.onError.call(_65,error);
 _63.addErrback(function(_66){
 _61._loadInProgress=false;
 if(_5e.onError){
-var _67=_5e.scope?_5e.scope:_7.global;
+var _67=_5e.scope?_5e.scope:_1.global;
 _5e.onError.call(_67,_66);
 }
 });
@@ -477,7 +477,7 @@ _61._jsonData=null;
 _61._loadFinished=true;
 _5f=_61._getItemByIdentity(_5e.identity);
 if(_5e.onItem){
-_60=_5e.scope?_5e.scope:_7.global;
+_60=_5e.scope?_5e.scope:_1.global;
 _5e.onItem.call(_60,_5f);
 }
 }
@@ -485,7 +485,7 @@ _5e.onItem.call(_60,_5f);
 }else{
 _5f=this._getItemByIdentity(_5e.identity);
 if(_5e.onItem){
-_60=_5e.scope?_5e.scope:_7.global;
+_60=_5e.scope?_5e.scope:_1.global;
 _5e.onItem.call(_60,_5f);
 }
 }
@@ -514,7 +514,7 @@ return [_6b];
 },_forceLoad:function(){
 var _6c=this;
 if(this._jsonFileUrl!==this._ccUrl){
-_1.deprecated("dojo.data.ItemFileReadStore: ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
+_1.deprecated(this.declaredClass+": ","To change the url, set the url property of the store,"+" not _jsonFileUrl.  _jsonFileUrl support will be removed in 2.0");
 this._ccUrl=this._jsonFileUrl;
 this.url=this._jsonFileUrl;
 }else{
@@ -537,7 +537,7 @@ _6c._getItemsFromLoadedData(_6f);
 _6c._loadFinished=true;
 }else{
 if(_6c._loadInProgress){
-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.");
 }
 }
 }
@@ -556,6 +556,6 @@ _6c._loadFinished=true;
 }
 }
 }});
-_2.extend(_b,_9);
-return _b;
+_2.extend(_a,_8);
+return _a;
 });