svn commit: r487242 [5/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/data...

[jk...@apache.org]

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/Deferred.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/Deferred.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/Deferred.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/Deferred.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,7 @@
 dojo.provide("dojo.Deferred");dojo.require("dojo.lang.func");dojo.Deferred = function( canceller){this.chain = [];this.id = this._nextId();this.fired = -1;this.paused = 0;this.results = [null, null];this.canceller = canceller;this.silentlyCancelled = false;};dojo.lang.extend(dojo.Deferred, {getFunctionFromArgs: function(){var a = arguments;if((a[0])&&(!a[1])){if(dojo.lang.isFunction(a[0])){return a[0];}else if(dojo.lang.isString(a[0])){return dj_global[a[0]];}}else if((a[0])&&(a[1])){return dojo.lang.hitch(a[0], a[1]);}
 return null;},makeCalled: function() {var deferred = new dojo.Deferred();deferred.callback();return deferred;},repr: function(){var state;if(this.fired == -1){state = 'unfired';}else if(this.fired == 0){state = 'success';} else {state = 'error';}
 return 'Deferred(' + this.id + ', ' + state + ')';},toString: dojo.lang.forward("repr"),_nextId: (function(){var n = 1;return function(){ return n++; };})(),cancel: function(){if(this.fired == -1){if (this.canceller){this.canceller(this);}else{this.silentlyCancelled = true;}
-if(this.fired == -1){this.errback(new Error(this.repr()));}}else if(	(this.fired == 0)&&
+if(this.fired == -1){this.errback(new Error(this.repr()));}}else if((this.fired == 0)&&
 (this.results[0] instanceof dojo.Deferred)){this.results[0].cancel();}},_pause: function(){this.paused++;},_unpause: function(){this.paused--;if ((this.paused == 0) && (this.fired >= 0)) {this._fire();}},_continue: function(res){this._resback(res);this._unpause();},_resback: function(res){this.fired = ((res instanceof Error) ? 1 : 0);this.results[this.fired] = res;this._fire();},_check: function(){if(this.fired != -1){if(!this.silentlyCancelled){dojo.raise("already called!");}
 this.silentlyCancelled = false;return;}},callback: function(res){this._check();this._resback(res);},errback: function(res){this._check();if(!(res instanceof Error)){res = new Error(res);}
 this._resback(res);},addBoth: function(cb, cbfn){var enclosed = this.getFunctionFromArgs(cb, cbfn);if(arguments.length > 2){enclosed = dojo.lang.curryArguments(null, enclosed, arguments, 2);}
@@ -13,4 +13,5 @@
 return this;},_fire: function(){var chain = this.chain;var fired = this.fired;var res = this.results[fired];var self = this;var cb = null;while (chain.length > 0 && this.paused == 0) {var pair = chain.shift();var f = pair[fired];if (f == null) {continue;}
 try {res = f(res);fired = ((res instanceof Error) ? 1 : 0);if(res instanceof dojo.Deferred) {cb = function(res){self._continue(res);}
 this._pause();}}catch(err){fired = 1;res = err;}}
-this.fired = fired;this.results[fired] = res;if((cb)&&(this.paused)){res.addBoth(cb);}}});
\ No newline at end of file
+this.fired = fired;this.results[fired] = res;if((cb)&&(this.paused)){res.addBoth(cb);}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,3 @@
 
-dojo.kwCompoundRequire({common: [ "dojo.behavior.common" ]});dojo.provide("dojo.behavior.*");
\ No newline at end of file
+dojo.kwCompoundRequire({common: [ "dojo.behavior.common" ]
+});dojo.provide("dojo.behavior.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/common.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/common.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/common.js Thu Dec 14 07:45:13 2006
@@ -1,13 +1,15 @@
 
 dojo.provide("dojo.behavior.common");dojo.require("dojo.event.*");dojo.require("dojo.experimental");dojo.experimental("dojo.behavior");dojo.behavior = new function(){function arrIn(obj, name){if(!obj[name]){ obj[name] = []; }
 return obj[name];}
-function forIn(obj, scope, func){var tmpObj = {};for(var x in obj){if(typeof tmpObj[x] == "undefined"){if(!func){scope(obj[x], x);}else{func.call(scope, obj[x], x);}}}}
+function forIn(obj, scope, func){var tmpObj = {};for(var x in obj){if(typeof tmpObj[x] == "undefined"){if(!func){scope(obj[x], x);}else{func.call(scope, obj[x], x);}}
+}}
 this.behaviors = {};this.add = function(behaviorObj){var tmpObj = {};forIn(behaviorObj, this, function(behavior, name){var tBehavior = arrIn(this.behaviors, name);if((dojo.lang.isString(behavior))||(dojo.lang.isFunction(behavior))){behavior = { found: behavior };}
 forIn(behavior, function(rule, ruleName){arrIn(tBehavior, ruleName).push(rule);});});}
 this.apply = function(){dojo.profile.start("dojo.behavior.apply");var r = dojo.render.html;var safariGoodEnough = (!r.safari);if(r.safari){var uas = r.UA.split("AppleWebKit/")[1];if(parseInt(uas.match(/[0-9.]{3,}/)) >= 420){safariGoodEnough = true;}}
 if((dj_undef("behaviorFastParse", djConfig) ? (safariGoodEnough) : djConfig["behaviorFastParse"])){this.applyFast();}else{this.applySlow();}
 dojo.profile.end("dojo.behavior.apply");}
-this.matchCache = {};this.elementsById = function(id, handleRemoved){var removed = [];var added = [];arrIn(this.matchCache, id);if(handleRemoved){var nodes = this.matchCache[id];for(var x=0; x<nodes.length; x++){if(nodes[x].id != ""){removed.push(nodes[x]);nodes.splice(x, 1);x--;}}}
+this.matchCache = {};this.elementsById = function(id, handleRemoved){var removed = [];var added = [];arrIn(this.matchCache, id);if(handleRemoved){var nodes = this.matchCache[id];for(var x=0; x<nodes.length; x++){if(nodes[x].id != ""){removed.push(nodes[x]);nodes.splice(x, 1);x--;}}
+}
 var tElem = dojo.byId(id);while(tElem){if(!tElem["idcached"]){added.push(tElem);}
 tElem.id = "";tElem = dojo.byId(id);}
 this.matchCache[id] = this.matchCache[id].concat(added);dojo.lang.forEach(this.matchCache[id], function(node){node.id = id;node.idcached = true;});return { "removed": removed, "added": added, "match": this.matchCache[id] };}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/form.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/form.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/form.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/behavior/form.js Thu Dec 14 07:45:13 2006
@@ -24,11 +24,13 @@
 this.nodeKeyPressed = function(evt){if(!evt){return;}
 var node=evt.target;if (evt.keyCode == evt.KEY_ESCAPE) {this.checkNodeValue(node);} else if (this.processing[node]){this.cleanupBlurProcess(node);return;} else {return;}
 node.blur();}
-this.checkNodeValue = function(node){if (!node.getAttribute("prevesc")){var value=node.value;var title=node.getAttribute("title");if (value && value.length > 0 && !equals(value,title)){node.setAttribute("prevesc","1");node.value="";this.processing[node]=true;node.blur();}}}
+this.checkNodeValue = function(node){if (!node.getAttribute("prevesc")){var value=node.value;var title=node.getAttribute("title");if (value && value.length > 0 && !equals(value,title)){node.setAttribute("prevesc","1");node.value="";this.processing[node]=true;node.blur();}}
+}
 this.cleanupBlurProcess = function(node){delete this.processing[node];setTimeout(function(){node.focus();}, 10);}
 this.clearDecorations = function(evt){if(!evt){return;}
 var form=evt.target;if(!form) { return; }
 var elms=form.getElementsByTagName("input");for(var i=0;i<elms.length;i++){if (dj_undef("value", elms[i])) {continue;}
 var title=elms[i].getAttribute("title");if (!title || title.length <= 0) { continue; }
 var value=elms[i].value;if (equals(value,title)){elms[i].value="";}
-dojo.event.browser.removeListener(elms[i], "onfocus", dojo.lang.hitch(this, this.nodeFocused));dojo.event.browser.removeListener(elms[i], "onblur", dojo.lang.hitch(this, this.nodeBlurred));dojo.event.browser.removeListener(elms[i], "onkeyup", dojo.lang.hitch(this, this.nodeBlurred));}}}
+dojo.event.browser.removeListener(elms[i], "onfocus", dojo.lang.hitch(this, this.nodeFocused));dojo.event.browser.removeListener(elms[i], "onblur", dojo.lang.hitch(this, this.nodeBlurred));dojo.event.browser.removeListener(elms[i], "onkeyup", dojo.lang.hitch(this, this.nodeBlurred));}}
+}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap1.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap1.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap1.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap1.js Thu Dec 14 07:45:13 2006
@@ -3,7 +3,8 @@
 if(dj_undef("djConfig", this)){var djConfig = {};}
 if(dj_undef("dojo", this)){var dojo = {};}
 dojo.global = function(){return dj_currentContext;}
-dojo.locale  = djConfig.locale;dojo.version = {major: 0, minor: 4, patch: 0, flag: "+",revision: Number("$Rev: 6425 $".match(/[0-9]+/)[0]),toString: function(){with(dojo.version){return major + "." + minor + "." + patch + flag + " (" + revision + ")";}}}
+dojo.locale  = djConfig.locale;dojo.version = {major: 0, minor: 4, patch: 0, flag: "+",revision: Number("$Rev: 6425 $".match(/[0-9]+/)[0]),toString: function(){with(dojo.version){return major + "." + minor + "." + patch + flag + " (" + revision + ")";}}
+}
 dojo.evalProp = function( name,  object,  create){if((!object)||(!name)) return undefined;if(!dj_undef(name, object)) return object[name];return (create ? (object[name]={}) : undefined);}
 dojo.parseObjPath = function( path,  context,  create){var object = (context || dojo.global());var names = path.split('.');var prop = names.pop();for (var i=0,l=names.length;i<l && object;i++){object = dojo.evalProp(names[i], object, create);}
 return {obj: object, prop: prop};}
@@ -21,10 +22,15 @@
 dojo.deprecated = function( behaviour,  extra,  removal){var message = "DEPRECATED: " + behaviour;if(extra){ message += " " + extra; }
 if(removal){ message += " -- will be removed in version: " + removal; }
 dojo.debug(message);}
