dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/data/HtmlStore.js

@@ -369,7 +369,7 @@ dojo.declare("dojox.data.HtmlStore", null, {
 	_finishFetchItems: function(request, fetchHandler, errorHandler){
 		//	summary:
 		//		Internal function for processing the passed in request and locating the requested items.
-		var items = null;
+		var items = [];
 		var arrayOfAllItems = this._getAllItems();
 		if(request.query){
 			var ignoreCase = request.queryOptions ? request.queryOptions.ignoreCase : false; 

data/dojo/dojox/data/ItemExplorer.js

@@ -137,14 +137,14 @@ dojo.declare("dojox.data.ItemExplorer", dijit.Tree, {
 			if(node){
 				var item = node.item;
 				if(this.store.isItem(item.value, true) && !item.parent){
-					contextMenu.getChildren().forEach(function(widget){
+					dojo.forEach(contextMenu.getChildren(), function(widget){
 						widget.attr("disabled", (widget.label != "Add"));
 					});
 					this.lastFocused = node;
 					// TODO: Root Node - allow Edit when mutli-value editing is possible
 				}else if(item.value && typeof item.value == 'object' && !(item.value instanceof Date)){
 					// an object that's not a Date - could be a store item
-					contextMenu.getChildren().forEach(function(widget){
+					dojo.forEach(contextMenu.getChildren(), function(widget){
 						widget.attr("disabled", (widget.label != "Add") && (widget.label != "Delete"));
 					});
 					this.lastFocused = node;
@@ -155,7 +155,7 @@ dojo.declare("dojox.data.ItemExplorer", dijit.Tree, {
 				}else if(item.addNew){
 					this.focusNode(node);
 				}else{
-					contextMenu.getChildren().forEach(function(widget){
+					dojo.forEach(contextMenu.getChildren(), function(widget){
 						widget.attr("disabled", (widget.label != "Edit") && (widget.label != "Delete"));
 					})
 					// this won't focus the node but gives us a way to reference the node

data/dojo/dojox/data/PersevereStore.js

@@ -32,7 +32,7 @@ dojox.data.PersevereStore.getStores = function(/*String?*/path,/*Boolean?*/sync)
 	}
 	var plainXhr = dojo.xhr;
 	dojo.xhr = function(method,args){
-		(args.headers = args.headers || {})['Server-Methods'] = false;
+		(args.headers = args.headers || {})['Server-Methods'] = "false";
 		return plainXhr.apply(dojo,arguments);
 	}
 	var rootService= dojox.rpc.Rest(path,true);

data/dojo/dojox/data/QueryReadStore.js

@@ -375,17 +375,14 @@ dojo.declare("dojox.data.QueryReadStore",
 					serverQuery.count = request.count;
 				}
 			}
-			if(!this.doClientSorting){
-				if(request.sort){
-					var sort = request.sort[0];
+			if(!this.doClientSorting && request.sort){
+				var sortInfo = [];
+				dojo.forEach(request.sort, function(sort){
 					if(sort && sort.attribute){
-						var sortStr = sort.attribute;
-						if(sort.descending){
-							sortStr = "-" + sortStr;
-						}
-						serverQuery.sort = sortStr;
+						sortInfo.push((sort.descending ? "-" : "") + sort.attribute);
 					}
-				}
+				});
+				serverQuery.sort = sortInfo.join(',');
 			}
 			// Compare the last query and the current query by simply json-encoding them,
 			// so we dont have to do any deep object compare ... is there some dojo.areObjectsEqual()???

data/dojo/dojox/data/ServiceStore.js

@@ -18,7 +18,7 @@ dojo.provide("dojox.data.ServiceStore");
 dojo.declare("dojox.data.ServiceStore",
 	// ClientFilter is intentionally not required, ServiceStore does not need it, and is more
 	// lightweight without it, but if it is provided, the ServiceStore will use it.
-	dojox.data.ClientFilter,{
+	dojox.data.ClientFilter||null,{
 		service: null,
 		constructor: function(options){
 			//summary:
@@ -91,10 +91,10 @@ dojo.declare("dojox.data.ServiceStore",
 			// We supply a default idAttribute for parser driven construction, but if no id attribute
 			//	is supplied, it should be null so that auto identification takes place properly
 			this.idAttribute = (options && options.idAttribute) || (this.schema && this.schema._idAttr);
-			this.labelAttribute = this.labelAttribute || "label";
 		},
 		schema: null,
 		idAttribute: "id",
+		labelAttribute: "label",
 		syncMode: false,
 		estimateCountFactor: 1,
 		getSchema: function(){
@@ -133,6 +133,13 @@ dojo.declare("dojox.data.ServiceStore",
 			//		property to look up value for
 
 			var val = this.getValue(item,property);
+			if(val instanceof Array){
+				return val;
+			}
+			if(!this.isItemLoaded(val)){
+				dojox.rpc._sync = true;
+				val = this.loadItem({item:val});
+			}
 			return val instanceof Array ? val : val === undefined ? [] : [val];
 		},
 

data/dojo/dojox/data/StoreExplorer.js

@@ -97,8 +97,8 @@ dojo.declare("dojox.data.StoreExplorer", dijit.layout.BorderContainer, {
 		this.gridOnFetchComplete = grid._onFetchComplete;
 		this.setStore(this.store);
 	},
-	setQuery: function(query){
-		this.grid.setQuery(query);
+	setQuery: function(query, options){
+		this.grid.setQuery(query, options);
 	},
 	_formatCell: function(value){
 		if(this.store.isItem(value)){

data/dojo/dojox/data/XmlStore.js

@@ -1434,7 +1434,7 @@ dojo.declare("dojox.data.XmlStore", null, {
 				handleDocument = function(data){
 					var item = null;
 					if(data){
-						var items = self._getItems(items, {});
+						var items = self._getItems(data, {});
 						if(items.length === 1){
 							item = items[0];
 						}else{

data/dojo/dojox/data/demos/stores/LazyLoadJSIStore.js

@@ -83,7 +83,7 @@ dojo.declare("dojox.data.demos.stores.LazyLoadJSIStore", dojo.data.ItemFileReadS
 			//add to the items array of the store so they can be lazy-loaded later...
 			var attributes = self.getAttributes(item);
 			for(i in attributes){
-				var values = self.getValues(item, attributes[i]);
+				var values = item[attributes[i]];
 				for (var j = 0; j < values.length; j++) {
 					var value = values[j];
 					

data/dojo/dojox/data/s3/proxy.example-php

@@ -1,74 +1,74 @@
-<?php
-// enter your Amazon S3 secret key and access key here:
-$accessKey = "access key";
-$secretAccessKey = "secret access key";
-
-
-
-$TARGET_WS = "http://s3.amazonaws.com";
-
-ob_start();
-
-require_once 'Crypt/HMAC.php';
-require_once 'HTTP/Request.php';
-
-$method = $_SERVER["REQUEST_METHOD"];
-if ($method == "PUT") {
-	$contentType = $_SERVER['CONTENT_TYPE'];
-}
-else {
-	$contentType ='';
-}
-$resource = str_replace($TARGET_WS, '', $_REQUEST['url']);
-$queryIndex = strpos($resource,'?'); // remove the query string
-if ($queryIndex) {
-	$resource = substr($resource,0,$queryIndex);
-}
-
-if (substr($resource,strlen($resource)-1,strlen($resource)) == '/') {
-	// remove the last slash
-	$resource = substr($resource,0,strlen($resource)-1);
-}
-$content = file_get_contents('php://input');
-
-$httpDate = gmdate("D, d M Y H:i:s T");
-$acl = "private";
-$stringToSign = "$method\n\n$contentType\n$httpDate\nx-amz-acl:$acl\n$resource";
-$hashObj =& new Crypt_HMAC($secretAccessKey, "sha1");
-$signature = hexTob64($hashObj->hash($stringToSign));
-
-$req =& new HTTP_Request($TARGET_WS . $resource);
-$req->setMethod($method);
-$req->addHeader("content-type", $contentType);
-$req->addHeader("Date", $httpDate);
-$req->addHeader("x-amz-acl", $acl);
-$req->addHeader("Authorization", "AWS " . $accessKey . ":" . $signature);
-if ($content != "") {
-	$req->setBody($content);
-}
-
-$req->sendRequest();
-
-$contentType = $req->getResponseHeader("content-type");
-header("content-type: $contentType");
-header('HTTP/1.1 ' . $req->getResponseCode() . ' Ok');
-
-ob_end_flush();
-
-$content = $req->getResponseBody();
-if ($content) {
-	print($content);
-}
-else {
-	print("\"success\"");
-}
-
-function hexTob64($str) {
-    $raw = '';
-    for ($i=0; $i < strlen($str); $i+=2) {
-        $raw .= chr(hexdec(substr($str, $i, 2)));
-    }
-    return base64_encode($raw);
-}
-
+<?php
+// enter your Amazon S3 secret key and access key here:
+$accessKey = "access key";
+$secretAccessKey = "secret access key";
+
+
+
+$TARGET_WS = "http://s3.amazonaws.com";
+
+ob_start();
+
+require_once 'Crypt/HMAC.php';
+require_once 'HTTP/Request.php';
+
+$method = $_SERVER["REQUEST_METHOD"];
+if ($method == "PUT") {
+	$contentType = $_SERVER['CONTENT_TYPE'];
+}
+else {
+	$contentType ='';
+}
+$resource = str_replace($TARGET_WS, '', $_REQUEST['url']);
+$queryIndex = strpos($resource,'?'); // remove the query string
+if ($queryIndex) {
+	$resource = substr($resource,0,$queryIndex);
+}
+
+if (substr($resource,strlen($resource)-1,strlen($resource)) == '/') {
+	// remove the last slash
+	$resource = substr($resource,0,strlen($resource)-1);
+}
+$content = file_get_contents('php://input');
+
+$httpDate = gmdate("D, d M Y H:i:s T");
+$acl = "private";
+$stringToSign = "$method\n\n$contentType\n$httpDate\nx-amz-acl:$acl\n$resource";
+$hashObj =& new Crypt_HMAC($secretAccessKey, "sha1");
+$signature = hexTob64($hashObj->hash($stringToSign));
+
+$req =& new HTTP_Request($TARGET_WS . $resource);
+$req->setMethod($method);
+$req->addHeader("content-type", $contentType);
+$req->addHeader("Date", $httpDate);
+$req->addHeader("x-amz-acl", $acl);
+$req->addHeader("Authorization", "AWS " . $accessKey . ":" . $signature);
+if ($content != "") {
+	$req->setBody($content);
+}
+
+$req->sendRequest();
+
+$contentType = $req->getResponseHeader("content-type");
+header("content-type: $contentType");
+header('HTTP/1.1 ' . $req->getResponseCode() . ' Ok');
+
+ob_end_flush();
+
+$content = $req->getResponseBody();
+if ($content) {
+	print($content);
+}
+else {
+	print("\"success\"");
+}
+
+function hexTob64($str) {
+    $raw = '';
+    for ($i=0; $i < strlen($str); $i+=2) {
+        $raw .= chr(hexdec(substr($str, $i, 2)));
+    }
+    return base64_encode($raw);
+}
+
 ?>

data/dojo/dojox/data/tests/stores/FlickrRestStore.js

@@ -409,7 +409,7 @@ doh.register("dojox.data.tests.stores.FlickrRestStore",
 					t.assertTrue(flickrStore.isItem(items[0]));
 
 					var attributes = flickrStore.getAttributes(items[0]);
-					t.is(9, attributes.length);
+					t.is(11, attributes.length);
 					d.callback(true);
 				}
 

data/dojo/dojox/data/util/JsonQuery.js

@@ -53,9 +53,6 @@ dojo.declare("dojox.data.util.JsonQuery", null, {
 				args.queryStr += (first ? '[' : ',') + (sort[i].descending ? '\\' : '/') + "@[" + dojo._escapeString(sort[i].attribute) + "]";
 				first = false; 
 			}
-			if(!first){
-				args.queryStr += ']';
-			}
 		}
 		// this is optional because with client side paging JSONQuery doesn't yield the total count
 		if(jsonQueryPagination && (args.start || args.count)){

data/dojo/dojox/date/README

@@ -5,7 +5,12 @@ Version 0.9
 Release date: 5/17/2007
 -------------------------------------------------------------------------------
 Project state:
-experimental
+varies
+
+Buddhist, Hebrew, Islamic calendars: stable
+posix, php: beta
+timezone: experimental
+
 -------------------------------------------------------------------------------
 Credits
 	Paul Sowden (dojox.date.posix)
@@ -18,6 +23,7 @@ Project description
 
 Placeholder for any kind of date operations, including formatters that are
 common to other languages (posix and php).
+
 -------------------------------------------------------------------------------
 Dependencies:
 

data/dojo/dojox/date/buddhist/locale.js

@@ -48,7 +48,7 @@ dojo.requireLocalization("dojo.cldr", "buddhist");
 					break;
 				case 'a':
 					var timePeriod = (dateObject.getHours() < 12) ? 'am' : 'pm';
-					s = bundle[timePeriod];
+					s = bundle['dayPeriods-format-wide-' + timePeriod];
 					break;
 				case 'h':
 				case 'H':
@@ -212,8 +212,8 @@ dojox.date.buddhist.locale.parse= function(/*String*/value, /*object?*/options){
 					result[2] =  Number(v);
 				break;
 			case 'a': //am/pm
-				var am = options.am || bundle.am;
-				var pm = options.pm || bundle.pm;
+				var am = options.am || bundle['dayPeriods-format-wide-am'],
+					pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 				if(!options.strict){
 					var period = /\./g;
 					v = v.replace(period,'').toLowerCase();
@@ -338,8 +338,8 @@ function _buildDateTimeRE  (tokens, bundle, options, pattern){
 					s = '\\d{'+l+'}';
 					break;
 				case 'a':
-					var am = options.am || bundle.am || 'AM';
-					var pm = options.pm || bundle.pm || 'PM';
+					var am = options.am || bundle['dayPeriods-format-wide-am'],
+						pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 					if(options.strict){
 						s = am + '|' + pm;
 					}else{

data/dojo/dojox/date/hebrew/locale.js

@@ -40,8 +40,8 @@ dojo.requireLocalization("dojo.cldr", "hebrew");
 							s = m+1; pad = true;
 						}	
 					}else{
-						var propM = ["months", "format", widthList[l-3]].join("-");
-						s = bundle[propM][m];
+						var monthNames = dojox.date.hebrew.locale.getNames('months',widthList[l-3], 'format', locale, dateObject);
+						s = monthNames[m];
 					}
 					break;
 				case 'd':
@@ -62,7 +62,7 @@ dojo.requireLocalization("dojo.cldr", "hebrew");
 					break;
 				case 'a':
 					var timePeriod = (dateObject.getHours() < 12) ? 'am' : 'pm';
-					s = bundle[timePeriod];
+					s = bundle['dayPeriods-format-wide-' + timePeriod];
 					break;
 				case 'h':
 				case 'H':
@@ -241,17 +241,24 @@ dojox.date.hebrew.locale.parse= function(/*String*/value, /*object?*/options){
 			case 'M':
 				//if  it is short format, month is one letter or two letter with "geresh"
 				if(l>2){
-					var months = bundle['months-format-' + widthList[l-3]].concat();
+					//we do not know here if the year is leap or not
+					var months = dojox.date.hebrew.locale.getNames('months', widthList[l-3], 'format', locale, new dojox.date.hebrew.Date(5769, 1, 1)),
+						leapmonths = dojox.date.hebrew.locale.getNames('months', widthList[l-3], 'format', locale, new dojox.date.hebrew.Date(5768, 1, 1));
 					if(!options.strict){
 						//Tolerate abbreviating period in month part
 						//Case-insensitive comparison
 						v = v.replace(".","").toLowerCase();
 						months = dojo.map(months, function(s){ return s ? s.replace(".","").toLowerCase() : s; } );
+						leapmonths = dojo.map(leapmonths, function(s){ return s ? s.replace(".","").toLowerCase() : s; } );
 					}
-					v = dojo.indexOf(months, v);
+					var monthName = v; 
+					v = dojo.indexOf(months, monthName);
 					if(v == -1){
-//					console.debug("dojox.date.hebrew.locale.parse: Could not parse month name: '" + v + "'.");
-						return false;
+						v = dojo.indexOf(leapmonths, monthName);
+						if(v == -1){
+							//console.debug("dojox.date.hebrew.locale.parse: Could not parse month name:  second   " + v +"'.");
+							return false;
+						}
 					}
 					mLength = l;
 				}else{
@@ -274,8 +281,8 @@ dojox.date.hebrew.locale.parse= function(/*String*/value, /*object?*/options){
 				}
 				break;
 			case 'a': //am/pm
-				var am = options.am || bundle.am;
-				var pm = options.pm || bundle.pm;
+				var am = options.am || bundle['dayPeriods-format-wide-am'],
+					pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 				if(!options.strict){
 					var period = /\./g;
 					v = v.replace(period,'').toLowerCase();
@@ -416,8 +423,8 @@ function _buildDateTimeRE  (tokens, bundle, options, pattern){
 					s = '\\d{'+l+'}';
 					break;
 				case 'a':
-					var am = options.am || bundle.am || 'AM';
-					var pm = options.pm || bundle.pm || 'PM';
+					var am = options.am || bundle['dayPeriods-format-wide-am'],
+						pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 					if(options.strict){
 						s = am + '|' + pm;
 					}else{
@@ -466,7 +473,7 @@ dojox.date.hebrew.locale._getHebrewBundle = function(/*String*/locale){
 
 dojox.date.hebrew.locale.addCustomFormats("dojo.cldr","hebrew");
 
-dojox.date.hebrew.locale.getNames = function(/*String*/item, /*String*/type, /*String?*/context, /*String?*/locale, /*hebrew Date Object?*/date){
+dojox.date.hebrew.locale.getNames = function(/*String*/item, /*String*/type, /*String?*/context, /*String?*/locale, /*dojox.date.hebrew.Date?*/date){
 	// summary:
 	//		Used to get localized strings from dojo.cldr for day or month names.
 	//
@@ -478,20 +485,36 @@ dojox.date.hebrew.locale.getNames = function(/*String*/item, /*String*/type, /*S
 	//	'standAlone' || 'format' (default)
 	// locale:
 	//	override locale used to find the names
+	// date:
+	//	required for item=months to determine leap month name
 	//
-	// using  var monthNames = dojox.date.hebrew.locale.getNames('months', 'wide', 'format', 'he');
+	// using  var monthNames = dojox.date.hebrew.locale.getNames('months', 'wide', 'format', 'he', new dojox.date.hebrew.Date(5768, 2, 12));
 
-	var label;
-	var lookup = dojox.date.hebrew.locale._getHebrewBundle;
-	var props = [item, context, type];
+	var label,
+		lookup = dojox.date.hebrew.locale._getHebrewBundle,
+		props = [item, context, type];
 	if(context == 'standAlone'){
 		var key = props.join('-');
 		label = lookup(locale)[key];
 		// Fall back to 'format' flavor of name
-		if(label === lookup("ROOT")[key]){ label = undefined; } // a bit of a kludge, in the absense of real aliasing support in dojo.cldr
+		if(label === lookup("ROOT")[key]){ label = undefined; } // a bit of a kludge, in the absence of real aliasing support in dojo.cldr
 	}
 	props[1] = 'format';
 	
 	// return by copy so changes won't be made accidentally to the in-memory model
-	return (label || lookup(locale)[props.join('-')]).concat(); /*Array*/
+	var result = (label || lookup(locale)[props.join('-')]).concat();
+
+	if(item == "months"){
+		if(date.isLeapYear(date.getFullYear())){
+			// Adar I (6th position in the array) will be used.
+			// Substitute the leap month Adar II for the regular Adar (7th position)
+			props.push("leap");
+			result[6] = lookup(locale)[props.join('-')];
+		}else{
+			// Remove Adar I but leave an empty position in the array
+			delete result[5];
+		}
+	}
+
+	return result; /*Array*/
 };