You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/14 16:45:26 UTC
svn commit: r487242 [12/20] - in
/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo: ./ nls/ src/
src/behavior/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/
src/collections/ src/crypto/ src/data/ src/data/core/ src/data/old/
src/dat...
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/number.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/number.js?view=auto&rev=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/number.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/number.js Thu Dec 14 07:45:13 2006
@@ -0,0 +1,18 @@
+
+dojo.provide("dojo.number");dojo.require("dojo.experimental");dojo.experimental("dojo.number");dojo.require("dojo.i18n.common");dojo.requireLocalization("dojo.i18n.cldr", "number", null, "en,en-in,fr,ROOT");dojo.require("dojo.string.common");dojo.number.format = function(value, options){options = options || {};var locale = dojo.hostenv.normalizeLocale(options.locale);var bundle = dojo.i18n.getLocalization("dojo.i18n.cldr", "number", locale);var pattern = options.pattern || bundle[(options.type || "decimal") + "Format"];return dojo.number.applyPattern(value, pattern, {symbols: bundle, places: options.places, round: options.round});};dojo.number._numberPatternRE = /(?:[#0]*,?)*[#0]+(?:\.0*#*)?/;dojo.number.applyPattern = function(value, pattern, options){options = options || {};var group = options.symbols.group;var decimal = options.symbols.decimal;var patternList = pattern.split(';');var positivePattern = patternList[0];pattern = patternList[(value < 0) ? 1 : 0] || ("-" + pos
itivePattern);if(pattern.indexOf('%') != -1){value *= 100;}else if(pattern.indexOf('\u2030') != -1){value *= 1000;}else if(pattern.indexOf('\u00a4') != -1){group = options.symbols.currencyGroup || group;decimal = options.symbols.currencyDecimal || decimal;pattern.replace('/\u00a4{1,3}/', function(match){switch(match.length){case 1:
+return options.symbols.symbol;case 2:
+return currencyISO;case 3:
+return "United States Dollars?";}});}else if(pattern.indexOf('E') != -1){dojo.unimplemented("exponential notation not supported");}
+var numberPatternRE = dojo.number._numberPatternRE;var numberPattern = positivePattern.match(numberPatternRE);if(!numberPattern){dojo.raise("unable to find a number expression in pattern: "+pattern);}
+var output = pattern.replace(numberPatternRE, dojo.number.formatAbsolute(value, numberPattern[0], {decimal: decimal, group: group, places: options.places}));return output;}
+dojo.number.formatAbsolute = function(value, pattern, options){options = options || {};value = Math.abs(value);var round = false;var valueParts = String(value).split(".");var patternParts = pattern.split(".");var fractional = valueParts[1] || "";if(options.places){valueParts[1] = dojo.string.pad(fractional.substr(0, options.places), options.places, '0', -1);}else if(patternParts[1] && options.places !== 0){var pad = patternParts[1].lastIndexOf("0") + 1;if(pad > fractional.length){valueParts[1] = dojo.string.pad(fractional, pad, '0', -1);}
+var places = patternParts[1].length;if(places < fractional.length){valueParts[1] = fractional.substr(0, places);}}else{if(valueParts[1]){ valueParts.pop(); }}
+var patternDigits = patternParts[0].replace(',', '');pad = patternDigits.indexOf("0");if(pad != -1){pad = patternDigits.length - pad;if(pad > valueParts[0].length){valueParts[0] = dojo.string.pad(valueParts[0], pad);}
+if(patternDigits.indexOf("#") == -1){valueParts[0] = valueParts[0].substr(valueParts[0].length - pad);}}
+var index = patternParts[0].lastIndexOf(',');var groupSize, groupSize2;if(index != -1){groupSize = patternParts[0].length - index - 1;var remainder = patternParts[0].substr(0, index);index = remainder.lastIndexOf(',');if(index != -1){groupSize2 = remainder.length - index - 1;}}
+var pieces = [];for(var whole = valueParts[0]; whole;){var off = whole.length - groupSize;pieces.push((off > 0) ? whole.substr(off) : whole);whole = (off > 0) ? whole.slice(0, off) : "";if(groupSize2){groupSize = groupSize2;delete groupSize2;}}
+valueParts[0] = pieces.reverse().join(options.group || ",");return valueParts.join(options.decimal || ".");};dojo.number.parse = function(expression, options){options = options || {};var locale = dojo.hostenv.normalizeLocale(options.locale);var bundle = dojo.i18n.getLocalization("dojo.i18n.cldr", "number", locale);var pattern = options.pattern || bundle[(options.type || "decimal") + "Format"];var group = bundle.group;var decimal = bundle.decimal;var patternList = pattern.split(';');var positivePattern = patternList[0];pattern = "-?" + positivePattern;if(options.strict && !dojo.number._buildNumberFormatRE(pattern, {}).test(expression)){return NaN;}
+var re = pattern.replace(dojo.number._numberPatternRE, "([\\d\\"+group+"]+(?:\\"+decimal+"\\d+)?)");var results = (new RegExp("^"+re+"$")).exec(expression);if(!results){return NaN;}
+var numberExpression = results[1];numberExpression = numberExpression.replace(group, "", "g").replace(decimal, ".");value = Number(numberExpression);if(!isNaN(value)){if(expression.indexOf("-") != -1){value = -value;}}
+return value;};dojo.number._buildNumberFormatRE = function(pattern, options){dojo.unimplemented("dojo.number._buildNumberFormatRE");var numberPatternRE = dojo.number._numberPatternRE;var numberPattern = pattern.match(numberPatternRE);if(!numberPattern){dojo.raise("unable to find a number expression in pattern: "+pattern);}
+pattern = pattern.replace(numberPatternRE, "\\d...");return new RegExp("^" + pattern + "$");};
\ No newline at end of file
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/number.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/profile.js Thu Dec 14 07:45:13 2006
@@ -4,7 +4,9 @@
var hdr = tbl.createTHead();var hdrtr = hdr.insertRow(0);var cols = ["Identifier","Calls","Total","Avg"];for(var x=0; x<cols.length; x++){var ntd = hdrtr.insertCell(x);with(ntd.style){backgroundColor = "#225d94";color = "white";borderBottom = "1px solid black";borderRight = "1px solid black";fontFamily = "tahoma";fontWeight = "bolder";paddingLeft = paddingRight = "5px";}
ntd.appendChild(document.createTextNode(cols[x]));}
for(var x=0; x < this._pns.length; x++){var prf = this._profiles[this._pns[x]];this.end(this._pns[x]);if(prf.iters>0){var bdytr = tbl.insertRow(true);var vals = [this._pns[x], prf.iters, prf.total, parseInt(prf.total/prf.iters)];for(var y=0; y<vals.length; y++){var cc = bdytr.insertCell(y);cc.appendChild(document.createTextNode(vals[y]));with(cc.style){borderBottom = "1px solid gray";paddingLeft = paddingRight = "5px";if(x%2){backgroundColor = "#e1f1ff";}
-if(y>0){textAlign = "right";borderRight = "1px solid gray";}else{borderRight = "1px solid black";}}}}}
+if(y>0){textAlign = "right";borderRight = "1px solid gray";}else{borderRight = "1px solid black";}}
+}}
+}
if(appendToDoc){var ne = document.createElement("div");ne.id = "profileOutputTable";with(ne.style){fontFamily = "Courier New, monospace";fontSize = "12px";lineHeight = "16px";borderTop = "1px solid black";padding = "10px";}
if(document.getElementById("profileOutputTable")){dojo.body().replaceChild(ne, document.getElementById("profileOutputTable"));}else{dojo.body().appendChild(ne);}
ne.appendChild(tbl);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JotService.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,5 @@
dojo.provide("dojo.rpc.JotService");dojo.require("dojo.rpc.RpcService"); dojo.require("dojo.rpc.JsonService"); dojo.require("dojo.json"); dojo.rpc.JotService = function(){this.serviceUrl = "/_/jsonrpc";}
-dojo.inherits(dojo.rpc.JotService, dojo.rpc.JsonService);dojo.lang.extend(dojo.rpc.JotService, {bind: function(method, parameters, deferredRequestHandler, url){dojo.io.bind({url: url||this.serviceUrl,content: {json: this.createRequest(method, parameters)},method: "POST",mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache: true});},createRequest: function(method, params){var req = { "params": params, "method": method, "id": this.lastSubmissionId++ };return dojo.json.serialize(req);}});
\ No newline at end of file
+dojo.inherits(dojo.rpc.JotService, dojo.rpc.JsonService);dojo.lang.extend(dojo.rpc.JotService, {bind: function(method, parameters, deferredRequestHandler, url){dojo.io.bind({url: url||this.serviceUrl,content: {json: this.createRequest(method, parameters)
+},method: "POST",mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache: true
+});},createRequest: function(method, params){var req = { "params": params, "method": method, "id": this.lastSubmissionId++ };return dojo.json.serialize(req);}});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/JsonService.js Thu Dec 14 07:45:13 2006
@@ -3,6 +3,9 @@
if(args["smdStr"]){this.processSmd(dj_eval("("+args.smdStr+")"));}
if(args["smdObj"]){this.processSmd(args.smdObj);}
if(args["serviceUrl"]){this.serviceUrl = args.serviceUrl;}
-if(typeof args["strictArgChecks"] != "undefined"){this.strictArgChecks = args.strictArgChecks;}}}}
-dojo.inherits(dojo.rpc.JsonService, dojo.rpc.RpcService);dojo.extend(dojo.rpc.JsonService, {bustCache: false,contentType: "application/json-rpc",lastSubmissionId: 0,callRemote: function(method, params){var deferred = new dojo.Deferred();this.bind(method, params, deferred);return deferred;},bind: function(method, parameters, deferredRequestHandler, url){dojo.io.bind({url: url||this.serviceUrl,postContent: this.createRequest(method, parameters),method: "POST",contentType: this.contentType,mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache:this.bustCache});},createRequest: function(method, params){var req = { "params": params, "method": method, "id": ++this.lastSubmissionId };var data = dojo.json.serialize(req);dojo.debug("JsonService: JSON-RPC Request: " + data);return data;},parseResults: function(obj){if(!obj){ return; }
-if (obj["Result"]!=null){return obj["Result"];}else if(obj["result"]!=null){return obj["result"];}else if(obj["ResultSet"]){return obj["ResultSet"];}else{return obj;}}});
\ No newline at end of file
+if(typeof args["strictArgChecks"] != "undefined"){this.strictArgChecks = args.strictArgChecks;}}
+}}
+dojo.inherits(dojo.rpc.JsonService, dojo.rpc.RpcService);dojo.extend(dojo.rpc.JsonService, {bustCache: false,contentType: "application/json-rpc",lastSubmissionId: 0,callRemote: function(method, params){var deferred = new dojo.Deferred();this.bind(method, params, deferred);return deferred;},bind: function(method, parameters, deferredRequestHandler, url){dojo.io.bind({url: url||this.serviceUrl,postContent: this.createRequest(method, parameters),method: "POST",contentType: this.contentType,mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache:this.bustCache
+});},createRequest: function(method, params){var req = { "params": params, "method": method, "id": ++this.lastSubmissionId };var data = dojo.json.serialize(req);dojo.debug("JsonService: JSON-RPC Request: " + data);return data;},parseResults: function(obj){if(!obj){ return; }
+if (obj["Result"]!=null){return obj["Result"];}else if(obj["result"]!=null){return obj["result"];}else if(obj["ResultSet"]){return obj["ResultSet"];}else{return obj;}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/RpcService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/RpcService.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/RpcService.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/RpcService.js Thu Dec 14 07:45:13 2006
@@ -5,5 +5,7 @@
(parameters != null) &&
(arguments.length != parameters.length)
){dojo.raise("Invalid number of parameters for remote method.");} else {this.bind(method, arguments, deferredRequestHandler, url);}
-return deferredRequestHandler;});},processSmd: function( object){dojo.debug("RpcService: Processing returned SMD.");if(object.methods){dojo.lang.forEach(object.methods, function(m){if(m && m["name"]){dojo.debug("RpcService: Creating Method: this.", m.name, "()");this[m.name] = this.generateMethod( m.name,m.parameters,m["url"]||m["serviceUrl"]||m["serviceURL"]);if(dojo.lang.isFunction(this[m.name])){dojo.debug("RpcService: Successfully created", m.name, "()");}else{dojo.debug("RpcService: Failed to create", m.name, "()");}}}, this);}
-this.serviceUrl = object.serviceUrl||object.serviceURL;dojo.debug("RpcService: Dojo RpcService is ready for use.");},connect: function( smdUrl){dojo.debug("RpcService: Attempting to load SMD document from:", smdUrl);dojo.io.bind({url: smdUrl,mimetype: "text/json",load: dojo.lang.hitch(this, function(type, object, e){ return this.processSmd(object); }),sync: true});}});
\ No newline at end of file
+return deferredRequestHandler;});},processSmd: function( object){dojo.debug("RpcService: Processing returned SMD.");if(object.methods){dojo.lang.forEach(object.methods, function(m){if(m && m["name"]){dojo.debug("RpcService: Creating Method: this.", m.name, "()");this[m.name] = this.generateMethod(m.name,m.parameters,m["url"]||m["serviceUrl"]||m["serviceURL"]);if(dojo.lang.isFunction(this[m.name])){dojo.debug("RpcService: Successfully created", m.name, "()");}else{dojo.debug("RpcService: Failed to create", m.name, "()");}}
+}, this);}
+this.serviceUrl = object.serviceUrl||object.serviceURL;dojo.debug("RpcService: Dojo RpcService is ready for use.");},connect: function( smdUrl){dojo.debug("RpcService: Attempting to load SMD document from:", smdUrl);dojo.io.bind({url: smdUrl,mimetype: "text/json",load: dojo.lang.hitch(this, function(type, object, e){ return this.processSmd(object); }),sync: true
+});}});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/YahooService.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/YahooService.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/YahooService.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/YahooService.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
-dojo.provide("dojo.rpc.YahooService");dojo.require("dojo.rpc.RpcService");dojo.require("dojo.rpc.JsonService");dojo.require("dojo.json");dojo.require("dojo.uri.*");dojo.require("dojo.io.ScriptSrcIO");dojo.rpc.YahooService = function(appId){this.appId = appId;if(!appId){this.appId = "dojotoolkit";dojo.debug( "please initialize the YahooService class with your own","application ID. Using the default may cause problems during","deployment of your application");}
+dojo.provide("dojo.rpc.YahooService");dojo.require("dojo.rpc.RpcService");dojo.require("dojo.rpc.JsonService");dojo.require("dojo.json");dojo.require("dojo.uri.*");dojo.require("dojo.io.ScriptSrcIO");dojo.rpc.YahooService = function(appId){this.appId = appId;if(!appId){this.appId = "dojotoolkit";dojo.debug("please initialize the YahooService class with your own","application ID. Using the default may cause problems during","deployment of your application");}
this.connect(dojo.uri.dojoUri("src/rpc/yahoo.smd"));this.strictArgChecks = false;}
-dojo.inherits(dojo.rpc.YahooService, dojo.rpc.JsonService);dojo.lang.extend(dojo.rpc.YahooService, {strictArgChecks: false,bind: function(method, parameters, deferredRequestHandler, url){var params = parameters;if( (dojo.lang.isArrayLike(parameters))&&
+dojo.inherits(dojo.rpc.YahooService, dojo.rpc.JsonService);dojo.lang.extend(dojo.rpc.YahooService, {strictArgChecks: false,bind: function(method, parameters, deferredRequestHandler, url){var params = parameters;if((dojo.lang.isArrayLike(parameters))&&
(parameters.length == 1)){params = parameters[0];}
-params.output = "json";params.appid= this.appId;dojo.io.bind({url: url||this.serviceUrl,transport: "ScriptSrcTransport",content: params,jsonParamName: "callback",mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache: true});}});
\ No newline at end of file
+params.output = "json";params.appid= this.appId;dojo.io.bind({url: url||this.serviceUrl,transport: "ScriptSrcTransport",content: params,jsonParamName: "callback",mimetype: "text/json",load: this.resultCallback(deferredRequestHandler),error: this.errorCallback(deferredRequestHandler),preventCache: true
+});}});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/rpc/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: [["dojo.rpc.JsonService", false, false]]});dojo.provide("dojo.rpc.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: [["dojo.rpc.JsonService", false, false]]
+});dojo.provide("dojo.rpc.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/selection/Selection.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/selection/Selection.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/selection/Selection.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/selection/Selection.js Thu Dec 14 07:45:13 2006
@@ -1,18 +1,22 @@
-dojo.provide("dojo.selection.Selection");dojo.require("dojo.lang.array");dojo.require("dojo.lang.func");dojo.require("dojo.lang.common");dojo.require("dojo.math");dojo.declare("dojo.selection.Selection", null,function(items, isCollection){this.items = [];this.selection = [];this._pivotItems = [];this.clearItems();if(items) {if(isCollection) {this.setItemsCollection(items);} else {this.setItems(items);}}},{items: null,selection: null,lastSelected: null,allowImplicit: true,length: 0,isGrowable: true,_pivotItems: null,_pivotItem: null,onSelect: function(item){},onDeselect: function(item){},onSelectChange: function(item, selected){},_find: function(item, inSelection) {if(inSelection) {return dojo.lang.find(this.selection, item);} else {return dojo.lang.find(this.items, item);}},isSelectable: function(item){return true;},setItems: function(){this.clearItems();this.addItems.call(this, arguments);},setItemsCollection: function(collection){this.items = collection;},addItems: functio
n(){var args = dojo.lang.unnest(arguments);for(var i = 0; i < args.length; i++){this.items.push(args[i]);}},addItemsAt: function(item, before ){if(this.items.length == 0){return this.addItems(dojo.lang.toArray(arguments, 2));}
+dojo.provide("dojo.selection.Selection");dojo.require("dojo.lang.array");dojo.require("dojo.lang.func");dojo.require("dojo.lang.common");dojo.require("dojo.math");dojo.declare("dojo.selection.Selection", null,function(items, isCollection){this.items = [];this.selection = [];this._pivotItems = [];this.clearItems();if(items) {if(isCollection) {this.setItemsCollection(items);} else {this.setItems(items);}}
+},{items: null,selection: null,lastSelected: null,allowImplicit: true,length: 0,isGrowable: true,_pivotItems: null,_pivotItem: null,onSelect: function(item){},onDeselect: function(item){},onSelectChange: function(item, selected){},_find: function(item, inSelection) {if(inSelection) {return dojo.lang.find(this.selection, item);} else {return dojo.lang.find(this.items, item);}},isSelectable: function(item){return true;},setItems: function(){this.clearItems();this.addItems.call(this, arguments);},setItemsCollection: function(collection){this.items = collection;},addItems: function(){var args = dojo.lang.unnest(arguments);for(var i = 0; i < args.length; i++){this.items.push(args[i]);}},addItemsAt: function(item, before ){if(this.items.length == 0){return this.addItems(dojo.lang.toArray(arguments, 2));}
if(!this.isItem(item)){item = this.items[item];}
if(!item){ throw new Error("addItemsAt: item doesn't exist"); }
var idx = this._find(item);if(idx > 0 && before){ idx--; }
-for(var i = 2; i < arguments.length; i++){if(!this.isItem(arguments[i])){this.items.splice(idx++, 0, arguments[i]);}}},removeItem: function(item){var idx = this._find(item);if(idx > -1) {this.items.splice(idx, 1);}
+for(var i = 2; i < arguments.length; i++){if(!this.isItem(arguments[i])){this.items.splice(idx++, 0, arguments[i]);}}
+},removeItem: function(item){var idx = this._find(item);if(idx > -1) {this.items.splice(idx, 1);}
idx = this._find(item, true);if(idx > -1) {this.selection.splice(idx, 1);}},clearItems: function(){this.items = [];this.deselectAll();},isItem: function(item){return this._find(item) > -1;},isSelected: function(item){return this._find(item, true) > -1;},selectFilter: function(item, selection, add, grow) {return true;},update: function(item, add, grow, noToggle) {if(!this.isItem(item)){ return false; }
if(this.isGrowable && grow){if( (!this.isSelected(item)) &&
-this.selectFilter(item, this.selection, false, true) ){this.grow(item);this.lastSelected = item;}}else if(add){if(this.selectFilter(item, this.selection, true, false)){if(noToggle){if(this.select(item)){this.lastSelected = item;}}else if(this.toggleSelected(item)){this.lastSelected = item;}}}else{this.deselectAll();this.select(item);}
+this.selectFilter(item, this.selection, false, true) ){this.grow(item);this.lastSelected = item;}}else if(add){if(this.selectFilter(item, this.selection, true, false)){if(noToggle){if(this.select(item)){this.lastSelected = item;}}else if(this.toggleSelected(item)){this.lastSelected = item;}}
+}else{this.deselectAll();this.select(item);}
this.length = this.selection.length;return true;},grow: function(toItem, fromItem){if(!this.isGrowable){ return; }
if(arguments.length == 1){fromItem = this._pivotItem;if(!fromItem && this.allowImplicit){fromItem = this.items[0];}}
if(!toItem || !fromItem){ return false; }
var fromIdx = this._find(fromItem);var toDeselect = {};var lastIdx = -1;if(this.lastSelected){lastIdx = this._find(this.lastSelected);var step = fromIdx < lastIdx ? -1 : 1;var range = dojo.math.range(lastIdx, fromIdx, step);for(var i = 0; i < range.length; i++){toDeselect[range[i]] = true;}}
var toIdx = this._find(toItem);var step = fromIdx < toIdx ? -1 : 1;var shrink = lastIdx >= 0 && step == 1 ? lastIdx < toIdx : lastIdx > toIdx;var range = dojo.math.range(toIdx, fromIdx, step);if(range.length){for(var i = range.length-1; i >= 0; i--){var item = this.items[range[i]];if(this.selectFilter(item, this.selection, false, true)){if(this.select(item, true) || shrink){this.lastSelected = item;}
-if(range[i] in toDeselect){delete toDeselect[range[i]];}}}}else{this.lastSelected = fromItem;}
+if(range[i] in toDeselect){delete toDeselect[range[i]];}}
+}}else{this.lastSelected = fromItem;}
for(var i in toDeselect){if(this.items[i] == this.lastSelected){}
this.deselect(this.items[i]);}
this._updatePivot();},growUp: function(){if(!this.isGrowable){ return; }
@@ -32,7 +36,8 @@
return false;},selectFirst: function(){this.deselectAll();var idx = 0;while(this.items[idx] && !this.select(this.items[idx])){idx++;}
return this.items[idx] ? true : false;},selectLast: function(){this.deselectAll();var idx = this.items.length-1;while(this.items[idx] && !this.select(this.items[idx])) {idx--;}
return this.items[idx] ? true : false;},_addPivot: function(item, andClear){this._pivotItem = item;if(andClear){this._pivotItems = [item];}else{this._pivotItems.push(item);}},_removePivot: function(item){var i = dojo.lang.find(this._pivotItems, item);if(i > -1){this._pivotItems.splice(i, 1);this._pivotItem = this._pivotItems[this._pivotItems.length-1];}
-this._updatePivot();},_updatePivot: function(){if(this._pivotItems.length == 0){if(this.lastSelected){this._addPivot(this.lastSelected);}}},sorted: function(){return dojo.lang.toArray(this.selection).sort(
+this._updatePivot();},_updatePivot: function(){if(this._pivotItems.length == 0){if(this.lastSelected){this._addPivot(this.lastSelected);}}
+},sorted: function(){return dojo.lang.toArray(this.selection).sort(
dojo.lang.hitch(this, function(a, b){var A = this._find(a), B = this._find(b);if(A > B){return 1;}else if(A < B){return -1;}else{return 0;}})
);},updateSelected: function(){for(var i = 0; i < this.selection.length; i++) {if(this._find(this.selection[i]) < 0) {var removed = this.selection.splice(i, 1);this._removePivot(removed[0]);}}
this.length = this.selection.length;}}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,6 @@
dojo.provide("dojo.storage");dojo.require("dojo.lang.*");dojo.require("dojo.event.*");dojo.storage = new function(){}
-dojo.declare("dojo.storage", null, {SUCCESS: "success",FAILED: "failed",PENDING: "pending",SIZE_NOT_AVAILABLE: "Size not available",SIZE_NO_LIMIT: "No size limit",namespace: "default",onHideSettingsUI: null,initialize: function(){dojo.unimplemented("dojo.storage.initialize");},isAvailable: function(){dojo.unimplemented("dojo.storage.isAvailable");},put: function( key,value,resultsHandler){dojo.unimplemented("dojo.storage.put");},get: function( key){dojo.unimplemented("dojo.storage.get");},hasKey: function( key){return (this.get(key) != null);},getKeys: function(){dojo.unimplemented("dojo.storage.getKeys");},clear: function(){dojo.unimplemented("dojo.storage.clear");},remove: function(key){dojo.unimplemented("dojo.storage.remove");},isPermanent: function(){dojo.unimplemented("dojo.storage.isPermanent");},getMaximumSize: function(){dojo.unimplemented("dojo.storage.getMaximumSize");},hasSettingsUI: function(){return false;},showSettingsUI: function(){dojo.unimplemented("dojo.s
torage.showSettingsUI");},hideSettingsUI: function(){dojo.unimplemented("dojo.storage.hideSettingsUI");},getType: function(){dojo.unimplemented("dojo.storage.getType");},isValidKey: function( keyName){if((keyName == null)||(typeof keyName == "undefined")){return false;}
+dojo.declare("dojo.storage", null, {SUCCESS: "success",FAILED: "failed",PENDING: "pending",SIZE_NOT_AVAILABLE: "Size not available",SIZE_NO_LIMIT: "No size limit",namespace: "default",onHideSettingsUI: null,initialize: function(){dojo.unimplemented("dojo.storage.initialize");},isAvailable: function(){dojo.unimplemented("dojo.storage.isAvailable");},put: function( key,value,resultsHandler){dojo.unimplemented("dojo.storage.put");},get: function( key){dojo.unimplemented("dojo.storage.get");},hasKey: function( key){return (this.get(key) != null);},getKeys: function(){dojo.unimplemented("dojo.storage.getKeys");},clear: function(){dojo.unimplemented("dojo.storage.clear");},remove: function(key){dojo.unimplemented("dojo.storage.remove");},isPermanent: function(){dojo.unimplemented("dojo.storage.isPermanent");},getMaximumSize: function(){dojo.unimplemented("dojo.storage.getMaximumSize");},hasSettingsUI: function(){return false;},showSettingsUI: function(){dojo.unimplemented("dojo.st
orage.showSettingsUI");},hideSettingsUI: function(){dojo.unimplemented("dojo.storage.hideSettingsUI");},getType: function(){dojo.unimplemented("dojo.storage.getType");},isValidKey: function( keyName){if((keyName == null)||(typeof keyName == "undefined")){return false;}
return /^[0-9A-Za-z_]*$/.test(keyName);}});dojo.storage.manager = new function(){this.currentProvider = null;this.available = false;this._initialized = false;this._providers = [];this.namespace = "default";this.initialize = function(){this.autodetect();};this.register = function( name, instance) {this._providers[this._providers.length] = instance;this._providers[name] = instance;};this.setProvider = function(storageClass){};this.autodetect = function(){if(this._initialized == true){return;}
var providerToUse = null;for(var i = 0; i < this._providers.length; i++){providerToUse = this._providers[i];if(dojo.lang.isUndefined(djConfig["forceStorageProvider"]) == false
&& providerToUse.getType() == djConfig["forceStorageProvider"]){providerToUse.isAvailable();break;}else if(dojo.lang.isUndefined(djConfig["forceStorageProvider"]) == true
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: ["dojo.storage"],browser: ["dojo.storage.browser"]});dojo.provide("dojo.storage.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: ["dojo.storage"],browser: ["dojo.storage.browser"]
+});dojo.provide("dojo.storage.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/browser.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/browser.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/browser.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/browser.js Thu Dec 14 07:45:13 2006
@@ -36,7 +36,8 @@
dojo.raise("dojo.storage.browser.FileStorageProvider._loadFileJava(): " + msg);}},_isAvailableActiveX: function(){try{if(window.ActiveXObject){var fileSystem = new window.ActiveXObject("Scripting.FileSystemObject");return true;}}catch(e){dojo.debug(e);}
return false;},_isAvailableXPCOM: function(){try{if(window.Components){netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile);return true;}}catch(e){dojo.debug(e);}
-return false;},_isAvailableJava: function(){try{if(dojo.render.html.safari == true || dojo.render.html.opera == true()){if(navigator.javaEnabled() == true){return true;}}}catch(e){dojo.debug(e);}
+return false;},_isAvailableJava: function(){try{if(dojo.render.html.safari == true || dojo.render.html.opera == true()){if(navigator.javaEnabled() == true){return true;}}
+}catch(e){dojo.debug(e);}
return false;},_getPagePath: function(){var path = window.location.pathname;if(/\.html?$/i.test(path)){path = path.replace(/(?:\/|\\)?[^\.\/\\]*\.html?$/, "");}
if(/^\/?[a-z]+\:/i.test(path)){path = path.replace(/^\/?/, "");path = path.replace(/\//g, "\\");}else if(/^[\/\\]{2,3}[^\/]/.test(path)){path = path.replace(/^[\/\\]{2,3}/, "");path = path.replace(/\//g, "\\");path = "\\\\" + path;}
if(/\/$/.test(path) == false
@@ -76,4 +77,5 @@
return results;},getKeys: function(){var results = dojo.flash.comm.getKeys(this.namespace);if(results == ""){return [];}
return results.split(",");},clear: function(){dojo.flash.comm.clear(this.namespace);},remove: function(key){dojo.unimplemented("dojo.storage.browser.FlashStorageProvider.remove");},isPermanent: function(){return true;},getMaximumSize: function(){return dojo.storage.SIZE_NO_LIMIT;},hasSettingsUI: function(){return true;},showSettingsUI: function(){dojo.flash.comm.showSettings();dojo.flash.obj.setVisible(true);dojo.flash.obj.center();},hideSettingsUI: function(){dojo.flash.obj.setVisible(false);if(dojo.storage.onHideSettingsUI != null &&
!dojo.lang.isUndefined(dojo.storage.onHideSettingsUI)){dojo.storage.onHideSettingsUI.call(null);}},getType: function(){return "dojo.storage.browser.FlashStorageProvider";},_flashLoaded: function(){this._initialized = true;dojo.storage.manager.loaded();},_onStatus: function(statusResult, key){var ds = dojo.storage;var dfo = dojo.flash.obj;if(statusResult == ds.PENDING){dfo.center();dfo.setVisible(true);}else{dfo.setVisible(false);}
-if((!dj_undef("_statusHandler", ds))&&(ds._statusHandler != null)){ds._statusHandler.call(null, statusResult, key);}}});dojo.storage.manager.register("dojo.storage.browser.FileStorageProvider",new dojo.storage.browser.FileStorageProvider());dojo.storage.manager.register("dojo.storage.browser.WhatWGStorageProvider",new dojo.storage.browser.WhatWGStorageProvider());dojo.storage.manager.register("dojo.storage.browser.FlashStorageProvider",new dojo.storage.browser.FlashStorageProvider());dojo.storage.manager.initialize();
\ No newline at end of file
+if((!dj_undef("_statusHandler", ds))&&(ds._statusHandler != null)){ds._statusHandler.call(null, statusResult, key);}}
+});dojo.storage.manager.register("dojo.storage.browser.FileStorageProvider",new dojo.storage.browser.FileStorageProvider());dojo.storage.manager.register("dojo.storage.browser.WhatWGStorageProvider",new dojo.storage.browser.WhatWGStorageProvider());dojo.storage.manager.register("dojo.storage.browser.FlashStorageProvider",new dojo.storage.browser.FlashStorageProvider());dojo.storage.manager.initialize();
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/java/DojoFileStorageProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/java/DojoFileStorageProvider.java?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/java/DojoFileStorageProvider.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/storage/java/DojoFileStorageProvider.java Thu Dec 14 07:45:13 2006
@@ -1,62 +1,54 @@
/**
- * CHECKSTYLE:OFF
- * This is a simple class that can load, save, and remove files from the native file system. It is
- * needed by Safari and Opera for the dojo.storage.browser.FileStorageProvider, since both of these
- * platforms have no native way to talk to the file system for file:// URLs. Safari supports
- * LiveConnect, but only for talking to an applet, not for generic scripting by JavaScript, so we
- * must have an applet.
- *
- * @author Brad Neuberg, bkn3@columbia.edu
- */
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * Browser files storage provider.
- */
-public class DojoFileStorageProvider
-{
-
- public String load(String filePath)
- throws IOException, FileNotFoundException
- {
- StringBuffer results = new StringBuffer();
- BufferedReader reader = new BufferedReader(new FileReader(filePath));
- String line = null;
- while((line = reader.readLine()) != null) {
- results.append(line);
- }
-
- reader.close();
-
- return results.toString();
- }
-
- public void save(String filePath, String content)
- throws IOException, FileNotFoundException
- {
- PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(filePath, false)));
- writer.print(content);
-
- writer.close();
- }
-
- public void remove(String filePath)
- throws IOException, FileNotFoundException
- {
- File f = new File(filePath);
-
- if (f.exists() == false || f.isDirectory()) { return; }
-
- if (f.exists() && f.isFile()) {
- f.delete();
- }
- }
+ This is a simple class that can load, save, and remove
+ files from the native file system. It is needed by Safari and Opera
+ for the dojo.storage.browser.FileStorageProvider, since both of
+ these platforms have no native way to talk to the file system
+ for file:// URLs. Safari supports LiveConnect, but only for talking
+ to an applet, not for generic scripting by JavaScript, so we must
+ have an applet.
+
+ @author Brad Neuberg, bkn3@columbia.edu
+*/
+
+import java.io.*;
+import java.util.*;
+
+public class DojoFileStorageProvider{
+ public String load(String filePath)
+ throws IOException, FileNotFoundException{
+ StringBuffer results = new StringBuffer();
+ BufferedReader reader = new BufferedReader(
+ new FileReader(filePath));
+ String line = null;
+ while((line = reader.readLine()) != null){
+ results.append(line);
+ }
+
+ reader.close();
+
+ return results.toString();
+ }
+
+ public void save(String filePath, String content)
+ throws IOException, FileNotFoundException{
+ PrintWriter writer = new PrintWriter(
+ new BufferedWriter(
+ new FileWriter(filePath, false)));
+ writer.print(content);
+
+ writer.close();
+ }
+
+ public void remove(String filePath)
+ throws IOException, FileNotFoundException{
+ File f = new File(filePath);
+
+ if(f.exists() == false || f.isDirectory()){
+ return;
+ }
+
+ if(f.exists() && f.isFile()){
+ f.delete();
+ }
+ }
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/Builder.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/Builder.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/Builder.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/Builder.js Thu Dec 14 07:45:13 2006
@@ -9,6 +9,7 @@
return this;};this.replace = function(o, n){if(this.arrConcat){b = a.join("");}
a = [];b = b.replace(o,n);length = this.length = b.length;if(this.arrConcat){a.push(b);b="";}
return this;};this.insert = function(idx, s){if(this.arrConcat){b = a.join("");}
-a=[];if(idx == 0){b = s + b;}else{var t = b.split("");t.splice(idx,0,s);b = t.join("")}
+a=[];if(idx == 0){b = s + b;}else{var t = b.split("");t.splice(idx,0,s);b = t.join("")
+}
length = this.length = b.length;if(this.arrConcat){a.push(b);b="";}
return this;};this.append.apply(this, arguments);};
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/string/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
dojo.kwCompoundRequire({common: [
"dojo.string","dojo.string.common","dojo.string.extras","dojo.string.Builder"
-]});dojo.provide("dojo.string.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.string.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/Manager.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/Manager.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/Manager.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/Manager.js Thu Dec 14 07:45:13 2006
@@ -7,10 +7,13 @@
this.isRedoing = true;var top = this._redoStack.pop();if(top instanceof dojo.undo.Manager) {top.redoAll();}else{top.redo();}
this._undoStack.push(top);this.isRedoing = false;this._updateStatus();this.onRedo(this, top);if(!(top instanceof dojo.undo.Manager)){this.getTop().onRedoAny(this, top);}
return true;},undoAll: function() {while(this._undoStack.length > 0) {this.undo();}},redoAll: function() {while(this._redoStack.length > 0) {this.redo();}},push: function(undo, redo, description) {if(!undo) { return; }
-if(this._currentManager == this) {this._undoStack.push({undo: undo,redo: redo,description: description});} else {this._currentManager.push.apply(this._currentManager, arguments);}
+if(this._currentManager == this) {this._undoStack.push({undo: undo,redo: redo,description: description
+});} else {this._currentManager.push.apply(this._currentManager, arguments);}
this._redoStack = [];this._updateStatus();},concat: function(manager) {if ( !manager ) { return; }
if (this._currentManager == this ) {for(var x=0; x < manager._undoStack.length; x++) {this._undoStack.push(manager._undoStack[x]);}
if (manager._undoStack.length > 0) {this._redoStack = [];}
this._updateStatus();} else {this._currentManager.concat.apply(this._currentManager, arguments);}},beginTransaction: function(description) {if(this._currentManager == this) {var mgr = new dojo.undo.Manager(this);mgr.description = description ? description : "";this._undoStack.push(mgr);this._currentManager = mgr;return mgr;} else {this._currentManager = this._currentManager.beginTransaction.apply(this._currentManager, arguments);}},endTransaction: function(flatten ) {if(this._currentManager == this) {if(this._parent) {this._parent._currentManager = this._parent;if(this._undoStack.length == 0 || flatten) {var idx = dojo.lang.find(this._parent._undoStack, this);if (idx >= 0) {this._parent._undoStack.splice(idx, 1);if (flatten) {for(var x=0; x < this._undoStack.length; x++){this._parent._undoStack.splice(idx++, 0, this._undoStack[x]);}
-this._updateStatus();}}}
-return this._parent;}} else {this._currentManager = this._currentManager.endTransaction.apply(this._currentManager, arguments);}},endAllTransactions: function() {while(this._currentManager != this) {this.endTransaction();}},getTop: function() {if(this._parent) {return this._parent.getTop();} else {return this;}}});
\ No newline at end of file
+this._updateStatus();}}
+}
+return this._parent;}} else {this._currentManager = this._currentManager.endTransaction.apply(this._currentManager, arguments);}},endAllTransactions: function() {while(this._currentManager != this) {this.endTransaction();}},getTop: function() {if(this._parent) {return this._parent.getTop();} else {return this;}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/browser.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/browser.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/browser.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/undo/browser.js Thu Dec 14 07:45:13 2006
@@ -9,14 +9,17 @@
if(args["back"]){args.back = tcb;}else if(args["backButton"]){args.backButton = tcb;}else if(args["handle"]){args.handle = tcb;}
var oldFW = args["forward"]||args["forwardButton"]||args["handle"];var tfw = function(handleName){if(window.location.hash != ""){window.location.href = hash;}
if(oldFW){oldFW.apply(this, [handleName]);}}
-if(args["forward"]){args.forward = tfw;}else if(args["forwardButton"]){args.forwardButton = tfw;}else if(args["handle"]){args.handle = tfw;}}else if(dojo.render.html.moz){if(!this.locationTimer){this.locationTimer = setInterval("dojo.undo.browser.checkLocation();", 200);}}}else{url = this._loadIframeHistory();}
+if(args["forward"]){args.forward = tfw;}else if(args["forwardButton"]){args.forwardButton = tfw;}else if(args["handle"]){args.handle = tfw;}}else if(dojo.render.html.moz){if(!this.locationTimer){this.locationTimer = setInterval("dojo.undo.browser.checkLocation();", 200);}}
+}else{url = this._loadIframeHistory();}
this.historyStack.push(this._createState(url, args, hash));},checkLocation: function(){if (!this.changingUrl){var hsl = this.historyStack.length;if((window.location.hash == this.initialHash||window.location.href == this.initialHref)&&(hsl == 1)){this.handleBackButton();return;}
if(this.forwardStack.length > 0){if(this.forwardStack[this.forwardStack.length-1].urlHash == window.location.hash){this.handleForwardButton();return;}}
-if((hsl >= 2)&&(this.historyStack[hsl-2])){if(this.historyStack[hsl-2].urlHash==window.location.hash){this.handleBackButton();return;}}}},iframeLoaded: function(evt, ifrLoc){if(!dojo.render.html.opera){var query = this._getUrlQuery(ifrLoc.href);if(query == null){if(this.historyStack.length == 1){this.handleBackButton();}
+if((hsl >= 2)&&(this.historyStack[hsl-2])){if(this.historyStack[hsl-2].urlHash==window.location.hash){this.handleBackButton();return;}}
+}},iframeLoaded: function(evt, ifrLoc){if(!dojo.render.html.opera){var query = this._getUrlQuery(ifrLoc.href);if(query == null){if(this.historyStack.length == 1){this.handleBackButton();}
return;}
if(this.moveForward){this.moveForward = false;return;}
if(this.historyStack.length >= 2 && query == this._getUrlQuery(this.historyStack[this.historyStack.length-2].url)){this.handleBackButton();}
-else if(this.forwardStack.length > 0 && query == this._getUrlQuery(this.forwardStack[this.forwardStack.length-1].url)){this.handleForwardButton();}}},handleBackButton: function(){var current = this.historyStack.pop();if(!current){ return; }
+else if(this.forwardStack.length > 0 && query == this._getUrlQuery(this.forwardStack[this.forwardStack.length-1].url)){this.handleForwardButton();}}
+},handleBackButton: function(){var current = this.historyStack.pop();if(!current){ return; }
var last = this.historyStack[this.historyStack.length-1];if(!last && this.historyStack.length == 0){last = this.initialState;}
if (last){if(last.kwArgs["back"]){last.kwArgs["back"]();}else if(last.kwArgs["backButton"]){last.kwArgs["backButton"]();}else if(last.kwArgs["handle"]){last.kwArgs.handle("back");}}
this.forwardStack.push(current);},handleForwardButton: function(){var last = this.forwardStack.pop();if(!last){ return; }
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/Uri.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/Uri.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/Uri.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/Uri.js Thu Dec 14 07:45:13 2006
@@ -12,4 +12,5 @@
uri += relobj.path;if (relobj.query != null) { uri += "?" + relobj.query; }
if (relobj.fragment != null) { uri += "#" + relobj.fragment; }}
this.uri = uri.toString();var r = this.uri.match(uriPattern);this.scheme = r[2] || (r[1] ? "" : null);this.authority = r[4] || (r[3] ? "" : null);this.path = r[5];this.query = r[7] || (r[6] ? "" : null);this.fragment = r[9] || (r[8] ? "" : null);if (this.authority != null) {r = this.authority.match(authorityPattern);this.user = r[3] || null;this.password = r[4] || null;this.host = r[5];this.port = r[7] || null;}
-this.toString = function(){ return this.uri; }}};
\ No newline at end of file
+this.toString = function(){ return this.uri; }}
+};
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uri/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.kwCompoundRequire({common: [["dojo.uri.Uri", false, false]]});dojo.provide("dojo.uri.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: [["dojo.uri.Uri", false, false]]
+});dojo.provide("dojo.uri.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/TimeBasedGenerator.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/TimeBasedGenerator.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/TimeBasedGenerator.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/TimeBasedGenerator.js Thu Dec 14 07:45:13 2006
@@ -17,13 +17,15 @@
node = _uuidPseudoNodeString;}}
if (!_uuidClockSeqString) {var variantCodeForDCEUuids = 0x8000;var random14bitNumber = Math.floor( (Math.random() % 1) * Math.pow(2, 14) );_uuidClockSeqString = (variantCodeForDCEUuids | random14bitNumber).toString(HEX_RADIX);}
var now = new Date();var millisecondsSince1970 = now.valueOf();var nowArray = _get64bitArrayFromFloat(millisecondsSince1970);if (!_cachedMillisecondsBetween1582and1970) {var arraySecondsPerHour = _get64bitArrayFromFloat(60 * 60);var arrayHoursBetween1582and1970 = _get64bitArrayFromFloat(dojo.uuid.TimeBasedGenerator.GREGORIAN_CHANGE_OFFSET_IN_HOURS);var arraySecondsBetween1582and1970 = _multiplyTwo64bitArrays(arrayHoursBetween1582and1970, arraySecondsPerHour);var arrayMillisecondsPerSecond = _get64bitArrayFromFloat(1000);_cachedMillisecondsBetween1582and1970 = _multiplyTwo64bitArrays(arraySecondsBetween1582and1970, arrayMillisecondsPerSecond);_cachedHundredNanosecondIntervalsPerMillisecond = _get64bitArrayFromFloat(10000);}
-var arrayMillisecondsSince1970 = nowArray;var arrayMillisecondsSince1582 = _addTwo64bitArrays(_cachedMillisecondsBetween1582and1970, arrayMillisecondsSince1970);var arrayHundredNanosecondIntervalsSince1582 = _multiplyTwo64bitArrays(arrayMillisecondsSince1582, _cachedHundredNanosecondIntervalsPerMillisecond);if (now.valueOf() == _dateValueOfPreviousUuid) {arrayHundredNanosecondIntervalsSince1582[3] += _nextIntraMillisecondIncrement;_carry(arrayHundredNanosecondIntervalsSince1582);_nextIntraMillisecondIncrement += 1;if (_nextIntraMillisecondIncrement == 10000) {while (now.valueOf() == _dateValueOfPreviousUuid) {now = new Date();}}} else {_dateValueOfPreviousUuid = now.valueOf();_nextIntraMillisecondIncrement = 1;}
+var arrayMillisecondsSince1970 = nowArray;var arrayMillisecondsSince1582 = _addTwo64bitArrays(_cachedMillisecondsBetween1582and1970, arrayMillisecondsSince1970);var arrayHundredNanosecondIntervalsSince1582 = _multiplyTwo64bitArrays(arrayMillisecondsSince1582, _cachedHundredNanosecondIntervalsPerMillisecond);if (now.valueOf() == _dateValueOfPreviousUuid) {arrayHundredNanosecondIntervalsSince1582[3] += _nextIntraMillisecondIncrement;_carry(arrayHundredNanosecondIntervalsSince1582);_nextIntraMillisecondIncrement += 1;if (_nextIntraMillisecondIncrement == 10000) {while (now.valueOf() == _dateValueOfPreviousUuid) {now = new Date();}}
+} else {_dateValueOfPreviousUuid = now.valueOf();_nextIntraMillisecondIncrement = 1;}
var hexTimeLowLeftHalf = arrayHundredNanosecondIntervalsSince1582[2].toString(HEX_RADIX);var hexTimeLowRightHalf = arrayHundredNanosecondIntervalsSince1582[3].toString(HEX_RADIX);var hexTimeLow = _padWithLeadingZeros(hexTimeLowLeftHalf, 4) + _padWithLeadingZeros(hexTimeLowRightHalf, 4);var hexTimeMid = arrayHundredNanosecondIntervalsSince1582[1].toString(HEX_RADIX);hexTimeMid = _padWithLeadingZeros(hexTimeMid, 4);var hexTimeHigh = arrayHundredNanosecondIntervalsSince1582[0].toString(HEX_RADIX);hexTimeHigh = _padWithLeadingZeros(hexTimeHigh, 3);var hyphen = "-";var versionCodeForTimeBasedUuids = "1";var resultUuid = hexTimeLow + hyphen + hexTimeMid + hyphen +
versionCodeForTimeBasedUuids + hexTimeHigh + hyphen +
_uuidClockSeqString + hyphen + node;resultUuid = resultUuid.toLowerCase();return resultUuid;}
this.setNode = function( node) {dojo.lang.assert((node === null) || (node.length == 12));_uniformNode = node;};this.getNode = function() {return _uniformNode;};this.generate = function( input) {var nodeString = null;var returnType = null;if (input) {if (dojo.lang.isObject(input) && !dojo.lang.isBuiltIn(input)) {var namedParameters = input;dojo.lang.assertValidKeywords(namedParameters, ["node", "hardwareNode", "pseudoNode", "returnType"]);var node = namedParameters["node"];var hardwareNode = namedParameters["hardwareNode"];var pseudoNode = namedParameters["pseudoNode"];nodeString = (node || pseudoNode || hardwareNode);if (nodeString) {var firstCharacter = nodeString.charAt(0);var firstDigit = parseInt(firstCharacter, HEX_RADIX);if (hardwareNode) {dojo.lang.assert((firstDigit >= 0x0) && (firstDigit <= 0x7));}
if (pseudoNode) {dojo.lang.assert((firstDigit >= 0x8) && (firstDigit <= 0xF));}}
-returnType = namedParameters["returnType"];dojo.lang.assertType(returnType, Function, {optional: true});} else {if (dojo.lang.isString(input)) {nodeString = input;returnType = null;} else {if (dojo.lang.isFunction(input)) {nodeString = null;returnType = input;}}}
+returnType = namedParameters["returnType"];dojo.lang.assertType(returnType, Function, {optional: true});} else {if (dojo.lang.isString(input)) {nodeString = input;returnType = null;} else {if (dojo.lang.isFunction(input)) {nodeString = null;returnType = input;}}
+}
if (nodeString) {dojo.lang.assert(nodeString.length == 12);var integer = parseInt(nodeString, HEX_RADIX);dojo.lang.assert(isFinite(integer));}
dojo.lang.assertType(returnType, Function, {optional: true});}
var uuidString = _generateUuidString(nodeString);var returnValue;if (returnType && (returnType != String)) {returnValue = new returnType(uuidString);} else {returnValue = uuidString;}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/Uuid.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/Uuid.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/Uuid.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/Uuid.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,7 @@
-dojo.provide("dojo.uuid.Uuid");dojo.require("dojo.lang.common");dojo.require("dojo.lang.assert");dojo.uuid.Uuid = function( input) {this._uuidString = dojo.uuid.Uuid.NIL_UUID;if (input) {if (dojo.lang.isString(input)) {this._uuidString = input.toLowerCase();dojo.lang.assert(this.isValid());} else {if (dojo.lang.isObject(input) && input.generate) {var generator = input;this._uuidString = generator.generate();dojo.lang.assert(this.isValid());} else {dojo.lang.assert(false, "The dojo.uuid.Uuid() constructor must be initializated with a UUID string.");}}} else {var ourGenerator = dojo.uuid.Uuid.getGenerator();if (ourGenerator) {this._uuidString = ourGenerator.generate();dojo.lang.assert(this.isValid());}}};dojo.uuid.Uuid.NIL_UUID = "00000000-0000-0000-0000-000000000000";dojo.uuid.Uuid.Version = {UNKNOWN: 0,TIME_BASED: 1,DCE_SECURITY: 2,NAME_BASED_MD5: 3,RANDOM: 4,NAME_BASED_SHA1: 5 };dojo.uuid.Uuid.Variant = {NCS: "0",DCE: "10",MICROSOFT: "110",UNKNOWN: "111" };dojo.uuid.Uuid.HE
X_RADIX = 16;dojo.uuid.Uuid.compare = function( uuidOne, uuidTwo) {var uuidStringOne = uuidOne.toString();var uuidStringTwo = uuidTwo.toString();if (uuidStringOne > uuidStringTwo) return 1;if (uuidStringOne < uuidStringTwo) return -1;return 0;};dojo.uuid.Uuid.setGenerator = function( generator) {dojo.lang.assert(!generator || (dojo.lang.isObject(generator) && generator.generate));dojo.uuid.Uuid._ourGenerator = generator;};dojo.uuid.Uuid.getGenerator = function() {return dojo.uuid.Uuid._ourGenerator;};dojo.uuid.Uuid.prototype.toString = function(format) {if (format) {switch (format) {case '{}':
+dojo.provide("dojo.uuid.Uuid");dojo.require("dojo.lang.common");dojo.require("dojo.lang.assert");dojo.uuid.Uuid = function( input) {this._uuidString = dojo.uuid.Uuid.NIL_UUID;if (input) {if (dojo.lang.isString(input)) {this._uuidString = input.toLowerCase();dojo.lang.assert(this.isValid());} else {if (dojo.lang.isObject(input) && input.generate) {var generator = input;this._uuidString = generator.generate();dojo.lang.assert(this.isValid());} else {dojo.lang.assert(false, "The dojo.uuid.Uuid() constructor must be initializated with a UUID string.");}}
+} else {var ourGenerator = dojo.uuid.Uuid.getGenerator();if (ourGenerator) {this._uuidString = ourGenerator.generate();dojo.lang.assert(this.isValid());}}
+};dojo.uuid.Uuid.NIL_UUID = "00000000-0000-0000-0000-000000000000";dojo.uuid.Uuid.Version = {UNKNOWN: 0,TIME_BASED: 1,DCE_SECURITY: 2,NAME_BASED_MD5: 3,RANDOM: 4,NAME_BASED_SHA1: 5 };dojo.uuid.Uuid.Variant = {NCS: "0",DCE: "10",MICROSOFT: "110",UNKNOWN: "111" };dojo.uuid.Uuid.HEX_RADIX = 16;dojo.uuid.Uuid.compare = function( uuidOne, uuidTwo) {var uuidStringOne = uuidOne.toString();var uuidStringTwo = uuidTwo.toString();if (uuidStringOne > uuidStringTwo) return 1;if (uuidStringOne < uuidStringTwo) return -1;return 0;};dojo.uuid.Uuid.setGenerator = function( generator) {dojo.lang.assert(!generator || (dojo.lang.isObject(generator) && generator.generate));dojo.uuid.Uuid._ourGenerator = generator;};dojo.uuid.Uuid.getGenerator = function() {return dojo.uuid.Uuid._ourGenerator;};dojo.uuid.Uuid.prototype.toString = function(format) {if (format) {switch (format) {case '{}':
return '{' + this._uuidString + '}';break;case '()':
return '(' + this._uuidString + ')';break;case '""':
return '"' + this._uuidString + '"';break;case "''":
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/uuid/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
dojo.kwCompoundRequire({common: [
"dojo.uuid.Uuid","dojo.uuid.LightweightGenerator","dojo.uuid.RandomGenerator","dojo.uuid.TimeBasedGenerator","dojo.uuid.NameBasedGenerator","dojo.uuid.NilGenerator"
-]});dojo.provide("dojo.uuid.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.uuid.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,4 @@
-dojo.require("dojo.validate");dojo.kwCompoundRequire({common: ["dojo.validate.check","dojo.validate.datetime","dojo.validate.de","dojo.validate.jp","dojo.validate.us","dojo.validate.web"
-]});dojo.provide("dojo.validate.*");
\ No newline at end of file
+dojo.require("dojo.validate");dojo.kwCompoundRequire({common:["dojo.validate.check","dojo.validate.datetime","dojo.validate.de","dojo.validate.jp","dojo.validate.us","dojo.validate.web"
+]
+});dojo.provide("dojo.validate.*");
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/check.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/check.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/check.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/check.js Thu Dec 14 07:45:13 2006
@@ -17,13 +17,15 @@
&& (elem.selectedIndex == -1
|| /^\s*$/.test(elem.options[elem.selectedIndex].value))){missing[missing.length] = elem.name;}
else if(elem instanceof Array){var checked = false;for(var j = 0; j < elem.length; j++){if (elem[j].checked) { checked = true; }}
-if(!checked){missing[missing.length] = elem[0].name;}}}}
+if(!checked){missing[missing.length] = elem[0].name;}}
+}}
if(profile.required instanceof Array){for (var i = 0; i < profile.required.length; i++){if(!dojo.lang.isObject(profile.required[i])){ continue; }
var elem, numRequired;for(var name in profile.required[i]){elem = form[name];numRequired = profile.required[i][name];}
if(elem instanceof Array){var checked = 0;for(var j = 0; j < elem.length; j++){if(elem[j].checked){ checked++; }}
if(checked < numRequired){missing[missing.length] = elem[0].name;}}
else if(!dj_undef("type", elem) && elem.type == "select-multiple" ){var selected = 0;for(var j = 0; j < elem.options.length; j++){if (elem.options[j].selected && !/^\s*$/.test(elem.options[j].value)) { selected++; }}
-if(selected < numRequired){missing[missing.length] = elem.name;}}}}
+if(selected < numRequired){missing[missing.length] = elem.name;}}
+}}
if(dojo.lang.isObject(profile.dependencies)){for(name in profile.dependencies){var elem = form[name];if(dj_undef("type", elem)){continue;}
if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
if(/\S+/.test(elem.value)){ continue; }
@@ -36,8 +38,10 @@
&& (elem.tagName.toLowerCase().indexOf("input") >= 0
|| elem.tagName.toLowerCase().indexOf("textarea") >= 0)
&& /^\s*$/.test(elem.value)){continue;}
-var isValid = true;if(dojo.lang.isFunction(profile.constraints[name])){isValid = profile.constraints[name](elem.value);}else if(dojo.lang.isArray(profile.constraints[name])){if(dojo.lang.isArray(profile.constraints[name][0])){for (var i=0; i<profile.constraints[name].length; i++){isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name][i], name, elem);if(!isValid){ break; }}}else{isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name], name, elem);}}
-if(!isValid){invalid[invalid.length] = elem.name;}}}
+var isValid = true;if(dojo.lang.isFunction(profile.constraints[name])){isValid = profile.constraints[name](elem.value);}else if(dojo.lang.isArray(profile.constraints[name])){if(dojo.lang.isArray(profile.constraints[name][0])){for (var i=0; i<profile.constraints[name].length; i++){isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name][i], name, elem);if(!isValid){ break; }}
+}else{isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name], name, elem);}}
+if(!isValid){invalid[invalid.length] = elem.name;}}
+}
if(dojo.lang.isObject(profile.confirm)){for(name in profile.confirm){var elem = form[name];var target = form[profile.confirm[name]];if (dj_undef("type", elem) || dj_undef("type", target) || (elem.type != "text" && elem.type != "textarea" && elem.type != "password")
||(target.type != elem.type)
||(target.value == elem.value)
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/creditCard.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/creditCard.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/creditCard.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/creditCard.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,8 @@
dojo.provide('dojo.validate.creditCard');dojo.require("dojo.lang.common");dojo.require("dojo.validate.common");dojo.validate.isValidCreditCard = function(value, ccType){if(value&&ccType&&((ccType.toLowerCase()=='er'||dojo.validate.isValidLuhn(value))&&(dojo.validate.isValidCreditCardNumber(value,ccType.toLowerCase())))){return true;}
return false;}
dojo.validate.isValidCreditCardNumber = function(value,ccType) {if(typeof value!='string'){value = String(value);}
-value = value.replace(/[- ]/g,'');var results=[];var cardinfo = {'mc':'5[1-5][0-9]{14}','ec':'5[1-5][0-9]{14}','vi':'4([0-9]{12}|[0-9]{15})','ax':'3[47][0-9]{13}', 'dc':'3(0[0-5][0-9]{11}|[68][0-9]{12})','bl':'3(0[0-5][0-9]{11}|[68][0-9]{12})','di':'6011[0-9]{12}','jcb':'(3[0-9]{15}|(2131|1800)[0-9]{11})','er':'2(014|149)[0-9]{11}'};if(ccType&&dojo.lang.has(cardinfo,ccType.toLowerCase())){return Boolean(value.match(cardinfo[ccType.toLowerCase()]));}else{for(var p in cardinfo){if(value.match('^'+cardinfo[p]+'$')!=null){results.push(p);}}
+value = value.replace(/[- ]/g,'');var results=[];var cardinfo = {'mc':'5[1-5][0-9]{14}','ec':'5[1-5][0-9]{14}','vi':'4([0-9]{12}|[0-9]{15})','ax':'3[47][0-9]{13}', 'dc':'3(0[0-5][0-9]{11}|[68][0-9]{12})','bl':'3(0[0-5][0-9]{11}|[68][0-9]{12})','di':'6011[0-9]{12}','jcb':'(3[0-9]{15}|(2131|1800)[0-9]{11})','er':'2(014|149)[0-9]{11}'
+};if(ccType&&dojo.lang.has(cardinfo,ccType.toLowerCase())){return Boolean(value.match(cardinfo[ccType.toLowerCase()]));}else{for(var p in cardinfo){if(value.match('^'+cardinfo[p]+'$')!=null){results.push(p);}}
return (results.length)?results.join('|'):false;}}
dojo.validate.isValidCvv = function(value, ccType) {if(typeof value!='string'){value=String(value);}
var format;switch (ccType.toLowerCase()){case 'mc':
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/de.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/de.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/de.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/de.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.provide("dojo.validate.de");dojo.require("dojo.validate.common");dojo.validate.isGermanCurrency = function(value) {var flags = {symbol: "\u20AC",placement: "after",signPlacement: "begin",decimal: ",",separator: "."};return dojo.validate.isCurrency(value, flags);}
+dojo.provide("dojo.validate.de");dojo.require("dojo.validate.common");dojo.validate.isGermanCurrency = function(value) {var flags = {symbol: "\u20AC",placement: "after",signPlacement: "begin",decimal: ",",separator: "."
+};return dojo.validate.isCurrency(value, flags);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/jp.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/jp.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/jp.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/jp.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
-dojo.provide("dojo.validate.jp");dojo.require("dojo.validate.common");dojo.validate.isJapaneseCurrency = function(value) {var flags = {symbol: "\u00a5",fractional: false};return dojo.validate.isCurrency(value, flags);}
+dojo.provide("dojo.validate.jp");dojo.require("dojo.validate.common");dojo.validate.isJapaneseCurrency = function(value) {var flags = {symbol: "\u00a5",fractional: false
+};return dojo.validate.isCurrency(value, flags);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/us.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/us.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/us.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/validate/us.js Thu Dec 14 07:45:13 2006
@@ -3,10 +3,13 @@
dojo.validate.us.isState = function(value, flags){var re = new RegExp("^" + dojo.regexp.us.state(flags) + "$", "i");return re.test(value);}
dojo.validate.us.isPhoneNumber = function(value){var flags = {format: [
"###-###-####","(###) ###-####","(###) ### ####","###.###.####","###/###-####","### ### ####","###-###-#### x#???","(###) ###-#### x#???","(###) ### #### x#???","###.###.#### x#???","###/###-#### x#???","### ### #### x#???","##########"
-]};return dojo.validate.isNumberFormat(value, flags);}
+]
+};return dojo.validate.isNumberFormat(value, flags);}
dojo.validate.us.isSocialSecurityNumber = function(value){var flags = {format: [
"###-##-####","### ## ####","#########"
-]};return dojo.validate.isNumberFormat(value, flags);}
+]
+};return dojo.validate.isNumberFormat(value, flags);}
dojo.validate.us.isZipCode = function(value){var flags = {format: [
"#####-####","##### ####","#########","#####"
-]};return dojo.validate.isNumberFormat(value, flags);}
+]
+};return dojo.validate.isNumberFormat(value, flags);}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/AccordionContainer.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/AccordionContainer.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/AccordionContainer.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/AccordionContainer.js Thu Dec 14 07:45:13 2006
@@ -6,4 +6,6 @@
);dojo.widget.defineWidget(
"dojo.widget.AccordionPane",dojo.widget.HtmlWidget,{label: "","class": "dojoAccordionPane",labelNodeClass: "label",containerNodeClass: "accBody",selected: false,templatePath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.css"),isContainer: true,fillInTemplate: function() {dojo.html.addClass(this.domNode, this["class"]);dojo.widget.AccordionPane.superclass.fillInTemplate.call(this);dojo.html.disableSelection(this.labelNode);this.setSelected(this.selected);},setLabel: function( label) {this.labelNode.innerHTML=label;},resizeTo: function(width, height){dojo.html.setMarginBox(this.domNode, {width: width, height: height});var children = [
{domNode: this.labelNode, layoutAlign: "top"},{domNode: this.containerNode, layoutAlign: "client"}
-];dojo.widget.html.layout(this.domNode, children);var childSize = dojo.html.getContentBox(this.containerNode);this.children[0].resizeTo(childSize.width, childSize.height);},getLabelHeight: function() {return dojo.html.getMarginBox(this.labelNode).height;},onLabelClick: function() {this.parent.selectChild(this);},setSelected: function( isSelected){this.selected=isSelected;(isSelected ? dojo.html.addClass : dojo.html.removeClass)(this.domNode, this["class"]+"-selected");var child = this.children[0];if(child){if(isSelected){if(!child.isShowing()){child.show();}else{child.onShow();}}else{child.onHide();}}}});dojo.lang.extend(dojo.widget.Widget, {open: false});
\ No newline at end of file
+];dojo.widget.html.layout(this.domNode, children);var childSize = dojo.html.getContentBox(this.containerNode);this.children[0].resizeTo(childSize.width, childSize.height);},getLabelHeight: function() {return dojo.html.getMarginBox(this.labelNode).height;},onLabelClick: function() {this.parent.selectChild(this);},setSelected: function( isSelected){this.selected=isSelected;(isSelected ? dojo.html.addClass : dojo.html.removeClass)(this.domNode, this["class"]+"-selected");var child = this.children[0];if(child){if(isSelected){if(!child.isShowing()){child.show();}else{child.onShow();}}else{child.onHide();}}
+}});dojo.lang.extend(dojo.widget.Widget, {open: false
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Button.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Button.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Button.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Button.js Thu Dec 14 07:45:13 2006
@@ -23,4 +23,5 @@
dojo.html.prependClass(this.rightPart, "dojoButtonHover");dojo.html.removeClass(this.rightPart, "dojoButtonDepressed");this._setImageR(this.activeImg);},rightOut: function( e){if( this.disabled ){ return; }
dojo.html.removeClass(this.rightPart, "dojoButtonHover");dojo.html.removeClass(this.rightPart, "dojoButtonDepressed");this._setImageR(this.inactiveImg);},rightClick: function( e){if( this.disabled ){ return; }
try { this.domNode.focus(); } catch(e2) {};this._toggleMenu(this.menuId);},_setImageR: function(prefix){this.arrowBackgroundImage.src=dojo.uri.dojoUri(prefix + "c.gif");this.rightImage.src=dojo.uri.dojoUri(prefix + "r.gif");},onKey: function( e){if (!e.key) { return; }
-var menu = dojo.widget.getWidgetById(this.menuId);if(e.key== e.KEY_ENTER || e.key == " "){this.onMouseDown(e);this.buttonClick(e);dojo.lang.setTimeout(this, "onMouseUp", 75, e);dojo.event.browser.stopEvent(e);} else if (e.key == e.KEY_DOWN_ARROW && e.altKey){this.rightDown(e);this.rightClick(e);dojo.lang.setTimeout(this, "rightUp", 75, e);dojo.event.browser.stopEvent(e);} else if(menu && menu.isShowingNow && e.key == e.KEY_DOWN_ARROW){dojo.event.disconnect(this.domNode, "onblur", this, "onBlur");}}});
\ No newline at end of file
+var menu = dojo.widget.getWidgetById(this.menuId);if(e.key== e.KEY_ENTER || e.key == " "){this.onMouseDown(e);this.buttonClick(e);dojo.lang.setTimeout(this, "onMouseUp", 75, e);dojo.event.browser.stopEvent(e);} else if (e.key == e.KEY_DOWN_ARROW && e.altKey){this.rightDown(e);this.rightClick(e);dojo.lang.setTimeout(this, "rightUp", 75, e);dojo.event.browser.stopEvent(e);} else if(menu && menu.isShowingNow && e.key == e.KEY_DOWN_ARROW){dojo.event.disconnect(this.domNode, "onblur", this, "onBlur");}}
+});
\ No newline at end of file
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Chart.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Chart.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Chart.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Chart.js Thu Dec 14 07:45:13 2006
@@ -6,7 +6,8 @@
"accesskey","align","bgcolor","class","colspan","height","id","nowrap","rowspan","style","tabindex","title","valign","width"
];for(var i=0; i<rows.length; i++){var row=rows[i];var cells=row.cells;var x=Number.MIN_VALUE;for (var j=0; j<cells.length; j++){if (j==0){x=parseFloat(cells[j].innerHTML);xMin=Math.min(xMin, x);xMax=Math.max(xMax, x);} else {var ds=this.series[j-1];var y=parseFloat(cells[j].innerHTML);yMin=Math.min(yMin,y);yMax=Math.max(yMax,y);var o={x:x, value:y};var attrs=cells[j].attributes;for(var k=0; k<attrs.length; k++){var attr=attrs.item(k);var bIgnore=false;for (var l=0; l<ignore.length; l++){if (attr.nodeName.toLowerCase()==ignore[l]){bIgnore=true;break;}}
if(!bIgnore) o[attr.nodeName]=attr.nodeValue;}
-ds.add(o);}}}
+ds.add(o);}}
+}
return { x:{ min:xMin, max:xMax}, y:{ min:yMin, max:yMax}};}});dojo.declare(
"dojo.widget.Chart.DataSeries",null,function(key, label, plotType, color){this.id = "DataSeries"+dojo.widget.Chart.DataSeries.count++;this.key = key;this.label = label||this.id;this.plotType = plotType||"line";this.color = color;this.values = [];},{add: function(v){if(v.x==null||v.value==null){dojo.raise("dojo.widget.Chart.DataSeries.add: v must have both an 'x' and 'value' property.");}
this.values.push(v);},clear: function(){this.values=[];},createRange: function(len){var idx = this.values.length-1;var length = (len||this.values.length);return { "index": idx, "length": length, "start":Math.max(idx-length,0) };},getMean: function(len){var range = this.createRange(len);if(range.index<0){ return 0; }
@@ -21,7 +22,8 @@
var t = 0;for(var i=range.index; i>=range.start; i--){var n = parseFloat(this.values[i].value);if(!isNaN(n)){t=Math.min(n,t);}}
return t;},getMedian: function(len){var range = this.createRange(len);if(range.index<0){ return 0; }
var a = [];for (var i=range.index; i>=range.start; i--){var n=parseFloat(this.values[i].value);if (!isNaN(n)){var b=false;for(var j=0; j<a.length&&!b; j++){if (n==a[j]) b=true;}
-if(!b){ a.push(n); }}}
+if(!b){ a.push(n); }}
+}
a.sort();if(a.length>0){ return a[Math.ceil(a.length/2)]; }
return 0;},getMode: function(len){var range=this.createRange(len);if(range.index<0){ return 0; }
var o = {};var ret = 0
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Checkbox.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Checkbox.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Checkbox.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Checkbox.js Thu Dec 14 07:45:13 2006
@@ -1,16 +1,19 @@
dojo.provide("dojo.widget.Checkbox");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.event.*");dojo.require("dojo.html.style");dojo.require("dojo.html.selection");dojo.widget.defineWidget(
-"dojo.widget.Checkbox",dojo.widget.HtmlWidget,{templatePath: dojo.uri.dojoUri('src/widget/templates/Checkbox.html'),templateCssPath: dojo.uri.dojoUri('src/widget/templates/Checkbox.css'),"class": "dojoCheckbox",_type: "checkbox",name: "",id: "",checked: false,tabIndex: "",value: "on",_groups: { },postMixInProperties: function(){dojo.widget.Checkbox.superclass.postMixInProperties.apply(this, arguments);if(!this.disabled && this.tabIndex==""){ this.tabIndex="0"; }},fillInTemplate: function(){this._setValue(this.checked);},postCreate: function(){var notcon = true;this.id = this.id !="" ? this.id : this.widgetId;if(this.id != ""){var labels = document.getElementsByTagName("label");if (labels != null && labels.length > 0){for(var i=0; i<labels.length; i++){if (labels[i].htmlFor == this.id){labels[i].id = (labels[i].htmlFor + "label");this._connectEvents(labels[i]);dojo.widget.wai.setAttr(this.domNode, "waiState", "labelledby", labels[i].id);break;}}}}
+"dojo.widget.Checkbox",dojo.widget.HtmlWidget,{templatePath: dojo.uri.dojoUri('src/widget/templates/Checkbox.html'),templateCssPath: dojo.uri.dojoUri('src/widget/templates/Checkbox.css'),"class": "dojoCheckbox",_type: "checkbox",name: "",id: "",checked: false,tabIndex: "",value: "on",_groups: { },postMixInProperties: function(){dojo.widget.Checkbox.superclass.postMixInProperties.apply(this, arguments);if(!this.disabled && this.tabIndex==""){ this.tabIndex="0"; }},fillInTemplate: function(){this._setValue(this.checked);},postCreate: function(){var notcon = true;this.id = this.id !="" ? this.id : this.widgetId;if(this.id != ""){var labels = document.getElementsByTagName("label");if (labels != null && labels.length > 0){for(var i=0; i<labels.length; i++){if (labels[i].htmlFor == this.id){labels[i].id = (labels[i].htmlFor + "label");this._connectEvents(labels[i]);dojo.widget.wai.setAttr(this.domNode, "waiState", "labelledby", labels[i].id);break;}}
+}}
this._connectEvents(this.domNode);this.inputNode.checked=this.checked;this._register();},uninitialize: function(){this._deregister();},_connectEvents: function( node){dojo.event.connect(node, "onmouseover", this, "mouseOver");dojo.event.connect(node, "onmouseout", this, "mouseOut");dojo.event.connect(node, "onkey", this, "onKey");dojo.event.connect(node, "onclick", this, "_onClick");dojo.html.disableSelection(node);},_onClick: function( e){if(this.disabled == false){this.setValue(!this.checked);}
e.preventDefault();e.stopPropagation();this.onClick();},_register: function(){if(this._groups[this.name] == null){this._groups[this.name]=[];}
-this._groups[this.name].push(this);},_deregister: function(){var idx = dojo.lang.find(this._groups[this.name], this, true);this._groups[this.name].splice(idx, 1);},setValue: function( bool){this._setValue(bool);},onClick: function(){},onKey: function( e){var k = dojo.event.browser.keys;if(e.key == " "){this._onClick(e);}},mouseOver: function( e){this._hover(e, true);},mouseOut: function( e){this._hover(e, false);},_hover: function( e, isOver){if (this.disabled == false){var state = this.checked ? "On" : "Off";var style = this["class"] + state + "Hover";if (isOver){dojo.html.addClass(this.imageNode, style);}else{dojo.html.removeClass(this.imageNode,style);}}},_setValue: function( bool){this.checked = bool;var state = this["class"] + (this.disabled ? "Disabled" : "") + (this.checked ? "On" : "Off");dojo.html.setClass(this.imageNode, this["class"] + " " + state);this.inputNode.checked = this.checked;if(this.disabled){this.inputNode.setAttribute("disabled",true);}else{this.inpu
tNode.removeAttribute("disabled");}
+this._groups[this.name].push(this);},_deregister: function(){var idx = dojo.lang.find(this._groups[this.name], this, true);this._groups[this.name].splice(idx, 1);},setValue: function( bool){this._setValue(bool);},onClick: function(){},onKey: function( e){var k = dojo.event.browser.keys;if(e.key == " "){this._onClick(e);}},mouseOver: function( e){this._hover(e, true);},mouseOut: function( e){this._hover(e, false);},_hover: function( e, isOver){if (this.disabled == false){var state = this.checked ? "On" : "Off";var style = this["class"] + state + "Hover";if (isOver){dojo.html.addClass(this.imageNode, style);}else{dojo.html.removeClass(this.imageNode,style);}}
+},_setValue: function( bool){this.checked = bool;var state = this["class"] + (this.disabled ? "Disabled" : "") + (this.checked ? "On" : "Off");dojo.html.setClass(this.imageNode, this["class"] + " " + state);this.inputNode.checked = this.checked;if(this.disabled){this.inputNode.setAttribute("disabled",true);}else{this.inputNode.removeAttribute("disabled");}
dojo.widget.wai.setAttr(this.domNode, "waiState", "checked", this.checked);}}
);dojo.widget.defineWidget(
"dojo.widget.a11y.Checkbox",dojo.widget.Checkbox,{templatePath: dojo.uri.dojoUri('src/widget/templates/CheckboxA11y.html'),postCreate: function(args, frag){this.inputNode.checked=this.checked;if (this.disabled){this.inputNode.setAttribute("disabled",true);}
this._register();},_onClick: function( e){if(this.disabled == false){this.setValue(!this.checked);}
this.onClick();},_setValue: function( bool){this.checked = bool;this.inputNode.checked = bool;}}
);dojo.declare(
-"dojo.widget.RadioButtonBase",null,{"class": "dojoRadioButton",_type: "radio",setValue: function( bool){this._setValue(bool);if(bool){dojo.lang.forEach(this._groups[this.name], function(widget){if(widget != this){widget._setValue(false);}}, this);}}}
+"dojo.widget.RadioButtonBase",null,{"class": "dojoRadioButton",_type: "radio",setValue: function( bool){this._setValue(bool);if(bool){dojo.lang.forEach(this._groups[this.name], function(widget){if(widget != this){widget._setValue(false);}}, this);}}
+}
);dojo.widget.defineWidget(
"dojo.widget.RadioButton",[dojo.widget.Checkbox, dojo.widget.RadioButtonBase],{}
);dojo.widget.defineWidget(