-dojo.render = (function(){function vscaffold(prefs, names){var tmp = {capable: false,support: {builtin: false,plugin: false},prefixes: prefs};for(var i=0; i<names.length; i++){tmp[names[i]] = false;}
+dojo.render = (function(){function vscaffold(prefs, names){var tmp = {capable: false,support: {builtin: false,plugin: false
+},prefixes: prefs
+};for(var i=0; i<names.length; i++){tmp[names[i]] = false;}
 return tmp;}
-return {name: "",ver: dojo.version,os: { win: false, linux: false, osx: false },html: vscaffold(["html"], ["ie", "opera", "khtml", "safari", "moz"]),svg: vscaffold(["svg"], ["corel", "adobe", "batik"]),vml: vscaffold(["vml"], ["ie"]),swf: vscaffold(["Swf", "Flash", "Mm"], ["mm"]),swt: vscaffold(["Swt"], ["ibm"])};})();dojo.hostenv = (function(){var config = {isDebug: false,allowQueryConfig: false,baseScriptUri: "",baseRelativePath: "",libraryScriptUri: "",iePreventClobber: false,ieClobberMinimal: true,preventBackButtonFix: true,delayMozLoadingFix: false,searchIds: [],parseWidgets: true};if (typeof djConfig == "undefined") { djConfig = config; }
-else {for (var option in config) {if (typeof djConfig[option] == "undefined") {djConfig[option] = config[option];}}}
+return {name: "",ver: dojo.version,os: { win: false, linux: false, osx: false },html: vscaffold(["html"], ["ie", "opera", "khtml", "safari", "moz"]),svg: vscaffold(["svg"], ["corel", "adobe", "batik"]),vml: vscaffold(["vml"], ["ie"]),swf: vscaffold(["Swf", "Flash", "Mm"], ["mm"]),swt: vscaffold(["Swt"], ["ibm"])
+};})();dojo.hostenv = (function(){var config = {isDebug: false,allowQueryConfig: false,baseScriptUri: "",baseRelativePath: "",libraryScriptUri: "",iePreventClobber: false,ieClobberMinimal: true,preventBackButtonFix: true,delayMozLoadingFix: false,searchIds: [],parseWidgets: true
+};if (typeof djConfig == "undefined") { djConfig = config; }
+else {for (var option in config) {if (typeof djConfig[option] == "undefined") {djConfig[option] = config[option];}}
+}
 return {name_: '(unset)',version_: '(unset)',getName: function(){return this.name_;},getVersion: function(){return this.version_;},getText: function( uri){dojo.unimplemented('getText', "uri=" + uri);}};})();dojo.hostenv.getBaseScriptUri = function(){if(djConfig.baseScriptUri.length){return djConfig.baseScriptUri;}
 var uri = new String(djConfig.libraryScriptUri||djConfig.baseRelativePath);if (!uri) { dojo.raise("Nothing returned by getLibraryScriptUri(): " + uri); }
 var lastslash = uri.lastIndexOf('/');djConfig.baseScriptUri = djConfig.baseRelativePath;return djConfig.baseScriptUri;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap2.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap2.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap2.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/bootstrap2.js Thu Dec 14 07:45:13 2006
@@ -4,4 +4,5 @@
 var tmps = [];if((this["djConfig"])&&((djConfig["isDebug"])||(djConfig["debugAtAllCosts"]))){tmps.push("debug.js");}
 if((this["djConfig"])&&(djConfig["debugAtAllCosts"])&&(!isRhino)&&(!isDashboard)){tmps.push("browser_debug.js");}
 var loaderRoot = djConfig["baseScriptUri"];if((this["djConfig"])&&(djConfig["baseLoaderUri"])){loaderRoot = djConfig["baseLoaderUri"];}
-for(var x=0; x < tmps.length; x++){var spath = loaderRoot+"src/"+tmps[x];if(isRhino||isSpidermonkey){load(spath);} else {try {document.write("<scr"+"ipt type='text/javascript' src='"+spath+"'></scr"+"ipt>");} catch (e) {var script = document.createElement("script");script.src = spath;document.getElementsByTagName("head")[0].appendChild(script);}}}})();
\ No newline at end of file
+for(var x=0; x < tmps.length; x++){var spath = loaderRoot+"src/"+tmps[x];if(isRhino||isSpidermonkey){load(spath);} else {try {document.write("<scr"+"ipt type='text/javascript' src='"+spath+"'></scr"+"ipt>");} catch (e) {var script = document.createElement("script");script.src = spath;document.getElementsByTagName("head")[0].appendChild(script);}}
+}})();
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/iCalendar.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/iCalendar.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/iCalendar.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/iCalendar.js Thu Dec 14 07:45:13 2006
@@ -1,22 +1,28 @@
 
 dojo.provide("dojo.cal.iCalendar");dojo.require("dojo.lang.common");dojo.require("dojo.cal.textDirectory");dojo.require("dojo.date.common");dojo.require("dojo.date.serialize");dojo.cal.iCalendar.fromText =  function (text) {var properties = dojo.cal.textDirectory.tokenise(text);var calendars = [];for (var i = 0, begun = false; i < properties.length; i++) {var prop = properties[i];if (!begun) {if (prop.name == 'BEGIN' && prop.value == 'VCALENDAR') {begun = true;var calbody = [];}} else if (prop.name == 'END' && prop.value == 'VCALENDAR') {calendars.push(new dojo.cal.iCalendar.VCalendar(calbody));begun = false;} else {calbody.push(prop);}}
 return calendars;}
-dojo.cal.iCalendar.Component = function ( body ) {if (!this.name) {this.name = "COMPONENT"}
+dojo.cal.iCalendar.Component = function ( body ) {if (!this.name) {this.name = "COMPONENT"
+}
 this.properties = [];this.components = [];if (body) {for (var i = 0, context = ''; i < body.length; i++) {if (context == '') {if (body[i].name == 'BEGIN') {context = body[i].value;var childprops = [];} else {this.addProperty(new dojo.cal.iCalendar.Property(body[i]));}} else if (body[i].name == 'END' && body[i].value == context) {if (context=="VEVENT") {this.addComponent(new dojo.cal.iCalendar.VEvent(childprops));} else if (context=="VTIMEZONE") {this.addComponent(new dojo.cal.iCalendar.VTimeZone(childprops));} else if (context=="VTODO") {this.addComponent(new dojo.cal.iCalendar.VTodo(childprops));} else if (context=="VJOURNAL") {this.addComponent(new dojo.cal.iCalendar.VJournal(childprops));} else if (context=="VFREEBUSY") {this.addComponent(new dojo.cal.iCalendar.VFreeBusy(childprops));} else if (context=="STANDARD") {this.addComponent(new dojo.cal.iCalendar.Standard(childprops));} else if (context=="DAYLIGHT") {this.addComponent(new dojo.cal.iCalendar.Daylight(childprops))
 ;} else if (context=="VALARM") {this.addComponent(new dojo.cal.iCalendar.VAlarm(childprops));}else {dojo.unimplemented("dojo.cal.iCalendar." + context);}
 context = '';} else {childprops.push(body[i]);}}
-if (this._ValidProperties) {this.postCreate();}}}
+if (this._ValidProperties) {this.postCreate();}}
+}
 dojo.extend(dojo.cal.iCalendar.Component, {addProperty: function (prop) {this.properties.push(prop);this[prop.name.toLowerCase()] = prop;},addComponent: function (prop) {this.components.push(prop);},postCreate: function() {for (var x=0; x<this._ValidProperties.length; x++) {var evtProperty = this._ValidProperties[x];var found = false;for (var y=0; y<this.properties.length; y++) {var prop = this.properties[y];var propName = prop.name.toLowerCase();if (dojo.lang.isArray(evtProperty)) {var alreadySet = false;for (var z=0; z<evtProperty.length; z++) {var evtPropertyName = evtProperty[z].name.toLowerCase();if((this[evtPropertyName])  && (evtPropertyName != propName )) {alreadySet=true;}}
 if (!alreadySet) {this[propName] = prop;}} else {if (propName == evtProperty.name.toLowerCase()) {found = true;if (evtProperty.occurance == 1){this[propName] = prop;} else {found = true;if (!dojo.lang.isArray(this[propName])) {this[propName] = [];}
-this[propName].push(prop);}}}}
+this[propName].push(prop);}}
+}}
 if (evtProperty.required && !found) {dojo.debug("iCalendar - " + this.name + ": Required Property not found: " + evtProperty.name);}}
-if (dojo.lang.isArray(this.rrule)) {for(var x=0; x<this.rrule.length; x++) {var rule = this.rrule[x].value;this.rrule[x].cache = function() {};var temp = rule.split(";");for (var y=0; y<temp.length; y++) {var pair = temp[y].split("=");var key = pair[0].toLowerCase();var val = pair[1];if ((key == "freq") || (key=="interval") || (key=="until")) {this.rrule[x][key]= val;} else {var valArray = val.split(",");this.rrule[x][key] = valArray;}}}
+if (dojo.lang.isArray(this.rrule)) {for(var x=0; x<this.rrule.length; x++) {var rule = this.rrule[x].value;this.rrule[x].cache = function() {};var temp = rule.split(";");for (var y=0; y<temp.length; y++) {var pair = temp[y].split("=");var key = pair[0].toLowerCase();var val = pair[1];if ((key == "freq") || (key=="interval") || (key=="until")) {this.rrule[x][key]= val;} else {var valArray = val.split(",");this.rrule[x][key] = valArray;}}
+}
 this.recurring = true;}},toString: function () {return "[iCalendar.Component; " + this.name + ", " + this.properties.length +
 " properties, " + this.components.length + " components]";}});dojo.cal.iCalendar.Property = function (prop) {this.name = prop.name;this.group = prop.group;this.params = prop.params;this.value = prop.value;}
 dojo.extend(dojo.cal.iCalendar.Property, {toString: function () {return "[iCalenday.Property; " + this.name + ": " + this.value + "]";}});var _P = function (n, oc, req) {return {name: n, required: (req) ? true : false,occurance: (oc == '*' || !oc) ? -1 : oc}}
 dojo.cal.iCalendar.VCalendar = function ( calbody) {this.name = "VCALENDAR";this.recurring = [];this.nonRecurringEvents = function(){};dojo.cal.iCalendar.Component.call(this, calbody);}
 dojo.inherits(dojo.cal.iCalendar.VCalendar, dojo.cal.iCalendar.Component);dojo.extend(dojo.cal.iCalendar.VCalendar, {addComponent: function (prop) {this.components.push(prop);if (prop.name.toLowerCase() == "vevent") {if (prop.rrule) {this.recurring.push(prop);} else {var startDate = prop.getDate();var month = startDate.getMonth() + 1;var dateString= month + "-" + startDate.getDate() + "-" + startDate.getFullYear();if (!dojo.lang.isArray(this[dateString])) {this.nonRecurringEvents[dateString] = [];}
-this.nonRecurringEvents[dateString].push(prop);}}},preComputeRecurringEvents: function(until) {var calculatedEvents = function(){};for(var x=0; x<this.recurring.length; x++) {var dates = this.recurring[x].getDates(until);for (var y=0; y<dates.length;y++) {var month = dates[y].getMonth() + 1;var dateStr = month + "-" + dates[y].getDate() + "-" + dates[y].getFullYear();if (!dojo.lang.isArray(calculatedEvents[dateStr])) {calculatedEvents[dateStr] = [];}
-if (!dojo.lang.inArray(calculatedEvents[dateStr], this.recurring[x])) {calculatedEvents[dateStr].push(this.recurring[x]);}}}
+this.nonRecurringEvents[dateString].push(prop);}}
+},preComputeRecurringEvents: function(until) {var calculatedEvents = function(){};for(var x=0; x<this.recurring.length; x++) {var dates = this.recurring[x].getDates(until);for (var y=0; y<dates.length;y++) {var month = dates[y].getMonth() + 1;var dateStr = month + "-" + dates[y].getDate() + "-" + dates[y].getFullYear();if (!dojo.lang.isArray(calculatedEvents[dateStr])) {calculatedEvents[dateStr] = [];}
+if (!dojo.lang.inArray(calculatedEvents[dateStr], this.recurring[x])) {calculatedEvents[dateStr].push(this.recurring[x]);}}
+}
 this.recurringEvents = calculatedEvents;},getEvents: function( date) {var events = [];var recur = [];var nonRecur = [];var month = date.getMonth() + 1;var dateStr= month + "-" + date.getDate() + "-" + date.getFullYear();if (dojo.lang.isArray(this.nonRecurringEvents[dateStr])) {nonRecur= this.nonRecurringEvents[dateStr];dojo.debug("Number of nonRecurring Events: " + nonRecur.length);}
 if (dojo.lang.isArray(this.recurringEvents[dateStr])) {recur= this.recurringEvents[dateStr];}
 events = recur.concat(nonRecur);if (events.length > 0) {return events;}
@@ -30,8 +36,10 @@
 _P("class", 1), _P("created", 1), _P("description", 1), _P("dtstart", 1),_P("geo", 1), _P("last-mod", 1), _P("location", 1), _P("organizer", 1),_P("priority", 1), _P("dtstamp", 1), _P("seq", 1), _P("status", 1),_P("summary", 1), _P("transp", 1), _P("uid", 1), _P("url", 1), _P("recurid", 1),[_P("dtend", 1), _P("duration", 1)],_P("attach"), _P("attendee"), _P("categories"), _P("comment"), _P("contact"),_P("exdate"), _P("exrule"), _P("rstatus"), _P("related"), _P("resources"),_P("rdate"), _P("rrule")
 ];dojo.cal.iCalendar.VEvent = function ( body) {this._ValidProperties = VEventProperties;this.name = "VEVENT";dojo.cal.iCalendar.Component.call(this, body);this.recurring = false;this.startDate = dojo.date.fromIso8601(this.dtstart.value);}
 dojo.inherits(dojo.cal.iCalendar.VEvent, dojo.cal.iCalendar.Component);dojo.extend(dojo.cal.iCalendar.VEvent, {getDates: function(until) {var dtstart = this.getDate();var recurranceSet = [];var weekdays=["su","mo","tu","we","th","fr","sa"];var order = {"daily": 1, "weekly": 2, "monthly": 3, "yearly": 4,"byday": 1, "bymonthday": 1, "byweekno": 2, "bymonth": 3, "byyearday": 4};for (var x=0; x<this.rrule.length; x++) {var rrule = this.rrule[x];var freq = rrule.freq.toLowerCase();var interval = 1;if (rrule.interval > interval) {interval = rrule.interval;}
-var set = [];var freqInt = order[freq];if (rrule.until) {var tmpUntil = dojo.date.fromIso8601(rrule.until);} else {var tmpUntil = until}
-if (tmpUntil > until) {tmpUntil = until}
+var set = [];var freqInt = order[freq];if (rrule.until) {var tmpUntil = dojo.date.fromIso8601(rrule.until);} else {var tmpUntil = until
+}
+if (tmpUntil > until) {tmpUntil = until
+}
 if (dtstart<tmpUntil) {var expandingRules = function(){};var cullingRules = function(){};expandingRules.length=0;cullingRules.length =0;switch(freq) {case "yearly":
 var nextDate = new Date(dtstart);set.push(nextDate);while(nextDate < tmpUntil) {nextDate.setYear(nextDate.getFullYear()+interval);tmpDate = new Date(nextDate);if(tmpDate < tmpUntil) {set.push(tmpDate);}}
 break;case "monthly":
@@ -41,22 +49,31 @@
 break;case "daily":
 nextDate = new Date(dtstart);set.push(nextDate);while(nextDate < tmpUntil) {nextDate.setDate(nextDate.getDate()+interval);var tmpDate = new Date(nextDate);if (tmpDate < tmpUntil) {set.push(tmpDate);}}
 break;}
-if ((rrule["bymonth"]) && (order["bymonth"]<freqInt))	{for (var z=0; z<rrule["bymonth"].length; z++) {if (z==0) {for (var zz=0; zz < set.length; zz++) {set[zz].setMonth(rrule["bymonth"][z]-1);}} else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);newDate.setMonth(rrule[z]);subset.push(newDate);}
-tmp = set.concat(subset);set = tmp;}}}
+if ((rrule["bymonth"]) && (order["bymonth"]<freqInt)){for (var z=0; z<rrule["bymonth"].length; z++) {if (z==0) {for (var zz=0; zz < set.length; zz++) {set[zz].setMonth(rrule["bymonth"][z]-1);}} else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);newDate.setMonth(rrule[z]);subset.push(newDate);}
+tmp = set.concat(subset);set = tmp;}}
+}
 if (rrule["byweekno"] && !rrule["bymonth"]) {dojo.debug("TODO: no support for byweekno yet");}
-if (rrule["byyearday"] && !rrule["bymonth"] && !rrule["byweekno"] ) {if (rrule["byyearday"].length > 1) {var regex = "([+-]?)([0-9]{1,3})";for (var z=1; x<rrule["byyearday"].length; z++) {var regexResult = rrule["byyearday"][z].match(regex);if (z==1) {for (var zz=0; zz < set.length; zz++) {if (regexResult[1] == "-") {dojo.date.setDayOfYear(set[zz],366-regexResult[2]);} else {dojo.date.setDayOfYear(set[zz],regexResult[2]);}}}	else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {dojo.date.setDayOfYear(newDate,366-regexResult[2]);} else {dojo.date.setDayOfYear(newDate,regexResult[2]);}
+if (rrule["byyearday"] && !rrule["bymonth"] && !rrule["byweekno"] ) {if (rrule["byyearday"].length > 1) {var regex = "([+-]?)([0-9]{1,3})";for (var z=1; x<rrule["byyearday"].length; z++) {var regexResult = rrule["byyearday"][z].match(regex);if (z==1) {for (var zz=0; zz < set.length; zz++) {if (regexResult[1] == "-") {dojo.date.setDayOfYear(set[zz],366-regexResult[2]);} else {dojo.date.setDayOfYear(set[zz],regexResult[2]);}}
+}else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {dojo.date.setDayOfYear(newDate,366-regexResult[2]);} else {dojo.date.setDayOfYear(newDate,regexResult[2]);}
 subset.push(newDate);}
-tmp = set.concat(subset);set = tmp;}}}}
-if (rrule["bymonthday"]  && (order["bymonthday"]<freqInt)) {if (rrule["bymonthday"].length > 0) {var regex = "([+-]?)([0-9]{1,3})";for (var z=0; z<rrule["bymonthday"].length; z++) {var regexResult = rrule["bymonthday"][z].match(regex);if (z==0) {for (var zz=0; zz < set.length; zz++) {if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {set[zz].setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {set[zz].setDate(regexResult[2]);}}}}	else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(regexResult[2]);}}
+tmp = set.concat(subset);set = tmp;}}
+}}
+if (rrule["bymonthday"]  && (order["bymonthday"]<freqInt)) {if (rrule["bymonthday"].length > 0) {var regex = "([+-]?)([0-9]{1,3})";for (var z=0; z<rrule["bymonthday"].length; z++) {var regexResult = rrule["bymonthday"][z].match(regex);if (z==0) {for (var zz=0; zz < set.length; zz++) {if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {set[zz].setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {set[zz].setDate(regexResult[2]);}}
+}}else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(regexResult[2]);}}
 subset.push(newDate);}
-tmp = set.concat(subset);set = tmp;}}}}
+tmp = set.concat(subset);set = tmp;}}
+}}
 if (rrule["byday"]  && (order["byday"]<freqInt)) {if (rrule["bymonth"]) {if (rrule["byday"].length > 0) {var regex = "([+-]?)([0-9]{0,1}?)([A-Za-z]{1,2})";for (var z=0; z<rrule["byday"].length; z++) {var regexResult = rrule["byday"][z].match(regex);var occurance = regexResult[2];var day = regexResult[3].toLowerCase();if (z==0) {for (var zz=0; zz < set.length; zz++) {if (regexResult[1] == "-") {var numDaysFound = 0;var lastDayOfMonth = dojo.date.getDaysInMonth(set[zz]);var daysToSubtract = 1;set[zz].setDate(lastDayOfMonth);if (weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToSubtract=7;}
-daysToSubtract = 1;while (numDaysFound < occurance) {set[zz].setDate(set[zz].getDate()-daysToSubtract);if (weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToSubtract=7;}}} else {if (occurance) {var numDaysFound=0;set[zz].setDate(1);var daysToAdd=1;if(weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToAdd=7;}
-while(numDaysFound < occurance) {set[zz].setDate(set[zz].getDate()+daysToAdd);if(weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToAdd=7;}}} else {var numDaysFound=0;var subset = [];lastDayOfMonth = new Date(set[zz]);var daysInMonth = dojo.date.getDaysInMonth(set[zz]);lastDayOfMonth.setDate(daysInMonth);set[zz].setDate(1);if (weekdays[set[zz].getDay()] == day) {numDaysFound++;}
+daysToSubtract = 1;while (numDaysFound < occurance) {set[zz].setDate(set[zz].getDate()-daysToSubtract);if (weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToSubtract=7;}}
+} else {if (occurance) {var numDaysFound=0;set[zz].setDate(1);var daysToAdd=1;if(weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToAdd=7;}
+while(numDaysFound < occurance) {set[zz].setDate(set[zz].getDate()+daysToAdd);if(weekdays[set[zz].getDay()] == day) {numDaysFound++;daysToAdd=7;}}
+} else {var numDaysFound=0;var subset = [];lastDayOfMonth = new Date(set[zz]);var daysInMonth = dojo.date.getDaysInMonth(set[zz]);lastDayOfMonth.setDate(daysInMonth);set[zz].setDate(1);if (weekdays[set[zz].getDay()] == day) {numDaysFound++;}
 var tmpDate = new Date(set[zz]);daysToAdd = 1;while(tmpDate.getDate() < lastDayOfMonth) {if (weekdays[tmpDate.getDay()] == day) {numDaysFound++;if (numDaysFound==1) {set[zz] = tmpDate;} else {subset.push(tmpDate);tmpDate = new Date(tmpDate);daysToAdd=7;tmpDate.setDate(tmpDate.getDate() + daysToAdd);}} else {tmpDate.setDate(tmpDate.getDate() + daysToAdd);}}
-var t = set.concat(subset);set = t;}}}}	else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(regexResult[2]);}}
+var t = set.concat(subset);set = t;}}
+}}else {var subset=[];for (var zz=0; zz < set.length; zz++) {var newDate = new Date(set[zz]);if (regexResult[1] == "-") {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(dojo.date.getDaysInMonth(set[zz]) - regexResult[2]);}} else {if (regexResult[2] < dojo.date.getDaysInMonth(set[zz])) {newDate.setDate(regexResult[2]);}}
 subset.push(newDate);}
-tmp = set.concat(subset);set = tmp;}}}} else {dojo.debug("TODO: byday within a yearly rule without a bymonth");}}
+tmp = set.concat(subset);set = tmp;}}
+}} else {dojo.debug("TODO: byday within a yearly rule without a bymonth");}}
 dojo.debug("TODO: Process BYrules for units larger than frequency");var tmp = recurranceSet.concat(set);recurranceSet = tmp;}}
 recurranceSet.push(dtstart);return recurranceSet;},getDate: function() {return dojo.date.fromIso8601(this.dtstart.value);}});var VTimeZoneProperties = [
 _P("tzid", 1, true), _P("last-mod", 1), _P("tzurl", 1)

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/textDirectory.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/textDirectory.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/textDirectory.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/cal/textDirectory.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
 
 dojo.provide("dojo.cal.textDirectory");dojo.require("dojo.string");dojo.cal.textDirectory.Property = function(line){var left = dojo.string.trim(line.substring(0, line.indexOf(':')));var right = dojo.string.trim(line.substr(line.indexOf(':') + 1));var parameters = dojo.string.splitEscaped(left,';');this.name = parameters[0];parameters.splice(0, 1);this.params = [];var arr;for(var i = 0; i < parameters.length; i++){arr = parameters[i].split("=");var key = dojo.string.trim(arr[0].toUpperCase());if(arr.length == 1){ this.params.push([key]); continue; }
-var values = dojo.string.splitEscaped(arr[1],',');for(var j = 0; j < values.length; j++){if(dojo.string.trim(values[j]) != ''){this.params.push([key, dojo.string.trim(values[j])]);}}}
+var values = dojo.string.splitEscaped(arr[1],',');for(var j = 0; j < values.length; j++){if(dojo.string.trim(values[j]) != ''){this.params.push([key, dojo.string.trim(values[j])]);}}
+}
 if(this.name.indexOf('.') > 0){arr = this.name.split('.');this.group = arr[0];this.name = arr[1];}
 this.value = right;}
 dojo.cal.textDirectory.tokenise = function(text){var nText = dojo.string.normalizeNewlines(text,"\n").

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Axis.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Axis.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Axis.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Axis.js Thu Dec 14 07:45:13 2006
@@ -5,12 +5,19 @@
 plot
 ){val = parseFloat(val, 10);var area = plotArea.getArea();if(plot.axisX == this){var offset = 0 - this.range.lower;var min = this.range.lower + offset;var max = this.range.upper + offset;val += offset;return (val*((area.right-area.left)/max))+area.left;} else {var max = this.range.upper;var min = this.range.lower;var offset = 0;if(min<0){offset += Math.abs(min);}
 max += offset; min += offset; val += offset;var pmin = area.bottom;var pmax = area.top;return (((pmin-pmax)/(max-min))*(max-val))+pmax;}},initializeOrigin: function(drawAgainst, plane){if(this._origin == null){this._origin = this.origin;}
-if(isNaN(this._origin)){if(this._origin.toLowerCase() == "max"){this.origin = drawAgainst.range[(plane=="y")?"upper":"lower"]; }
-else if (this._origin.toLowerCase() == "min"){this.origin = drawAgainst.range[(plane=="y")?"lower":"upper"]; }
-else { this.origin=0; }}},initializeLabels: function(){this._labels = [];if(this.labels.length == 0){this.showLabels = false;this.showLines = false;this.showTicks = false;} else {if(this.labels[0].label && this.labels[0].value != null){for(var i=0; i<this.labels.length; i++){this._labels.push(this.labels[i]);}}
+if(isNaN(this._origin)){if(this._origin.toLowerCase() == "max"){this.origin = drawAgainst.range[(plane=="y")?"upper":"lower"]; 
+}
+else if (this._origin.toLowerCase() == "min"){this.origin = drawAgainst.range[(plane=="y")?"lower":"upper"]; 
+}
+else { this.origin=0; }}
+},initializeLabels: function(){this._labels = [];if(this.labels.length == 0){this.showLabels = false;this.showLines = false;this.showTicks = false;} else {if(this.labels[0].label && this.labels[0].value != null){for(var i=0; i<this.labels.length; i++){this._labels.push(this.labels[i]);}}
 else if(!isNaN(this.labels[0])){for(var i=0; i<this.labels.length; i++){this._labels.push({ label: this.labels[i], value: this.labels[i] });}}
 else {var a = [];for(var i=0; i<this.labels.length; i++){a.push(this.labels[i]);}
 var s=a.shift();this._labels.push({ label: s, value: this.range.lower });if(a.length>0){var s=a.pop();this._labels.push({ label: s, value: this.range.upper });}
-if(a.length>0){var range = this.range.upper - this.range.lower;var step = range / (this.labels.length-1);for(var i=1; i<=a.length; i++){this._labels.push({label: a[i-1],value: this.range.lower+(step*i)});}}}}},initialize: function(plotArea, plot, drawAgainst, plane){this.destroy();this.initializeOrigin(drawAgainst, plane);this.initializeLabels();var node = this.render(plotArea, plot, drawAgainst, plane);return node;},destroy: function(){for(var p in this.nodes){while(this.nodes[p] && this.nodes[p].childNodes.length > 0){this.nodes[p].removeChild(this.nodes[p].childNodes[0]);}
+if(a.length>0){var range = this.range.upper - this.range.lower;var step = range / (this.labels.length-1);for(var i=1; i<=a.length; i++){this._labels.push({label: a[i-1],value: this.range.lower+(step*i)
+});}}
+}}
+},initialize: function(plotArea, plot, drawAgainst, plane){this.destroy();this.initializeOrigin(drawAgainst, plane);this.initializeLabels();var node = this.render(plotArea, plot, drawAgainst, plane);return node;},destroy: function(){for(var p in this.nodes){while(this.nodes[p] && this.nodes[p].childNodes.length > 0){this.nodes[p].removeChild(this.nodes[p].childNodes[0]);}
 if(this.nodes[p] && this.nodes[p].parentNode){this.nodes[p].parentNode.removeChild(this.nodes[p]);}
-this.nodes[p] = null;}}});dojo.requireIf(dojo.render.svg.capable, "dojo.charting.svg.Axis");dojo.requireIf(dojo.render.vml.capable, "dojo.charting.vml.Axis");
\ No newline at end of file
+this.nodes[p] = null;}}
+});dojo.requireIf(dojo.render.svg.capable, "dojo.charting.svg.Axis");dojo.requireIf(dojo.render.vml.capable, "dojo.charting.vml.Axis");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Chart.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Chart.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Chart.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Chart.js Thu Dec 14 07:45:13 2006
@@ -5,6 +5,9 @@
 description
 ){this.node = node || null;this.title = title || "Chart";this.description = description || "";this.plotAreas = [];};dojo.extend(dojo.charting.Chart, {addPlotArea: function(obj, doRender){if(obj.x!=null && obj.left==null){ obj.left = obj.x; }
 if(obj.y!=null && obj.top==null){ obj.top = obj.y; }
-this.plotAreas.push(obj);if(doRender){ this.render(); }},onInitialize:function(chart){ },onRender:function(chart){ },onDestroy:function(chart){ },initialize: function(){if(!this.node){dojo.raise("dojo.charting.Chart.initialize: there must be a root node defined for the Chart."); }
+this.plotAreas.push(obj);if(doRender){ this.render(); }},onInitialize:function(chart){ },onRender:function(chart){ },onDestroy:function(chart){ },initialize: function(){if(!this.node){dojo.raise("dojo.charting.Chart.initialize: there must be a root node defined for the Chart."); 
+}
 this.destroy();this.render();this.onInitialize(this);},render:function(){if(this.node.style.position != "absolute"){this.node.style.position = "relative";}
-for(var i=0; i<this.plotAreas.length; i++){var area = this.plotAreas[i].plotArea;var node = area.initialize();node.style.position = "absolute";node.style.top = this.plotAreas[i].top + "px";node.style.left = this.plotAreas[i].left + "px";this.node.appendChild(node);area.render();}},destroy: function(){for(var i=0; i<this.plotAreas.length; i++){this.plotAreas[i].plotArea.destroy();};while(this.node && this.node.childNodes && this.node.childNodes.length > 0){this.node.removeChild(this.node.childNodes[0]); }}});
\ No newline at end of file
+for(var i=0; i<this.plotAreas.length; i++){var area = this.plotAreas[i].plotArea;var node = area.initialize();node.style.position = "absolute";node.style.top = this.plotAreas[i].top + "px";node.style.left = this.plotAreas[i].left + "px";this.node.appendChild(node);area.render();}},destroy: function(){for(var i=0; i<this.plotAreas.length; i++){this.plotAreas[i].plotArea.destroy();};while(this.node && this.node.childNodes && this.node.childNodes.length > 0){this.node.removeChild(this.node.childNodes[0]); 
+}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Plot.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Plot.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Plot.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Plot.js Thu Dec 14 07:45:13 2006
@@ -5,10 +5,12 @@
 series
 ){var id = "dojo-charting-plot-"+dojo.charting.Plot.count++;this.getId=function(){ return id; };this.setId=function(key){ id = key; };this.axisX = null;this.axisY = null;this.series = [];this.dataNode = null;this.renderType = dojo.charting.RenderPlotSeries.Singly;if(xaxis){this.setAxis(xaxis,"x");}
 if(yaxis){this.setAxis(yaxis,"y");}
-if(series){for(var i=0; i<series.length; i++){ this.addSeries(series[i]); }}}
+if(series){for(var i=0; i<series.length; i++){ this.addSeries(series[i]); }}
+}
 dojo.charting.Plot.count=0;dojo.extend(dojo.charting.Plot, {addSeries: function(
 series,plotter
-){if(series.plotter){this.series.push(series);} else {this.series.push({data: series,plotter: plotter || dojo.charting.Plotters["Default"]});}},setAxis: function(axis, which){if(which.toLowerCase()=="x"){ this.axisX = axis; }
+){if(series.plotter){this.series.push(series);} else {this.series.push({data: series,plotter: plotter || dojo.charting.Plotters["Default"]
+});}},setAxis: function(axis, which){if(which.toLowerCase()=="x"){ this.axisX = axis; }
 else if(which.toLowerCase()=="y"){ this.axisY = axis; }},getRanges: function(){var xmin, xmax, ymin, ymax;xmin=ymin=Number.MAX_VALUE;xmax=ymax=Number.MIN_VALUE;for(var i=0; i<this.series.length; i++){var values = this.series[i].data.evaluate();for(var j=0; j<values.length; j++){var comp=values[j];xmin=Math.min(comp.x, xmin);ymin=Math.min(comp.y, ymin);xmax=Math.max(comp.x, xmax);ymax=Math.max(comp.y, ymax);}}
 return {x:{ upper: xmax, lower:xmin },y:{ upper: ymax, lower:ymin },toString:function(){return "[ x:"+xmax+" - "+xmin+", y:"+ymax+" - "+ymin+"]";}};},destroy: function(){var node=this.dataNode;while(node && node.childNodes && node.childNodes.length > 0){node.removeChild(node.childNodes[0]);}
 this.dataNode=null;}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/PlotArea.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/PlotArea.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/PlotArea.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/PlotArea.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,10 @@
 
-dojo.provide("dojo.charting.PlotArea");dojo.require("dojo.lang.common");dojo.require("dojo.gfx.color");dojo.require("dojo.gfx.color.hsl");dojo.require("dojo.charting.Plot");dojo.charting.PlotArea = function(){var id="dojo-charting-plotarea-"+dojo.charting.PlotArea.count++;this.getId=function(){ return id; };this.setId=function(key){ id = key; };this.areaType = "standard";this.plots = [];this.size={ width:600, height:400 };this.padding={ top:10, right:10, bottom:20, left:20 };this.nodes = {main:null,area:null,background: null,axes: null,plots: null};this._color = { h: 140, s: 120, l: 120, step: 27 };};dojo.charting.PlotArea.count = 0;dojo.extend(dojo.charting.PlotArea, {nextColor: function(){var rgb=dojo.gfx.color.hsl2rgb(this._color.h, this._color.s, this._color.l);this._color.h = (this._color.h + this._color.step)%360;while(this._color.h < 140){this._color.h += this._color.step; }
-return dojo.gfx.color.rgb2hex(rgb[0], rgb[1], rgb[2]);},getArea:function(){return {left: this.padding.left,right: this.size.width - this.padding.right,top: this.padding.top,bottom: this.size.height - this.padding.bottom,toString:function(){var a=[ this.top, this.right, this.bottom, this.left ];return "["+a.join()+"]";}};},getAxes: function(){var axes={};for(var i=0; i<this.plots.length; i++){var plot=this.plots[i];axes[plot.axisX.getId()] = {axis: plot.axisX,drawAgainst: plot.axisY,plot: plot,plane: "x"};axes[plot.axisY.getId()] = {axis: plot.axisY,drawAgainst: plot.axisX,plot: plot,plane: "y"};}
+dojo.provide("dojo.charting.PlotArea");dojo.require("dojo.lang.common");dojo.require("dojo.gfx.color");dojo.require("dojo.gfx.color.hsl");dojo.require("dojo.charting.Plot");dojo.charting.PlotArea = function(){var id="dojo-charting-plotarea-"+dojo.charting.PlotArea.count++;this.getId=function(){ return id; };this.setId=function(key){ id = key; };this.areaType = "standard";this.plots = [];this.size={ width:600, height:400 };this.padding={ top:10, right:10, bottom:20, left:20 };this.nodes = {main:null,area:null,background: null,axes: null,plots: null
+};this._color = { h: 140, s: 120, l: 120, step: 27 };};dojo.charting.PlotArea.count = 0;dojo.extend(dojo.charting.PlotArea, {nextColor: function(){var rgb=dojo.gfx.color.hsl2rgb(this._color.h, this._color.s, this._color.l);this._color.h = (this._color.h + this._color.step)%360;while(this._color.h < 140){this._color.h += this._color.step; 
+}
+return dojo.gfx.color.rgb2hex(rgb[0], rgb[1], rgb[2]);},getArea:function(){return {left: this.padding.left,right: this.size.width - this.padding.right,top: this.padding.top,bottom: this.size.height - this.padding.bottom,toString:function(){var a=[ this.top, this.right, this.bottom, this.left ];return "["+a.join()+"]";}};},getAxes: function(){var axes={};for(var i=0; i<this.plots.length; i++){var plot=this.plots[i];axes[plot.axisX.getId()] = {axis: plot.axisX,drawAgainst: plot.axisY,plot: plot,plane: "x"
+};axes[plot.axisY.getId()] = {axis: plot.axisY,drawAgainst: plot.axisX,plot: plot,plane: "y"
+};}
 return axes;},getLegendInfo: function(){var a=[];for(var i=0; i<this.plots.length; i++){for(var j=0; j<this.plots[i].series.length; j++){var data = this.plots[i].series[j].data;a.push({ label:data.label, color:data.color });}}
 return a;},setAxesRanges: function(){var ranges={};var axes={};for(var i=0; i<this.plots.length; i++){var plot = this.plots[i];var ranges=plot.getRanges();var x=ranges.x;var y=ranges.y;var ax, ay;if(!axes[plot.axisX.getId()]){axes[plot.axisX.getId()]=plot.axisX;ranges[plot.axisX.getId()]={upper: x.upper, lower:x.lower};}
 ax=ranges[plot.axisX.getId()];ax.upper=Math.max(ax.upper, x.upper);ax.lower=Math.min(ax.lower, x.lower);if(!axes[plot.axisY.getId()]){axes[plot.axisY.getId()]=plot.axisY;ranges[plot.axisY.getId()]={upper: y.upper, lower:y.lower};}
@@ -12,9 +16,12 @@
 || !this.nodes.axes
 ){ this.initialize(); }
 this.resize();for(var i=0; i<this.plots.length; i++){var plot=this.plots[i];if(plot.dataNode){this.nodes.plots.removeChild(plot.dataNode);}
-var target = this.initializePlot(plot);switch(plot.renderType){case dojo.charting.RenderPlotSeries.Grouped:	{if(plot.series[0]){target.appendChild(plot.series[0].plotter(this, plot, kwArgs, applyToData));}
+var target = this.initializePlot(plot);switch(plot.renderType){case dojo.charting.RenderPlotSeries.Grouped:{if(plot.series[0]){target.appendChild(plot.series[0].plotter(this, plot, kwArgs, applyToData));}
 break;}
 case dojo.charting.RenderPlotSeries.Singly:
-default: {for(var j=0; j<plot.series.length; j++){var series = plot.series[j];var data = series.data.evaluate(kwArgs);target.appendChild(series.plotter(data, this, plot, applyToData));}}}
-this.nodes.plots.appendChild(target);}},destroy: function(){for(var i=0; i<this.plots.length; i++){this.plots[i].destroy();};for(var p in this.nodes){var node=this.nodes[p];if(!node) continue;if(!node.childNodes) continue;while(node.childNodes.length > 0){node.removeChild(node.childNodes[0]); }
-this.nodes[p]=null;}}});dojo.requireIf(dojo.render.svg.capable, "dojo.charting.svg.PlotArea");dojo.requireIf(dojo.render.vml.capable, "dojo.charting.vml.PlotArea");
\ No newline at end of file
+default: {for(var j=0; j<plot.series.length; j++){var series = plot.series[j];var data = series.data.evaluate(kwArgs);target.appendChild(series.plotter(data, this, plot, applyToData));}}
+}
+this.nodes.plots.appendChild(target);}},destroy: function(){for(var i=0; i<this.plots.length; i++){this.plots[i].destroy();};for(var p in this.nodes){var node=this.nodes[p];if(!node) continue;if(!node.childNodes) continue;while(node.childNodes.length > 0){node.removeChild(node.childNodes[0]); 
+}
+this.nodes[p]=null;}}
+});dojo.requireIf(dojo.render.svg.capable, "dojo.charting.svg.PlotArea");dojo.requireIf(dojo.render.vml.capable, "dojo.charting.vml.PlotArea");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Series.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Series.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Series.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/Series.js Thu Dec 14 07:45:13 2006
@@ -1,9 +1,12 @@
 
-dojo.provide("dojo.charting.Series");dojo.require("dojo.lang.common");dojo.require("dojo.charting.Plotters");dojo.charting.Series = function(kwArgs){var args = kwArgs || { length:1 };this.dataSource = args.dataSource || null;this.bindings = { };this.color = args.color;this.label = args.label;if(args.bindings){for(var p in args.bindings){this.addBinding(p, args.bindings[p]);}}};dojo.extend(dojo.charting.Series, {bind:function(src, bindings){this.dataSource = src;this.bindings = bindings;},addBinding:function(name, binding){this.bindings[name] = binding;},evaluate:function(kwArgs){var ret = [];var a = this.dataSource.getData();var l = a.length;var start = 0;var end = l;if(kwArgs){if(kwArgs.between){for(var i=0; i<l; i++){var fld = this.dataSource.getField(a[i], kwArgs.between.field);if(fld>=kwArgs.between.low && fld<=kwArgs.between.high){var o = { src: a[i], series: this };for(var p in this.bindings){o[p] = this.dataSource.getField(a[i], this.bindings[p]);}
-ret.push(o);}}}
+dojo.provide("dojo.charting.Series");dojo.require("dojo.lang.common");dojo.require("dojo.charting.Plotters");dojo.charting.Series = function(kwArgs){var args = kwArgs || { length:1 };this.dataSource = args.dataSource || null;this.bindings = { };this.color = args.color;this.label = args.label;if(args.bindings){for(var p in args.bindings){this.addBinding(p, args.bindings[p]);}}
+};dojo.extend(dojo.charting.Series, {bind:function(src, bindings){this.dataSource = src;this.bindings = bindings;},addBinding:function(name, binding){this.bindings[name] = binding;},evaluate:function(kwArgs){var ret = [];var a = this.dataSource.getData();var l = a.length;var start = 0;var end = l;if(kwArgs){if(kwArgs.between){for(var i=0; i<l; i++){var fld = this.dataSource.getField(a[i], kwArgs.between.field);if(fld>=kwArgs.between.low && fld<=kwArgs.between.high){var o = { src: a[i], series: this };for(var p in this.bindings){o[p] = this.dataSource.getField(a[i], this.bindings[p]);}
+ret.push(o);}}
+}
 else if(kwArgs.from || kwArgs.length){if(kwArgs.from){start = Math.max(kwArgs.from,0);if(kwArgs.to){end = Math.min(kwArgs.to, end);}} else {if(kwArgs.length < 0){start = Math.max((end + length),0);} else {end = Math.min((start + length), end);}}
 for(var i=start; i<end; i++){var o = { src: a[i], series: this };for(var p in this.bindings){o[p] = this.dataSource.getField(a[i], this.bindings[p]);}
-ret.push(o);}}} else {for(var i=start; i<end; i++){var o = { src: a[i], series: this };for(var p in this.bindings){o[p] = this.dataSource.getField(a[i], this.bindings[p]);}
+ret.push(o);}}
+} else {for(var i=start; i<end; i++){var o = { src: a[i], series: this };for(var p in this.bindings){o[p] = this.dataSource.getField(a[i], this.bindings[p]);}
 ret.push(o);}}
 if(ret.length>0 && typeof(ret[0].x) != "undefined"){ret.sort(function(a,b){if(a.x > b.x) return 1;if(a.x < b.x) return -1;return 0;});}
 return ret;},trends:{createRange: function(values, len){var idx = values.length-1;var length = (len||values.length);return { "index": idx, "length": length, "start":Math.max(idx-length,0) };},mean: function(values, len){var range = this.createRange(values, len);if(range.index<0){ return 0; }
@@ -17,11 +20,14 @@
 var min = Number.MAX_VALUE;for(var i=range.index; i>=range.start; i--){min = Math.min(values[i].y, min);}
 return min;},median: function(values, len){var range = this.createRange(values, len);if(range.index<0){ return 0; }
 var a = [];for (var i=range.index; i>=range.start; i--){var b=false;for(var j=0; j<a.length; j++){if(values[i].y == a[j]){b = true;break;}}
-if(!b){a.push(values[i].y); }}
+if(!b){a.push(values[i].y); 
+}}
 a.sort();if(a.length > 0){return a[Math.ceil(a.length / 2)];}
 return 0;},mode: function(values, len){var range=this.createRange(values, len);if(range.index<0){ return 0; }
 var o = {};var ret = 0
 var median = Number.MIN_VALUE;for(var i=range.index; i>=range.start; i--){if (!o[values[i].y]){o[values[i].y] = 1;} else {o[values[i].y]++;}}
 for(var p in o){if(median < o[p]){median = o[p]; 
-ret=p; }}
-return ret;}}});
\ No newline at end of file
+ret=p; 
+}}
+return ret;}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/svg/PlotArea.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/svg/PlotArea.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/svg/PlotArea.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/svg/PlotArea.js Thu Dec 14 07:45:13 2006
@@ -2,5 +2,5 @@
 dojo.provide("dojo.charting.svg.PlotArea");dojo.require("dojo.lang.common");if(dojo.render.svg.capable){dojo.require("dojo.svg");dojo.extend(dojo.charting.PlotArea, {resize: function(){var area = this.getArea();this.nodes.area.setAttribute("width", this.size.width);this.nodes.area.setAttribute("height", this.size.height);var rect = this.nodes.area.getElementsByTagName("rect")[0];rect.setAttribute("x", area.left);rect.setAttribute("y", area.top);rect.setAttribute("width", area.right-area.left);rect.setAttribute("height", area.bottom-area.top);this.nodes.background.setAttribute("width", this.size.width);this.nodes.background.setAttribute("height", this.size.height);if(this.nodes.plots){this.nodes.area.removeChild(this.nodes.plots);this.nodes.plots = null;}
 this.nodes.plots = document.createElementNS(dojo.svg.xmlns.svg, "g");this.nodes.plots.setAttribute("id", this.getId()+"-plots");this.nodes.plots.setAttribute("style","clip-path:url(#"+this.getId()+"-clip);");this.nodes.area.appendChild(this.nodes.plots);for(var i=0; i<this.plots.length; i++){this.nodes.plots.appendChild(this.initializePlot(this.plots[i]));}
 if(this.nodes.axes){this.nodes.area.removeChild(this.nodes.axes);this.nodes.axes = null;}
-this.nodes.axes = document.createElementNS(dojo.svg.xmlns.svg, "g");this.nodes.axes.setAttribute("id", this.getId()+"-axes");this.nodes.area.appendChild(this.nodes.axes);var axes = this.getAxes();for(var p in axes){var obj = axes[p];this.nodes.axes.appendChild(obj.axis.initialize(this, obj.plot, obj.drawAgainst, obj.plane));}},initializePlot: function(plot){plot.destroy();plot.dataNode = document.createElementNS(dojo.svg.xmlns.svg, "g");plot.dataNode.setAttribute("id", plot.getId());return plot.dataNode;},initialize: function(){this.destroy();this.nodes.main = document.createElement("div");this.nodes.area = document.createElementNS(dojo.svg.xmlns.svg, "svg");this.nodes.area.setAttribute("id", this.getId());this.nodes.main.appendChild(this.nodes.area);var defs = document.createElementNS(dojo.svg.xmlns.svg, "defs");var clip = document.createElementNS(dojo.svg.xmlns.svg, "clipPath");clip.setAttribute("id",this.getId()+"-clip");var rect = document.createElementNS(dojo.svg.xmlns.
 svg, "rect");		
+this.nodes.axes = document.createElementNS(dojo.svg.xmlns.svg, "g");this.nodes.axes.setAttribute("id", this.getId()+"-axes");this.nodes.area.appendChild(this.nodes.axes);var axes = this.getAxes();for(var p in axes){var obj = axes[p];this.nodes.axes.appendChild(obj.axis.initialize(this, obj.plot, obj.drawAgainst, obj.plane));}},initializePlot: function(plot){plot.destroy();plot.dataNode = document.createElementNS(dojo.svg.xmlns.svg, "g");plot.dataNode.setAttribute("id", plot.getId());return plot.dataNode;},initialize: function(){this.destroy();this.nodes.main = document.createElement("div");this.nodes.area = document.createElementNS(dojo.svg.xmlns.svg, "svg");this.nodes.area.setAttribute("id", this.getId());this.nodes.main.appendChild(this.nodes.area);var defs = document.createElementNS(dojo.svg.xmlns.svg, "defs");var clip = document.createElementNS(dojo.svg.xmlns.svg, "clipPath");clip.setAttribute("id",this.getId()+"-clip");var rect = document.createElementNS(dojo.svg.xmlns.
 svg, "rect");
 clip.appendChild(rect);defs.appendChild(clip);this.nodes.area.appendChild(defs);this.nodes.background = document.createElementNS(dojo.svg.xmlns.svg, "rect");this.nodes.background.setAttribute("id", this.getId()+"-background");this.nodes.background.setAttribute("fill", "#fff");this.nodes.area.appendChild(this.nodes.background);this.resize();return this.nodes.main;}});}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/vml/Plotters.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/vml/Plotters.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/vml/Plotters.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/charting/vml/Plotters.js Thu Dec 14 07:45:13 2006
@@ -77,21 +77,21 @@
 ){var area = plotarea.getArea();var group = dojo.charting.Plotters._group(plotarea);var n = data.length;var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4;var w = part*2;for(var i=0; i<n; i++){var high = data[i].high;var low = data[i].low;if(low > high){var t = low;low = high;high = t;}
 var x = plot.axisX.getCoord(data[i].x, plotarea, plot) - (w/2);var y = plot.axisY.getCoord(high, plotarea, plot);var h = plot.axisY.getCoord(low, plotarea, plot)-y;var bar=document.createElement("v:rect");bar.style.position="absolute";bar.style.top=y+1+"px";bar.style.left=x+"px";bar.style.width=w+"px";bar.style.height=h+"px";bar.setAttribute("fillColor", data[i].series.color);bar.setAttribute("stroked", "false");bar.style.antialias="false";var fill=document.createElement("v:fill");fill.setAttribute("opacity", "0.6");bar.appendChild(fill);if(applyTo){ applyTo(bar, data[i].src); }
 group.appendChild(bar);}
-return group;},	
+return group;},
 HighLowClose: function(
 data, 
 plotarea,plot,applyTo
 ){var area = plotarea.getArea();var group = dojo.charting.Plotters._group(plotarea);var n = data.length;var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4;var w = part*2;for(var i=0; i<n; i++){var high = data[i].high;var low = data[i].low;if(low > high){var t = low;low = high;high = t;}
 var c = data[i].close;var x = plot.axisX.getCoord(data[i].x, plotarea, plot) - (w/2);var y = plot.axisY.getCoord(high, plotarea, plot);var h = plot.axisY.getCoord(low, plotarea, plot)-y;var close = plot.axisY.getCoord(c, plotarea, plot);var g = document.createElement("div");var bar=document.createElement("v:rect");bar.style.position="absolute";bar.style.top=y+1+"px";bar.style.left=x+"px";bar.style.width=w+"px";bar.style.height=h+"px";bar.setAttribute("fillColor", data[i].series.color);bar.setAttribute("stroked", "false");bar.style.antialias="false";var fill=document.createElement("v:fill");fill.setAttribute("opacity", "0.6");bar.appendChild(fill);g.appendChild(bar);var line = document.createElement("v:line");line.setAttribute("strokecolor", data[i].series.color);line.setAttribute("strokeweight", "1px");line.setAttribute("from", x+"px,"+close+"px");line.setAttribute("to", (x+w+(part*2)-2)+"px,"+close+"px");var s=line.style;s.position="absolute";s.top="0px";s.left="0px";s.anti
 alias="false";var str=document.createElement("v:stroke");str.setAttribute("opacity","0.6");line.appendChild(str);g.appendChild(line);if(applyTo){ applyTo(g, data[i].src); }
 group.appendChild(g);}
-return group;},	
+return group;},
 HighLowOpenClose: function(
 data, 
 plotarea,plot,applyTo
 ){var area = plotarea.getArea();var group = dojo.charting.Plotters._group(plotarea);var n = data.length;var part = ((area.right-area.left)/(plot.axisX.range.upper - plot.axisX.range.lower))/4;var w = part*2;for(var i=0; i<n; i++){var high = data[i].high;var low = data[i].low;if(low > high){var t = low;low = high;high = t;}
 var o = data[i].open;var c = data[i].close;var x = plot.axisX.getCoord(data[i].x, plotarea, plot) - (w/2);var y = plot.axisY.getCoord(high, plotarea, plot);var h = plot.axisY.getCoord(low, plotarea, plot)-y;var open = plot.axisY.getCoord(o, plotarea, plot);var close = plot.axisY.getCoord(c, plotarea, plot);var g = document.createElement("div");var bar=document.createElement("v:rect");bar.style.position="absolute";bar.style.top=y+1+"px";bar.style.left=x+"px";bar.style.width=w+"px";bar.style.height=h+"px";bar.setAttribute("fillColor", data[i].series.color);bar.setAttribute("stroked", "false");bar.style.antialias="false";var fill=document.createElement("v:fill");fill.setAttribute("opacity", "0.6");bar.appendChild(fill);g.appendChild(bar);var line = document.createElement("v:line");line.setAttribute("strokecolor", data[i].series.color);line.setAttribute("strokeweight", "1px");line.setAttribute("from", (x-(part*2))+"px,"+open+"px");line.setAttribute("to", (x+w-2)+"px,"+open+"px")
 ;var s=line.style;s.position="absolute";s.top="0px";s.left="0px";s.antialias="false";var str=document.createElement("v:stroke");str.setAttribute("opacity","0.6");line.appendChild(str);g.appendChild(line);var line = document.createElement("v:line");line.setAttribute("strokecolor", data[i].series.color);line.setAttribute("strokeweight", "1px");line.setAttribute("from", x+"px,"+close+"px");line.setAttribute("to", (x+w+(part*2)-2)+"px,"+close+"px");var s=line.style;s.position="absolute";s.top="0px";s.left="0px";s.antialias="false";var str=document.createElement("v:stroke");str.setAttribute("opacity","0.6");line.appendChild(str);g.appendChild(line);if(applyTo){ applyTo(g, data[i].src); }
 group.appendChild(g);}
-return group;},	
+return group;},
 Scatter: function(
 data, 
 plotarea,plot,applyTo

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/ArrayList.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/ArrayList.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/ArrayList.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/ArrayList.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,8 @@
 dojo.provide("dojo.collections.ArrayList");dojo.require("dojo.collections.Collections");dojo.collections.ArrayList=function(arr){var items=[];if(arr) items=items.concat(arr);this.count=items.length;this.add=function(obj){items.push(obj);this.count=items.length;};this.addRange=function(a){if(a.getIterator){var e=a.getIterator();while(!e.atEnd()){this.add(e.get());}
 this.count=items.length;}else{for(var i=0; i<a.length; i++){items.push(a[i]);}
 this.count=items.length;}};this.clear=function(){items.splice(0, items.length);this.count=0;};this.clone=function(){return new dojo.collections.ArrayList(items);};this.contains=function(obj){for(var i=0; i < items.length; i++){if(items[i] == obj) {return true;}}
-return false;};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(items, fn, s);}else{for(var i=0; i<items.length; i++){fn.call(s, items[i], i, items);}}};this.getIterator=function(){return new dojo.collections.Iterator(items);};this.indexOf=function(obj){for(var i=0; i < items.length; i++){if(items[i] == obj) {return i;}}
+return false;};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(items, fn, s);}else{for(var i=0; i<items.length; i++){fn.call(s, items[i], i, items);}}
+};this.getIterator=function(){return new dojo.collections.Iterator(items);};this.indexOf=function(obj){for(var i=0; i < items.length; i++){if(items[i] == obj) {return i;}}
 return -1;};this.insert=function( i,  obj){items.splice(i,0,obj);this.count=items.length;};this.item=function( i){return items[i];};this.remove=function(obj){var i=this.indexOf(obj);if(i >=0) {items.splice(i,1);}
 this.count=items.length;};this.removeAt=function( i){items.splice(i,1);this.count=items.length;};this.reverse=function(){items.reverse();};this.sort=function( fn){if(fn){items.sort(fn);}else{items.sort();}};this.setByIndex=function( i,  obj){items[i]=obj;this.count=items.length;};this.toArray=function(){return [].concat(items);}
 this.toString=function( delim){return items.join((delim||","));};};

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/BinaryTree.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/BinaryTree.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/BinaryTree.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/BinaryTree.js Thu Dec 14 07:45:13 2006
@@ -14,8 +14,10 @@
 this.count++;if (!parent) root=n;else {i=parent.compare(n);if (i > 0) parent.left=n;else parent.right=n;}};this.clear=function(){root=null;this.count=0;};this.clone=function(){var c=new dojo.collections.BinaryTree();c.root=root.clone();c.count=this.count;return c;};this.contains=function(data){return this.search(data) != null;};this.deleteData=function(data){var current=root;var parent=null;var i=current.compareData(data);while (i != 0 && current != null){if (i > 0){parent=current;current=current.left;} else if (i < 0) {parent=current;current=current.right;}
 i=current.compareData(data);}
 if (!current) return;this.count--;if (!current.right) {if (!parent) root=current.left;else {i=parent.compare(current);if (i > 0) parent.left=current.left;else if (i < 0) parent.right=current.left;}} else if (!current.right.left){if (!parent) root=current.right;else {i=parent.compare(current);if (i > 0) parent.left=current.right;else if (i < 0) parent.right=current.right;}} else {var leftmost=current.right.left;var lmParent=current.right;while (leftmost.left != null){lmParent=leftmost;leftmost=leftmost.left;}
-lmParent.left=leftmost.right;leftmost.left=current.left;leftmost.right=current.right;if (!parent) root=leftmost;else {i=parent.compare(current);if (i > 0) parent.left=leftmost;else if (i < 0) parent.right=leftmost;}}};this.getIterator=function(){var a=[];inorderTraversalBuildup(root, a);return new dojo.collections.Iterator(a);};this.search=function(data){return searchHelper(root, data);};this.toString=function(order, sep){if (!order) var order=dojo.collections.BinaryTree.TraversalMethods.Inorder;if (!sep) var sep=" ";var s="";switch (order){case dojo.collections.BinaryTree.TraversalMethods.Preorder:
+lmParent.left=leftmost.right;leftmost.left=current.left;leftmost.right=current.right;if (!parent) root=leftmost;else {i=parent.compare(current);if (i > 0) parent.left=leftmost;else if (i < 0) parent.right=leftmost;}}
+};this.getIterator=function(){var a=[];inorderTraversalBuildup(root, a);return new dojo.collections.Iterator(a);};this.search=function(data){return searchHelper(root, data);};this.toString=function(order, sep){if (!order) var order=dojo.collections.BinaryTree.TraversalMethods.Inorder;if (!sep) var sep=" ";var s="";switch (order){case dojo.collections.BinaryTree.TraversalMethods.Preorder:
 s=preorderTraversal(root, sep);break;case dojo.collections.BinaryTree.TraversalMethods.Inorder:
 s=inorderTraversal(root, sep);break;case dojo.collections.BinaryTree.TraversalMethods.Postorder:
 s=postorderTraversal(root, sep);break;};if (s.length == 0) return "";else return s.substring(0, s.length - sep.length);};this.count=0;var root=this.root=null;if (data) {this.add(data);}}
-dojo.collections.BinaryTree.TraversalMethods={Preorder : 1,Inorder : 2,Postorder : 3};
\ No newline at end of file
+dojo.collections.BinaryTree.TraversalMethods={Preorder : 1,Inorder : 2,Postorder : 3
+};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Dictionary.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Dictionary.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Dictionary.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Dictionary.js Thu Dec 14 07:45:13 2006
@@ -2,6 +2,8 @@
 dojo.provide("dojo.collections.Dictionary");dojo.require("dojo.collections.Collections");dojo.collections.Dictionary=function(dictionary){var items={};this.count=0;var testObject={};this.add=function(k, v){var b=(k in items);items[k]=new dojo.collections.DictionaryEntry(k,v);if(!b){this.count++;}};this.clear=function(){items={};this.count=0;};this.clone=function(){return new dojo.collections.Dictionary(this);};this.contains=this.containsKey=function(k){if(testObject[k]){return false;}
 return (items[k]!=null);};this.containsValue=function(v){var e=this.getIterator();while(e.get()){if(e.element.value==v){return true;}}
 return false;};this.entry=function(k){return items[k];};this.forEach=function( fn,  scope){var a=[];for(var p in items) {if(!testObject[p]){a.push(items[p]);}}
-var s=scope||dj_global;if(Array.forEach){Array.forEach(a, fn, s);}else{for(var i=0; i<a.length; i++){fn.call(s, a[i], i, a);}}};this.getKeyList=function(){return (this.getIterator()).map(function(entry){return entry.key;});};this.getValueList=function(){return (this.getIterator()).map(function(entry){return entry.value;});};this.item=function(k){if(k in items){return items[k].valueOf();}
+var s=scope||dj_global;if(Array.forEach){Array.forEach(a, fn, s);}else{for(var i=0; i<a.length; i++){fn.call(s, a[i], i, a);}}
+};this.getKeyList=function(){return (this.getIterator()).map(function(entry){return entry.key;});};this.getValueList=function(){return (this.getIterator()).map(function(entry){return entry.value;});};this.item=function(k){if(k in items){return items[k].valueOf();}
 return undefined;};this.getIterator=function(){return new dojo.collections.DictionaryIterator(items);};this.remove=function(k){if(k in items && !testObject[k]){delete items[k];this.count--;return true;}
-return false;};if (dictionary){var e=dictionary.getIterator();while(e.get()) {this.add(e.element.key, e.element.value);}}};
\ No newline at end of file
+return false;};if (dictionary){var e=dictionary.getIterator();while(e.get()) {this.add(e.element.key, e.element.value);}}
+};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Graph.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Graph.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Graph.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Graph.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,6 @@
 
-dojo.provide("dojo.collections.Graph");dojo.require("dojo.collections.Collections");dojo.experimental("dojo.collections.Graph");dojo.collections.Graph=function(nodes){function node(key, data, neighbors) {this.key=key;this.data=data;this.neighbors=neighbors||new adjacencyList();this.addDirected=function(){if (arguments[0].constructor==edgeToNeighbor){this.neighbors.add(arguments[0]);}else{var n=arguments[0];var cost=arguments[1]||0;this.neighbors.add(new edgeToNeighbor(n, cost));}}}
+dojo.provide("dojo.collections.Graph");dojo.require("dojo.collections.Collections");dojo.experimental("dojo.collections.Graph");dojo.collections.Graph=function(nodes){function node(key, data, neighbors) {this.key=key;this.data=data;this.neighbors=neighbors||new adjacencyList();this.addDirected=function(){if (arguments[0].constructor==edgeToNeighbor){this.neighbors.add(arguments[0]);}else{var n=arguments[0];var cost=arguments[1]||0;this.neighbors.add(new edgeToNeighbor(n, cost));}}
+}
 function nodeList(){var d=new dojo.collections.Dictionary();function nodelistiterator(){var o=[] ;var e=d.getIterator();while(e.get()){o[o.length]=e.element;}
 var position=0;this.element=o[position]||null;this.atEnd=function(){return (position>=o.length);}
 this.get=function(){if(this.atEnd()){return null;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Queue.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Queue.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Queue.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Queue.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
 
 dojo.provide("dojo.collections.Queue");dojo.require("dojo.collections.Collections");dojo.collections.Queue=function(arr){var q=[];if (arr){q=q.concat(arr);}
 this.count=q.length;this.clear=function(){q=[];this.count=q.length;};this.clone=function(){return new dojo.collections.Queue(q);};this.contains=function( o){for(var i=0; i<q.length; i++){if (q[i]==o){return true;}}
-return false;};this.copyTo=function( arr,  i){arr.splice(i,0,q);};this.dequeue=function(){var r=q.shift();this.count=q.length;return r;};this.enqueue=function( o){this.count=q.push(o);};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}};this.getIterator=function(){return new dojo.collections.Iterator(q);};this.peek=function(){return q[0];};this.toArray=function(){return [].concat(q);};};
\ No newline at end of file
+return false;};this.copyTo=function( arr,  i){arr.splice(i,0,q);};this.dequeue=function(){var r=q.shift();this.count=q.length;return r;};this.enqueue=function( o){this.count=q.push(o);};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}
+};this.getIterator=function(){return new dojo.collections.Iterator(q);};this.peek=function(){return q[0];};this.toArray=function(){return [].concat(q);};};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SkipList.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SkipList.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SkipList.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SkipList.js Thu Dec 14 07:45:13 2006
@@ -10,7 +10,8 @@
 var PROB = 0.5;var comparisons = 0;this.head = new node(1);this.count = 0;this.add = function(val){var updates = [];var current = this.head;for (var i = this.head.height; i >= 0; i--){if (!(current.nodes[i] != null && current.nodes[i].compare(val) < 0)) comparisons++;while (current.nodes[i] != null && current.nodes[i].compare(val) < 0){current = current.nodes[i];comparisons++;}
 updates[i] = current;}
 if (current.nodes[0] != null && current.nodes[0].compare(val) == 0) return;var n = new node(val, chooseRandomHeight(this.head.height + 1));this.count++;if (n.height > this.head.height){this.head.incrementHeight();this.head.nodes[this.head.height - 1] = n;}
-for (i = 0; i < n.height; i++){if (i < updates.length) {n.nodes[i] = updates[i].nodes[i];updates[i].nodes[i] = n;}}};this.contains = function(val){var current = this.head;var i;for (i = this.head.height - 1; i >= 0; i--) {while (current.item(i) != null) {comparisons++;var result = current.nodes[i].compare(val);if (result == 0) return true;else if (result < 0) current = current.nodes[i];else break;}}
+for (i = 0; i < n.height; i++){if (i < updates.length) {n.nodes[i] = updates[i].nodes[i];updates[i].nodes[i] = n;}}
+};this.contains = function(val){var current = this.head;var i;for (i = this.head.height - 1; i >= 0; i--) {while (current.item(i) != null) {comparisons++;var result = current.nodes[i].compare(val);if (result == 0) return true;else if (result < 0) current = current.nodes[i];else break;}}
 return false;};this.getIterator = function(){return new iterator(this);};this.remove = function(val){var updates = [];var current = this.head;for (var i = this.head.height - 1; i >= 0; i--){if (!(current.nodes[i] != null && current.nodes[i].compare(val) < 0)) comparisons++;while (current.nodes[i] != null && current.nodes[i].compare(val) < 0) {current = current.nodes[i];comparisons++;}
 updates[i] = current;}
 current = current.nodes[0];if (current != null && current.compare(val) == 0){this.count--;for (var i = 0; i < this.head.height; i++){if (updates[i].nodes[i] != current) break;else updates[i].nodes[i] = current.nodes[i];}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SortedList.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SortedList.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SortedList.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/SortedList.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,8 @@
 dojo.provide("dojo.collections.SortedList");dojo.require("dojo.collections.Collections");dojo.collections.SortedList=function( dictionary){var _this=this;var items={};var q=[];var sorter=function(a,b){if (a.key > b.key) return 1;if (a.key < b.key) return -1;return 0;};var build=function(){q=[];var e=_this.getIterator();while (!e.atEnd()){q.push(e.get());}
 q.sort(sorter);};var testObject={};this.count=q.length;this.add=function( k,v){if (!items[k]) {items[k]=new dojo.collections.DictionaryEntry(k,v);this.count=q.push(items[k]);q.sort(sorter);}};this.clear=function(){items={};q=[];this.count=q.length;};this.clone=function(){return new dojo.collections.SortedList(this);};this.contains=this.containsKey=function( k){if(testObject[k]){return false;}
 return (items[k]!=null);};this.containsValue=function( o){var e=this.getIterator();while (!e.atEnd()){var item=e.get();if(item.value==o){return true;}}
-return false;};this.copyTo=function( arr,  i){var e=this.getIterator();var idx=i;while(!e.atEnd()){arr.splice(idx,0,e.get());idx++;}};this.entry=function( k){return items[k];};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}};this.getByIndex=function( i){return q[i].valueOf();};this.getIterator=function(){return new dojo.collections.DictionaryIterator(items);};this.getKey=function( i){return q[i].key;};this.getKeyList=function(){var arr=[];var e=this.getIterator();while (!e.atEnd()){arr.push(e.get().key);}
+return false;};this.copyTo=function( arr,  i){var e=this.getIterator();var idx=i;while(!e.atEnd()){arr.splice(idx,0,e.get());idx++;}};this.entry=function( k){return items[k];};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}
+};this.getByIndex=function( i){return q[i].valueOf();};this.getIterator=function(){return new dojo.collections.DictionaryIterator(items);};this.getKey=function( i){return q[i].key;};this.getKeyList=function(){var arr=[];var e=this.getIterator();while (!e.atEnd()){arr.push(e.get().key);}
 return arr;};this.getValueList=function(){var arr=[];var e=this.getIterator();while (!e.atEnd()){arr.push(e.get().value);}
 return arr;};this.indexOfKey=function( k){for (var i=0; i<q.length; i++){if (q[i].key==k){return i;}}
 return -1;};this.indexOfValue=function( o){for (var i=0; i<q.length; i++){if (q[i].value==o){return i;}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Stack.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Stack.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Stack.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Stack.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,4 @@
 
 dojo.provide("dojo.collections.Stack");dojo.require("dojo.collections.Collections");dojo.collections.Stack=function(arr){var q=[];if (arr) q=q.concat(arr);this.count=q.length;this.clear=function(){q=[];this.count=q.length;};this.clone=function(){return new dojo.collections.Stack(q);};this.contains=function(o){for (var i=0; i<q.length; i++){if (q[i] == o){return true;}}
-return false;};this.copyTo=function( arr,  i){arr.splice(i,0,q);};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}};this.getIterator=function(){return new dojo.collections.Iterator(q);};this.peek=function(){return q[(q.length-1)];};this.pop=function(){var r=q.pop();this.count=q.length;return r;};this.push=function( o){this.count=q.push(o);};this.toArray=function(){return [].concat(q);};}
+return false;};this.copyTo=function( arr,  i){arr.splice(i,0,q);};this.forEach=function( fn,  scope){var s=scope||dj_global;if(Array.forEach){Array.forEach(q, fn, s);}else{for(var i=0; i<q.length; i++){fn.call(s, q[i], i, q);}}
+};this.getIterator=function(){return new dojo.collections.Iterator(q);};this.peek=function(){return q[(q.length-1)];};this.pop=function(){var r=q.pop();this.count=q.length;return r;};this.push=function( o){this.count=q.push(o);};this.toArray=function(){return [].concat(q);};}