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 [15/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...

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Editor2Toolbar.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Editor2Toolbar.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Editor2Toolbar.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Editor2Toolbar.js Thu Dec 14 07:45:13 2006
@@ -1,8 +1,11 @@
 
 dojo.provide("dojo.widget.Editor2Toolbar");dojo.require("dojo.lang.*");dojo.require("dojo.widget.*");dojo.require("dojo.event.*");dojo.require("dojo.html.layout");dojo.require("dojo.html.display");dojo.require("dojo.widget.RichText");dojo.lang.declare("dojo.widget.HandlerManager", null,function(){this._registeredHandlers=[];},{registerHandler: function(obj, func){if(arguments.length == 2){this._registeredHandlers.push(function(){return obj[func].apply(obj, arguments);});}else{this._registeredHandlers.push(obj);}},removeHandler: function(func){for(var i=0;i<this._registeredHandlers.length;i++){if(func === this._registeredHandlers[i]){delete this._registeredHandlers[i];return;}}
-dojo.debug("HandlerManager handler "+func+" is not registered, can not remove.");},destroy: function(){for(var i=0;i<this._registeredHandlers.length;i++){delete this._registeredHandlers[i];}}});dojo.widget.Editor2ToolbarItemManager = new dojo.widget.HandlerManager;dojo.lang.mixin(dojo.widget.Editor2ToolbarItemManager,{getToolbarItem: function(name){var item;name = name.toLowerCase();for(var i=0;i<this._registeredHandlers.length;i++){item = this._registeredHandlers[i](name);if(item){return item;}}
+dojo.debug("HandlerManager handler "+func+" is not registered, can not remove.");},destroy: function(){for(var i=0;i<this._registeredHandlers.length;i++){delete this._registeredHandlers[i];}}
+});dojo.widget.Editor2ToolbarItemManager = new dojo.widget.HandlerManager;dojo.lang.mixin(dojo.widget.Editor2ToolbarItemManager,{getToolbarItem: function(name){var item;name = name.toLowerCase();for(var i=0;i<this._registeredHandlers.length;i++){item = this._registeredHandlers[i](name);if(item){return item;}}
 _deprecated = function(cmd, plugin){if(!dojo.widget['Editor2Plugin'] || !dojo.widget.Editor2Plugin[plugin]){dojo.deprecated('Toolbar item '+name+" is now defined in plugin dojo.widget.Editor2Plugin."+plugin+". It shall be required explicitly", "0.6");dojo['require']("dojo.widget.Editor2Plugin."+plugin);}}
-if(name == 'forecolor' || name == 'hilitecolor'){_deprecated(name, 'ColorPicker')}else if(name == 'formatblock' || name == 'fontsize' || name == 'fontname'){_deprecated(name, 'DropDownList')}
+if(name == 'forecolor' || name == 'hilitecolor'){_deprecated(name, 'ColorPicker')
+}else if(name == 'formatblock' || name == 'fontsize' || name == 'fontname'){_deprecated(name, 'DropDownList')
+}
 switch(name){case 'bold':
 case 'copy':
 case 'cut':
@@ -46,15 +49,22 @@
 dojo.debug("Not yet implemented toolbar item: "+name);break;default:
 dojo.debug("dojo.widget.Editor2ToolbarItemManager.getToolbarItem: Unknown toolbar item: "+name);}
 return item;}});dojo.addOnUnload(dojo.widget.Editor2ToolbarItemManager, "destroy");dojo.declare("dojo.widget.Editor2ToolbarButton", null,function(name){this._name = name;},{create: function(node, toolbar, nohover){this._domNode = node;var cmd = toolbar.parent.getCommand(this._name);if(cmd){this._domNode.title = cmd.getText();}
-this.disableSelection(this._domNode);this._parentToolbar = toolbar;dojo.event.connect(this._domNode, 'onclick', this, 'onClick');if(!nohover){dojo.event.connect(this._domNode, 'onmouseover', this, 'onMouseOver');dojo.event.connect(this._domNode, 'onmouseout', this, 'onMouseOut');}},disableSelection: function(rootnode){dojo.html.disableSelection(rootnode);var nodes = rootnode.all || rootnode.getElementsByTagName("*");for(var x=0; x<nodes.length; x++){dojo.html.disableSelection(nodes[x]);}},onMouseOver: function(){var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command && _command.getState() != dojo.widget.Editor2Manager.commandState.Disabled){this.highlightToolbarItem();}}},onMouseOut: function(){this.unhighlightToolbarItem();},destroy: function(){this._domNode = null;this._parentToolbar = null;},onClick: function(e){if(this._domNode && !this._domNode.disabled && this._parentToolbar.checkAvailability(
 )){e.preventDefault();e.stopPropagation();var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command){_command.execute();}}}},refreshState: function(){var curInst = dojo.widget.Editor2Manager.getCurrentInstance();var em = dojo.widget.Editor2Manager;if(curInst){var _command = curInst.getCommand(this._name);if(_command){var state = _command.getState();if(state != this._lastState){switch(state){case em.commandState.Latched:
+this.disableSelection(this._domNode);this._parentToolbar = toolbar;dojo.event.connect(this._domNode, 'onclick', this, 'onClick');if(!nohover){dojo.event.connect(this._domNode, 'onmouseover', this, 'onMouseOver');dojo.event.connect(this._domNode, 'onmouseout', this, 'onMouseOut');}},disableSelection: function(rootnode){dojo.html.disableSelection(rootnode);var nodes = rootnode.all || rootnode.getElementsByTagName("*");for(var x=0; x<nodes.length; x++){dojo.html.disableSelection(nodes[x]);}},onMouseOver: function(){var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command && _command.getState() != dojo.widget.Editor2Manager.commandState.Disabled){this.highlightToolbarItem();}}
+},onMouseOut: function(){this.unhighlightToolbarItem();},destroy: function(){this._domNode = null;this._parentToolbar = null;},onClick: function(e){if(this._domNode && !this._domNode.disabled && this._parentToolbar.checkAvailability()){e.preventDefault();e.stopPropagation();var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command){_command.execute();}}
+}},refreshState: function(){var curInst = dojo.widget.Editor2Manager.getCurrentInstance();var em = dojo.widget.Editor2Manager;if(curInst){var _command = curInst.getCommand(this._name);if(_command){var state = _command.getState();if(state != this._lastState){switch(state){case em.commandState.Latched:
 this.latchToolbarItem();break;case em.commandState.Enabled:
 this.enableToolbarItem();break;case em.commandState.Disabled:
 default:
 this.disableToolbarItem();}
-this._lastState = state;}}}
-return em.commandState.Enabled;},latchToolbarItem: function(){this._domNode.disabled = false;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarLatchedItemStyle);},enableToolbarItem: function(){this._domNode.disabled = false;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarEnabledItemStyle);},disableToolbarItem: function(){this._domNode.disabled = true;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarDisabledItemStyle);},highlightToolbarItem: function(){dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarHighlightedItemStyle);},unhighlightToolbarItem: function(){dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarHighlightedItemStyle);},removeToolbarItemStyle: function(){dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarEnabledItemStyle);dojo.html.removeClass(this._domNode, this._
 parentToolbar.ToolbarLatchedItemStyle);dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarDisabledItemStyle);this.unhighlightToolbarItem();}});dojo.declare("dojo.widget.Editor2ToolbarFormatBlockPlainSelect", dojo.widget.Editor2ToolbarButton, {create: function(node, toolbar){this._domNode = node;this._parentToolbar = toolbar;this._domNode = node;this.disableSelection(this._domNode);dojo.event.connect(this._domNode, 'onchange', this, 'onChange');},destroy: function(){this._domNode = null;},onChange: function(){if(this._parentToolbar.checkAvailability()){var sv = this._domNode.value.toLowerCase();var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command){_command.execute(sv);}}}},refreshState: function(){if(this._domNode){dojo.widget.Editor2ToolbarFormatBlockPlainSelect.superclass.refreshState.call(this);var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = 
 curInst.getCommand(this._name);if(_command){var format = _command.getValue();if(!format){ format = ""; }
-dojo.lang.forEach(this._domNode.options, function(item){if(item.value.toLowerCase() == format.toLowerCase()){item.selected = true;}});}}}}});dojo.widget.defineWidget(
-"dojo.widget.Editor2Toolbar",dojo.widget.HtmlWidget,function(){dojo.event.connect(this, "fillInTemplate", dojo.lang.hitch(this, function(){if(dojo.render.html.ie){this.domNode.style.zoom = 1.0;}}));},{templatePath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css"),ToolbarLatchedItemStyle: "ToolbarButtonLatched",ToolbarEnabledItemStyle: "ToolbarButtonEnabled",ToolbarDisabledItemStyle: "ToolbarButtonDisabled",ToolbarHighlightedItemStyle: "ToolbarButtonHighlighted",ToolbarHighlightedSelectStyle: "ToolbarSelectHighlighted",ToolbarHighlightedSelectItemStyle: "ToolbarSelectHighlightedItem",postCreate: function(){var nodes = dojo.html.getElementsByClass("dojoEditorToolbarItem", this.domNode);this.items = {};for(var x=0; x<nodes.length; x++){var node = nodes[x];var itemname = node.getAttribute("dojoETItemName");if(itemname){var item = dojo.widget.Editor2ToolbarItemManager.getToolbarItem(itemname);i
 f(item){item.create(node, this);this.items[itemname.toLowerCase()] = item;}else{node.style.display = "none";}}}},update: function(){for(var cmd in this.items){this.items[cmd].refreshState();}},shareGroup: '',checkAvailability: function(){if(!this.shareGroup){this.parent.focus();return true;}
+this._lastState = state;}}
+}
+return em.commandState.Enabled;},latchToolbarItem: function(){this._domNode.disabled = false;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarLatchedItemStyle);},enableToolbarItem: function(){this._domNode.disabled = false;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarEnabledItemStyle);},disableToolbarItem: function(){this._domNode.disabled = true;this.removeToolbarItemStyle(this._domNode);dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarDisabledItemStyle);},highlightToolbarItem: function(){dojo.html.addClass(this._domNode, this._parentToolbar.ToolbarHighlightedItemStyle);},unhighlightToolbarItem: function(){dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarHighlightedItemStyle);},removeToolbarItemStyle: function(){dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarEnabledItemStyle);dojo.html.removeClass(this._domNode, this._
 parentToolbar.ToolbarLatchedItemStyle);dojo.html.removeClass(this._domNode, this._parentToolbar.ToolbarDisabledItemStyle);this.unhighlightToolbarItem();}});dojo.declare("dojo.widget.Editor2ToolbarFormatBlockPlainSelect", dojo.widget.Editor2ToolbarButton, {create: function(node, toolbar){this._domNode = node;this._parentToolbar = toolbar;this._domNode = node;this.disableSelection(this._domNode);dojo.event.connect(this._domNode, 'onchange', this, 'onChange');},destroy: function(){this._domNode = null;},onChange: function(){if(this._parentToolbar.checkAvailability()){var sv = this._domNode.value.toLowerCase();var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command){_command.execute(sv);}}
+}},refreshState: function(){if(this._domNode){dojo.widget.Editor2ToolbarFormatBlockPlainSelect.superclass.refreshState.call(this);var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(curInst){var _command = curInst.getCommand(this._name);if(_command){var format = _command.getValue();if(!format){ format = ""; }
+dojo.lang.forEach(this._domNode.options, function(item){if(item.value.toLowerCase() == format.toLowerCase()){item.selected = true;}});}}
+}}
+});dojo.widget.defineWidget(
+"dojo.widget.Editor2Toolbar",dojo.widget.HtmlWidget,function(){dojo.event.connect(this, "fillInTemplate", dojo.lang.hitch(this, function(){if(dojo.render.html.ie){this.domNode.style.zoom = 1.0;}}));},{templatePath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css"),ToolbarLatchedItemStyle: "ToolbarButtonLatched",ToolbarEnabledItemStyle: "ToolbarButtonEnabled",ToolbarDisabledItemStyle: "ToolbarButtonDisabled",ToolbarHighlightedItemStyle: "ToolbarButtonHighlighted",ToolbarHighlightedSelectStyle: "ToolbarSelectHighlighted",ToolbarHighlightedSelectItemStyle: "ToolbarSelectHighlightedItem",postCreate: function(){var nodes = dojo.html.getElementsByClass("dojoEditorToolbarItem", this.domNode);this.items = {};for(var x=0; x<nodes.length; x++){var node = nodes[x];var itemname = node.getAttribute("dojoETItemName");if(itemname){var item = dojo.widget.Editor2ToolbarItemManager.getToolbarItem(itemname);i
 f(item){item.create(node, this);this.items[itemname.toLowerCase()] = item;}else{node.style.display = "none";}}
+}},update: function(){for(var cmd in this.items){this.items[cmd].refreshState();}},shareGroup: '',checkAvailability: function(){if(!this.shareGroup){this.parent.focus();return true;}
 var curInst = dojo.widget.Editor2Manager.getCurrentInstance();if(this.shareGroup == curInst.toolbarGroup){return true;}
 return false;},destroy: function(){for(var it in this.items){this.items[it].destroy();delete this.items[it];}
 dojo.widget.Editor2Toolbar.superclass.destroy.call(this);}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FilteringTable.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FilteringTable.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FilteringTable.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FilteringTable.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
 
 dojo.provide("dojo.widget.FilteringTable");dojo.require("dojo.date.format");dojo.require("dojo.collections.Store");dojo.require("dojo.html.*");dojo.require("dojo.html.util");dojo.require("dojo.html.style");dojo.require("dojo.html.selection");dojo.require("dojo.event.*");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.widget.defineWidget(
-"dojo.widget.FilteringTable",dojo.widget.HtmlWidget,function(){this.store=new dojo.collections.Store();this.valueField="Id";this.multiple=false;this.maxSelect=0;this.maxSortable=1;this.minRows=0;this.defaultDateFormat = "%D";this.isInitialized=false;this.alternateRows=false;this.columns=[];this.sortInformation=[{index:0,direction:0}];this.headClass="";this.tbodyClass="";this.headerClass="";this.headerUpClass="selectedUp";this.headerDownClass="selectedDown";this.rowClass="";this.rowAlternateClass="alt";this.rowSelectedClass="selected";this.columnSelected="sorted-column";},{isContainer: false,templatePath: null,templateCssPath: null,getTypeFromString: function(s){var parts = s.split("."), i = 0, obj = dj_global;do{obj = obj[parts[i++]];} while (i < parts.length && obj);return (obj != dj_global) ? obj : null;},getByRow: function(row){return this.store.getByKey(dojo.html.getAttribute(row, "value"));},getDataByRow: function(row){return this.store.getDataByKey(dojo.html.getAttribu
 te(row, "value"));},getRow: function( obj){var rows = this.domNode.tBodies[0].rows;for(var i=0; i<rows.length; i++){if(this.store.getDataByKey(dojo.html.getAttribute(rows[i], "value")) == obj){return rows[i];}}
+"dojo.widget.FilteringTable",dojo.widget.HtmlWidget,function(){this.store=new dojo.collections.Store();this.valueField="Id";this.multiple=false;this.maxSelect=0;this.maxSortable=1;this.minRows=0;this.defaultDateFormat = "%D";this.isInitialized=false;this.alternateRows=false;this.columns=[];this.sortInformation=[{index:0,direction:0
+}];this.headClass="";this.tbodyClass="";this.headerClass="";this.headerUpClass="selectedUp";this.headerDownClass="selectedDown";this.rowClass="";this.rowAlternateClass="alt";this.rowSelectedClass="selected";this.columnSelected="sorted-column";},{isContainer: false,templatePath: null,templateCssPath: null,getTypeFromString: function(s){var parts = s.split("."), i = 0, obj = dj_global;do{obj = obj[parts[i++]];} while (i < parts.length && obj);return (obj != dj_global) ? obj : null;},getByRow: function(row){return this.store.getByKey(dojo.html.getAttribute(row, "value"));},getDataByRow: function(row){return this.store.getDataByKey(dojo.html.getAttribute(row, "value"));},getRow: function( obj){var rows = this.domNode.tBodies[0].rows;for(var i=0; i<rows.length; i++){if(this.store.getDataByKey(dojo.html.getAttribute(rows[i], "value")) == obj){return rows[i];}}
 return null;},getColumnIndex: function(fieldPath){for(var i=0; i<this.columns.length; i++){if(this.columns[i].getField() == fieldPath){return i;}}
 return -1;},getSelectedData: function(){var data=this.store.get();var a=[];for(var i=0; i<data.length; i++){if(data[i].isSelected){a.push(data[i].src);}}
 if(this.multiple){return a;} else {return a[0];}},isSelected: function(obj){var data = this.store.get();for(var i=0; i<data.length; i++){if(data[i].src == obj){return true;}}
@@ -19,22 +20,30 @@
 if(dojo.html.hasAttribute(cells[i], "sortusing")){var trans = dojo.html.getAttribute(cells[i],"sortusing");var f = this.getTypeFromString(trans);if (f != null && f != window && typeof(f)=="function"){o.sortFunction=f;}}
 o.label = dojo.html.renderedTextContent(cells[i]);if(dojo.html.hasAttribute(cells[i], "field")){o.field=dojo.html.getAttribute(cells[i],"field");} else if(o.label.length > 0){o.field=o.label;} else {o.field = "field" + i;}
 if(dojo.html.hasAttribute(cells[i], "format")){o.format=dojo.html.getAttribute(cells[i],"format");}
-if(dojo.html.hasAttribute(cells[i], "dataType")){var sortType = dojo.html.getAttribute(cells[i],"dataType");if(sortType.toLowerCase()=="html" || sortType.toLowerCase()=="markup"){o.sortType = "__markup__";}else{var type = this.getTypeFromString(sortType);if(type){o.sortType = sortType;o.dataType = type;}}}
+if(dojo.html.hasAttribute(cells[i], "dataType")){var sortType = dojo.html.getAttribute(cells[i],"dataType");if(sortType.toLowerCase()=="html" || sortType.toLowerCase()=="markup"){o.sortType = "__markup__";}else{var type = this.getTypeFromString(sortType);if(type){o.sortType = sortType;o.dataType = type;}}
+}
 if(dojo.html.hasAttribute(cells[i], "filterusing")){var trans = dojo.html.getAttribute(cells[i],"filterusing");var f = this.getTypeFromString(trans);if (f != null && f != window && typeof(f)=="function"){o.filterFunction=f;}}
-this.columns.push(o);if(dojo.html.hasAttribute(cells[i], "sort")){var info = {index:i,direction:0};var dir = dojo.html.getAttribute(cells[i], "sort");if(!isNaN(parseInt(dir))){dir = parseInt(dir);info.direction = (dir != 0) ? 1 : 0;}else{info.direction = (dir.toLowerCase() == "desc") ? 1 : 0;}
+this.columns.push(o);if(dojo.html.hasAttribute(cells[i], "sort")){var info = {index:i,direction:0
+};var dir = dojo.html.getAttribute(cells[i], "sort");if(!isNaN(parseInt(dir))){dir = parseInt(dir);info.direction = (dir != 0) ? 1 : 0;}else{info.direction = (dir.toLowerCase() == "desc") ? 1 : 0;}
 this.sortInformation.push(info);}}
-if(this.sortInformation.length == 0){this.sortInformation.push({index:0,direction:0});} else if (this.sortInformation.length > this.maxSortable){this.sortInformation.length = this.maxSortable;}},parseData: function(body){if(body.rows.length == 0 && this.columns.length == 0){return;}
+if(this.sortInformation.length == 0){this.sortInformation.push({index:0,direction:0
+});} else if (this.sortInformation.length > this.maxSortable){this.sortInformation.length = this.maxSortable;}},parseData: function(body){if(body.rows.length == 0 && this.columns.length == 0){return;}
 var self=this;this["__selected__"] = [];var arr = this.store.getFromHtml(this.columns, body, function(obj, row){if(typeof(obj[self.valueField])=="undefined" || obj[self.valueField]==null){obj[self.valueField] = dojo.html.getAttribute(row, "value");}
 if(dojo.html.getAttribute(row, "selected")=="true"){self["__selected__"].push(obj);}});this.store.setData(arr, true);this.render();for(var i=0; i<this["__selected__"].length; i++){this.select(this["__selected__"][i]);}
 this.renderSelections();delete this["__selected__"];this.isInitialized=true;},onSelect: function(e){var row = dojo.html.getParentByType(e.target,"tr");if(dojo.html.hasAttribute(row,"emptyRow")){return;}
 var body = dojo.html.getParentByType(row,"tbody");if(this.multiple){if(e.shiftKey){var startRow;var rows=body.rows;for(var i=0;i<rows.length;i++){if(rows[i]==row){break;}
 if(this.isRowSelected(rows[i])){startRow=rows[i];}}
-if(!startRow){startRow = row;for(; i<rows.length; i++){if(this.isRowSelected(rows[i])){row = rows[i];break;}}}
+if(!startRow){startRow = row;for(; i<rows.length; i++){if(this.isRowSelected(rows[i])){row = rows[i];break;}}
+}
 this.resetSelections();if(startRow == row){this.toggleSelectionByRow(row);} else {var doSelect = false;for(var i=0; i<rows.length; i++){if(rows[i] == startRow){doSelect=true;}
 if(doSelect){this.selectByRow(rows[i]);}
-if(rows[i] == row){doSelect = false;}}}} else {this.toggleSelectionByRow(row);}} else {this.resetSelections();this.toggleSelectionByRow(row);}
+if(rows[i] == row){doSelect = false;}}
+}} else {this.toggleSelectionByRow(row);}} else {this.resetSelections();this.toggleSelectionByRow(row);}
 this.renderSelections();},onSort: function(e){var oldIndex=this.sortIndex;var oldDirection=this.sortDirection;var source=e.target;var row=dojo.html.getParentByType(source,"tr");var cellTag="td";if(row.getElementsByTagName(cellTag).length==0){cellTag="th";}
-var headers=row.getElementsByTagName(cellTag);var header=dojo.html.getParentByType(source,cellTag);for(var i=0; i<headers.length; i++){dojo.html.setClass(headers[i], this.headerClass);if(headers[i]==header){if(this.sortInformation[0].index != i){this.sortInformation.unshift({index:i,direction:0});} else {this.sortInformation[0] = {index:i,direction:(~this.sortInformation[0].direction)&1};}}}
+var headers=row.getElementsByTagName(cellTag);var header=dojo.html.getParentByType(source,cellTag);for(var i=0; i<headers.length; i++){dojo.html.setClass(headers[i], this.headerClass);if(headers[i]==header){if(this.sortInformation[0].index != i){this.sortInformation.unshift({index:i,direction:0
+});} else {this.sortInformation[0] = {index:i,direction:(~this.sortInformation[0].direction)&1
+};}}
+}
 this.sortInformation.length = Math.min(this.sortInformation.length, this.maxSortable);for(var i=0; i<this.sortInformation.length; i++){var idx=this.sortInformation[i].index;var dir=(~this.sortInformation[i].direction)&1;dojo.html.setClass(headers[idx], dir==0?this.headerDownClass:this.headerUpClass);}
 this.render();},onFilter: function(){},_defaultFilter: function(obj){return true;},setFilter: function(field, fn){for(var i=0; i<this.columns.length; i++){if(this.columns[i].getField() == field){this.columns[i].filterFunction=fn;break;}}
 this.applyFilters();},setFilterByIndex: function(idx, fn){this.columns[idx].filterFunction=fn;this.applyFilters();},clearFilter: function(field){for(var i=0; i<this.columns.length; i++){if(this.columns[i].getField() == field){this.columns[i].filterFunction=this._defaultFilter;break;}}
@@ -55,12 +64,14 @@
 for(var j=0; j<this.columns.length; j++){var cell=document.createElement("td");cell.setAttribute("align", this.columns[j].align);cell.setAttribute("valign", this.columns[j].valign);dojo.html.disableSelection(cell);var val = this.store.getField(obj.src, this.columns[j].getField());if(typeof(val)=="undefined"){val="";}
 this.fillCell(cell, this.columns[j], val);row.appendChild(cell);}
 return row;},fillCell: function(cell, meta, val){if(meta.sortType=="__markup__"){cell.innerHTML=val;} else {if(meta.getType()==Date) {val=new Date(val);if(!isNaN(val)){var format = this.defaultDateFormat;if(meta.format){format = meta.format;}
-cell.innerHTML = dojo.date.strftime(val, format);} else {cell.innerHTML = val;}} else if ("Number number int Integer float Float".indexOf(meta.getType())>-1){if(val.length == 0){val="0";}
+cell.innerHTML = dojo.date.strftime(val, format);} else {cell.innerHTML = val;}} else if ("Number number int Integer float Float".indexOf(meta.sortType)>-1){if(val.length == 0){val="0";}
 var n = parseFloat(val, 10) + "";if(n.indexOf(".")>-1){n = dojo.math.round(parseFloat(val,10),2);}
-cell.innerHTML = n;}else{cell.innerHTML = val;}}},prefill: function(){this.isInitialized = false;var body = this.domNode.tBodies[0];while (body.childNodes.length > 0){body.removeChild(body.childNodes[0]);}
+cell.innerHTML = n;}else{cell.innerHTML = val;}}
+},prefill: function(){this.isInitialized = false;var body = this.domNode.tBodies[0];while (body.childNodes.length > 0){body.removeChild(body.childNodes[0]);}
 if(this.minRows>0){for(var i=0; i < this.minRows; i++){var row = document.createElement("tr");if(this.alternateRows){dojo.html[((i % 2 == 1)?"addClass":"removeClass")](row, this.rowAlternateClass);}
 row.setAttribute("emptyRow","true");for(var j=0; j<this.columns.length; j++){var cell = document.createElement("td");cell.innerHTML = "&nbsp;";row.appendChild(cell);}
-body.appendChild(row);}}},init: function(){this.isInitialized=false;var head=this.domNode.getElementsByTagName("thead")[0];if(head.getElementsByTagName("tr").length == 0){var row=document.createElement("tr");for(var i=0; i<this.columns.length; i++){var cell=document.createElement("td");cell.setAttribute("align", this.columns[i].align);cell.setAttribute("valign", this.columns[i].valign);dojo.html.disableSelection(cell);cell.innerHTML=this.columns[i].label;row.appendChild(cell);if(!this.columns[i].noSort){dojo.event.connect(cell, "onclick", this, "onSort");}}
+body.appendChild(row);}}
+},init: function(){this.isInitialized=false;var head=this.domNode.getElementsByTagName("thead")[0];if(head.getElementsByTagName("tr").length == 0){var row=document.createElement("tr");for(var i=0; i<this.columns.length; i++){var cell=document.createElement("td");cell.setAttribute("align", this.columns[i].align);cell.setAttribute("valign", this.columns[i].valign);dojo.html.disableSelection(cell);cell.innerHTML=this.columns[i].label;row.appendChild(cell);if(!this.columns[i].noSort){dojo.event.connect(cell, "onclick", this, "onSort");}}
 dojo.html.prependChild(row, head);}
 if(this.store.get().length == 0){return false;}
 var idx=this.domNode.tBodies[0].rows.length;if(!idx || idx==0 || this.domNode.tBodies[0].rows[0].getAttribute("emptyRow")=="true"){idx = 0;var body = this.domNode.tBodies[0];while(body.childNodes.length>0){body.removeChild(body.childNodes[0]);}
@@ -78,7 +89,9 @@
 self.render();});dojo.event.connect(this.store, "onUpdateField", function(obj, fieldPath, val){var row = self.getRow(obj);var idx = self.getColumnIndex(fieldPath);if(idx>-1 && row && row.cells[idx] && self.columns[idx]){self.fillCell(row.cells[idx], self.columns[idx], val);}});},postCreate: function(){this.store.keyField = this.valueField;if(this.domNode){if(this.domNode.nodeName.toLowerCase() != "table"){}
 if(this.domNode.getElementsByTagName("thead")[0]){var head=this.domNode.getElementsByTagName("thead")[0];if(this.headClass.length > 0){head.className = this.headClass;}
 dojo.html.disableSelection(this.domNode);this.parseMetadata(head);var header="td";if(head.getElementsByTagName(header).length==0){header="th";}
-var headers = head.getElementsByTagName(header);for(var i=0; i<headers.length; i++){if(!this.columns[i].noSort){dojo.event.connect(headers[i], "onclick", this, "onSort");}}} else {this.domNode.appendChild(document.createElement("thead"));}
+var headers = head.getElementsByTagName(header);for(var i=0; i<headers.length; i++){if(!this.columns[i].noSort){dojo.event.connect(headers[i], "onclick", this, "onSort");}}
+} else {this.domNode.appendChild(document.createElement("thead"));}
 if (this.domNode.tBodies.length < 1) {var body = document.createElement("tbody");this.domNode.appendChild(body);} else {var body = this.domNode.tBodies[0];}
 if (this.tbodyClass.length > 0){body.className = this.tbodyClass;}
-dojo.event.connect(body, "onclick", this, "onSelect");this.parseData(body);}}});
\ No newline at end of file
+dojo.event.connect(body, "onclick", this, "onSelect");this.parseData(body);}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FisheyeList.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FisheyeList.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FisheyeList.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FisheyeList.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
 
 dojo.provide("dojo.widget.FisheyeList");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.html.style");dojo.require("dojo.html.selection");dojo.require("dojo.html.util");dojo.require("dojo.event.*");dojo.widget.defineWidget(
-"dojo.widget.FisheyeList",dojo.widget.HtmlWidget,function(){this.pos = {x: -1, y: -1};this.EDGE = {CENTER: 0,LEFT: 1,RIGHT: 2,TOP: 3,BOTTOM: 4};this.timerScale = 1.0;},{templateString: '<div class="dojoHtmlFisheyeListBar"></div>',templateCssPath: dojo.uri.dojoUri("src/widget/templates/FisheyeList.css"),isContainer: true,snarfChildDomOutput: true,itemWidth: 40,itemHeight: 40,itemMaxWidth: 150,itemMaxHeight: 150,orientation: 'horizontal',conservativeTrigger: false,effectUnits: 2,itemPadding: 10,attachEdge: 'center',labelEdge: 'bottom',enableCrappySvgSupport: false,fillInTemplate: function() {dojo.html.disableSelection(this.domNode);this.isHorizontal = (this.orientation == 'horizontal');this.selectedNode = -1;this.isOver = false;this.hitX1 = -1;this.hitY1 = -1;this.hitX2 = -1;this.hitY2 = -1;this.anchorEdge = this._toEdge(this.attachEdge, this.EDGE.CENTER);this.labelEdge  = this._toEdge(this.labelEdge,  this.EDGE.TOP);if ( this.isHorizontal && (this.anchorEdge == this.EDGE.LEFT
   )){ this.anchorEdge = this.EDGE.CENTER; }
+"dojo.widget.FisheyeList",dojo.widget.HtmlWidget,function(){this.pos = {x: -1, y: -1};this.EDGE = {CENTER: 0,LEFT: 1,RIGHT: 2,TOP: 3,BOTTOM: 4
+};this.timerScale = 1.0;},{templateString: '<div class="dojoHtmlFisheyeListBar"></div>',templateCssPath: dojo.uri.dojoUri("src/widget/templates/FisheyeList.css"),isContainer: true,snarfChildDomOutput: true,itemWidth: 40,itemHeight: 40,itemMaxWidth: 150,itemMaxHeight: 150,orientation: 'horizontal',conservativeTrigger: false,effectUnits: 2,itemPadding: 10,attachEdge: 'center',labelEdge: 'bottom',enableCrappySvgSupport: false,fillInTemplate: function() {dojo.html.disableSelection(this.domNode);this.isHorizontal = (this.orientation == 'horizontal');this.selectedNode = -1;this.isOver = false;this.hitX1 = -1;this.hitY1 = -1;this.hitX2 = -1;this.hitY2 = -1;this.anchorEdge = this._toEdge(this.attachEdge, this.EDGE.CENTER);this.labelEdge  = this._toEdge(this.labelEdge,  this.EDGE.TOP);if ( this.isHorizontal && (this.anchorEdge == this.EDGE.LEFT  )){ this.anchorEdge = this.EDGE.CENTER; }
 if ( this.isHorizontal && (this.anchorEdge == this.EDGE.RIGHT )){ this.anchorEdge = this.EDGE.CENTER; }
 if (!this.isHorizontal && (this.anchorEdge == this.EDGE.TOP   )){ this.anchorEdge = this.EDGE.CENTER; }
 if (!this.isHorizontal && (this.anchorEdge == this.EDGE.BOTTOM)){ this.anchorEdge = this.EDGE.CENTER; }
@@ -24,7 +25,8 @@
 this._onGridMouseMove(-1, -1);},_setActive: function( e){if( this.isOver ){ return; }
 this.isOver = true;if ( this.conservativeTrigger ) {dojo.event.connect(document.documentElement, "onmousemove", this, "_onMouseMove");this.timerScale=0.0;this._onMouseMove(e);this._expandSlowly();}},_onMouseMove: function( e) {if ((e.pageX >= this.hitX1) && (e.pageX <= this.hitX2) &&
 (e.pageY >= this.hitY1) && (e.pageY <= this.hitY2)){if( !this.isOver ){this._setActive(e);}
-this._onGridMouseMove(e.pageX-this.hitX1, e.pageY-this.hitY1);}else{if (this.isOver){this._setDormant(e);}}},onResized: function() {this._calcHitGrid();},_onGridMouseMove: function(x, y){this.pos = {x:x, y:y};this._paint();},_paint: function(){var x=this.pos.x;var y=this.pos.y;if( this.itemCount <= 0 ){ return; }
+this._onGridMouseMove(e.pageX-this.hitX1, e.pageY-this.hitY1);}else{if (this.isOver){this._setDormant(e);}}
+},onResized: function() {this._calcHitGrid();},_onGridMouseMove: function(x, y){this.pos = {x:x, y:y};this._paint();},_paint: function(){var x=this.pos.x;var y=this.pos.y;if( this.itemCount <= 0 ){ return; }
 var pos = this.isHorizontal ? x : y;var prx = this.isHorizontal ? this.proximityLeft : this.proximityTop;var siz = this.isHorizontal ? this.itemWidth : this.itemHeight;var sim = this.isHorizontal ?
 (1.0-this.timerScale)*this.itemWidth + this.timerScale*this.itemMaxWidth :
 (1.0-this.timerScale)*this.itemHeight + this.timerScale*this.itemMaxHeight ;var cen = ((pos - prx) / siz) - 0.5;var max_off_cen = (sim / siz) - 0.5;if (max_off_cen > this.effectUnits){ max_off_cen = this.effectUnits; }
@@ -61,6 +63,7 @@
 if ( this.lblNode ) {this.lblNode.appendChild(document.createTextNode(this.caption));}
 dojo.html.disableSelection(this.domNode);},_createSvgNode: function(src){var elm = document.createElement('embed');elm.src = src;elm.type = 'image/svg+xml';elm.style.width = '1px';elm.style.height = '1px';elm.loaded = 0;elm.setSizeOnLoad = false;elm.onload = function(){this.svgRoot = this.getSVGDocument().rootElement;this.svgDoc = this.getSVGDocument().documentElement;this.zeroWidth = this.svgRoot.width.baseVal.value;this.zeroHeight = this.svgRoot.height.baseVal.value;this.loaded = true;if (this.setSizeOnLoad){this.setSize(this.setWidth, this.setHeight);}}
 elm.setSize = function(w, h){if (!this.loaded){this.setWidth = w;this.setHeight = h;this.setSizeOnLoad = true;return;}
-this.style.width = w+'px';this.style.height = h+'px';this.svgRoot.width.baseVal.value = w;this.svgRoot.height.baseVal.value = h;var scale_x = w / this.zeroWidth;var scale_y = h / this.zeroHeight;for(var i=0; i<this.svgDoc.childNodes.length; i++){if (this.svgDoc.childNodes[i].setAttribute){this.svgDoc.childNodes[i].setAttribute( "transform", "scale("+scale_x+","+scale_y+")" );}}}
+this.style.width = w+'px';this.style.height = h+'px';this.svgRoot.width.baseVal.value = w;this.svgRoot.height.baseVal.value = h;var scale_x = w / this.zeroWidth;var scale_y = h / this.zeroHeight;for(var i=0; i<this.svgDoc.childNodes.length; i++){if (this.svgDoc.childNodes[i].setAttribute){this.svgDoc.childNodes[i].setAttribute( "transform", "scale("+scale_x+","+scale_y+")" );}}
+}
 return elm;},onMouseOver: function( e) {if( !this.parent.isOver ){this.parent._setActive(e);}
 if ( this.caption != "" ) {dojo.html.addClass(this.lblNode, "selected");this.parent._positionLabel(this);}},onMouseOut: function( e) {dojo.html.removeClass(this.lblNode, "selected");},onClick: function( e) {}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FloatingPane.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FloatingPane.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FloatingPane.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/FloatingPane.js Thu Dec 14 07:45:13 2006
@@ -10,7 +10,9 @@
 if(this.resizable){this.resizeBar.style.display="";this.resizeHandle = dojo.widget.createWidget("ResizeHandle", {targetElmId: this.widgetId, id:this.widgetId+"_resize"});this.resizeBar.appendChild(this.resizeHandle.domNode);}
 if(this.hasShadow){this.shadow=new dojo.lfx.shadow(this.domNode);}
 this.bgIframe = new dojo.html.BackgroundIframe(this.domNode);if( this.taskBarId ){this._taskBarSetup();}
-dojo.body().removeChild(this.domNode);},postCreate: function(){if (dojo.hostenv.post_load_) {this._setInitialWindowState();} else {dojo.addOnLoad(this, "_setInitialWindowState");}},maximizeWindow: function( evt) {var mb = dojo.html.getMarginBox(this.domNode);this.previous={width: mb.width || this.width,height: mb.height || this.height,left: this.domNode.style.left,top: this.domNode.style.top,bottom: this.domNode.style.bottom,right: this.domNode.style.right};if(this.domNode.parentNode.style.overflow.toLowerCase() != 'hidden'){this.parentPrevious={overflow: this.domNode.parentNode.style.overflow};dojo.debug(this.domNode.parentNode.style.overflow);this.domNode.parentNode.style.overflow = 'hidden';}
+dojo.body().removeChild(this.domNode);},postCreate: function(){if (dojo.hostenv.post_load_) {this._setInitialWindowState();} else {dojo.addOnLoad(this, "_setInitialWindowState");}},maximizeWindow: function( evt) {var mb = dojo.html.getMarginBox(this.domNode);this.previous={width: mb.width || this.width,height: mb.height || this.height,left: this.domNode.style.left,top: this.domNode.style.top,bottom: this.domNode.style.bottom,right: this.domNode.style.right
+};if(this.domNode.parentNode.style.overflow.toLowerCase() != 'hidden'){this.parentPrevious={overflow: this.domNode.parentNode.style.overflow
+};dojo.debug(this.domNode.parentNode.style.overflow);this.domNode.parentNode.style.overflow = 'hidden';}
 this.domNode.style.left =
 dojo.html.getPixelValue(this.domNode.parentNode, "padding-left", true) + "px";this.domNode.style.top =
 dojo.html.getPixelValue(this.domNode.parentNode, "padding-top", true) + "px";if ((this.domNode.parentNode.nodeName.toLowerCase() == 'body')) {var viewport = dojo.html.getViewport();var padding = dojo.html.getPadding(dojo.body());this.resizeTo(viewport.width-padding.width, viewport.height-padding.height);} else {var content = dojo.html.getContentBox(this.domNode.parentNode);this.resizeTo(content.width, content.height);}
@@ -29,7 +31,8 @@
 taskbar.addChild(this);},showFloatingPane: function(){this.bringToTop();},onFloatingPaneShow: function(){var mb = dojo.html.getMarginBox(this.domNode);this.resizeTo(mb.width, mb.height);},resizeTo: function( width,  height){dojo.html.setMarginBox(this.domNode, { width: width, height: height });dojo.widget.html.layout(this.domNode,[
 {domNode: this.titleBar, layoutAlign: "top"},{domNode: this.resizeBar, layoutAlign: "bottom"},{domNode: this.containerNode, layoutAlign: "client"}
 ] );dojo.widget.html.layout(this.containerNode, this.children, "top-bottom");this.bgIframe.onResized();if(this.shadow){ this.shadow.size(width, height); }
-this.onResized();},checkSize: function() {},destroyFloatingPane: function() {if(this.resizeHandle){this.resizeHandle.destroy();this.resizeHandle = null;}}}
+this.onResized();},checkSize: function() {},destroyFloatingPane: function() {if(this.resizeHandle){this.resizeHandle.destroy();this.resizeHandle = null;}}
+}
 );dojo.widget.defineWidget(
 "dojo.widget.FloatingPane",[dojo.widget.ContentPane, dojo.widget.FloatingPaneBase],{fillInTemplate: function(args, frag){this.fillInFloatingPaneTemplate(args, frag);dojo.widget.FloatingPane.superclass.fillInTemplate.call(this, args, frag);},postCreate: function(){dojo.widget.FloatingPaneBase.prototype.postCreate.apply(this, arguments);dojo.widget.FloatingPane.superclass.postCreate.apply(this, arguments);},show: function(){dojo.widget.FloatingPane.superclass.show.apply(this, arguments);this.showFloatingPane();},onShow: function(){dojo.widget.FloatingPane.superclass.onShow.call(this);this.onFloatingPaneShow();},destroy: function(){this.destroyFloatingPane();dojo.widget.FloatingPane.superclass.destroy.apply(this, arguments);}});dojo.widget.defineWidget(
 "dojo.widget.ModalFloatingPane",[dojo.widget.FloatingPane, dojo.widget.ModalDialogBase],{windowState: "minimized",displayCloseAction: true,postCreate: function(){dojo.widget.ModalDialogBase.prototype.postCreate.call(this);dojo.widget.ModalFloatingPane.superclass.postCreate.call(this);},show: function(){this.showModalDialog();dojo.widget.ModalFloatingPane.superclass.show.apply(this, arguments);this.bg.style.zIndex = this.domNode.style.zIndex-1;},hide: function(){this.hideModalDialog();dojo.widget.ModalFloatingPane.superclass.hide.apply(this, arguments);},closeWindow: function(){this.hide();dojo.widget.ModalFloatingPane.superclass.closeWindow.apply(this, arguments);}}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Form.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Form.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Form.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Form.js Thu Dec 14 07:45:13 2006
@@ -2,7 +2,10 @@
 dojo.provide("dojo.widget.Form");dojo.require("dojo.widget.*");dojo.require("dojo.widget.HtmlWidget");dojo.widget.defineWidget("dojo.widget.Form", dojo.widget.HtmlWidget,{isContainer: true,templateString: "<form dojoAttachPoint='containerNode' dojoAttachEvent='onSubmit:onSubmit'></form>",formElements: [],ignoreNullValues: false,postCreate: function(args,frag){for (var key in args) {if (key == "dojotype") continue;var attr= document.createAttribute(key);attr.nodeValue=args[key];this.containerNode.setAttributeNode(attr);}},_createRepeaters: function (obj, widget) {for(var i=0; i<widget.children.length; ++i) {if (widget.children[i].widgetType == "RepeaterContainer") {var rIndex=widget.children[i].index;var rIndexPos=rIndex.indexOf("%{index}");rIndex=rIndex.substr(0,rIndexPos-1);var myObj = this._getObject(obj, rIndex);if (typeof(myObj) == "object" && myObj.length == 0) {myObj=new Array();}
 var rowCount = widget.children[i].getRowCount();for (var j=0,len=rowCount; j<len; ++j) {widget.children[i].deleteRow(0);}
 for (var j=0; j<myObj.length; j++) {widget.children[i].addRow(false);}}
-if (widget.children[i].isContainer) {this._createRepeaters(obj, widget.children[i]);}}},_createFormElements: function() {if(dojo.render.html.safari) {this.formElements=[];var elems = ["INPUT", "SELECT", "TEXTAREA"];for (var k=0; k < elems.length; k++) {var list = this.containerNode.getElementsByTagName(elems[k]);for (var j=0,len2=list.length; j<len2; j++) {this.formElements.push(list[j]);}}} else {this.formElements=this.containerNode.elements;}},onSubmit: function(e) {e.preventDefault();},submit: function() {this.containerNode.submit();},_getFormElement: function(name) {if(dojo.render.html.ie) {for(var i=0, len=this.formElements.length; i<len; i++) {var element = this.formElements[i];if (element.name == name) {return element;}}} else {var elem = this.formElements[name];if (typeof(elem) != "undefined") {return elem;}}
+if (widget.children[i].isContainer) {this._createRepeaters(obj, widget.children[i]);}}
+},_createFormElements: function() {if(dojo.render.html.safari) {this.formElements=[];var elems = ["INPUT", "SELECT", "TEXTAREA"];for (var k=0; k < elems.length; k++) {var list = this.containerNode.getElementsByTagName(elems[k]);for (var j=0,len2=list.length; j<len2; j++) {this.formElements.push(list[j]);}}
+} else {this.formElements=this.containerNode.elements;}},onSubmit: function(e) {e.preventDefault();},submit: function() {this.containerNode.submit();},_getFormElement: function(name) {if(dojo.render.html.ie) {for(var i=0, len=this.formElements.length; i<len; i++) {var element = this.formElements[i];if (element.name == name) {return element;}}
+} else {var elem = this.formElements[name];if (typeof(elem) != "undefined") {return elem;}}
 return null;},_getObject: function(obj, searchString) {var namePath = [];namePath=searchString.split(".");var myObj=obj;var name=namePath[namePath.length-1];for(var j=0, len=namePath.length;j<len;++j) {var p=namePath[j];if (typeof(myObj[p]) == "undefined") {myObj[p]={};}
 myObj=myObj[p];}
 return myObj;},_setToContainers: function (obj,widget) {for(var i=0, len=widget.children.length; i<len; ++i) {var currentWidget=widget.children[i];if (currentWidget.widgetType == "Repeater") {for(var j=0,len=currentWidget.getRowCount(); j<len; ++j) {currentWidget._initRow(j);}}
@@ -12,7 +15,8 @@
 currentWidget.setValue(currentWidget.getValue());break;case "Select":
 continue;break;case "ComboBox":
 continue;break;default:
-break;}}},setValues: function(obj) {this._createFormElements();this._createRepeaters(obj,this);for(var i=0, len=this.formElements.length; i<len; i++) {var element = this.formElements[i];if (element.name == '') {continue};var namePath = new Array();namePath=element.name.split(".");var myObj=obj;var name=namePath[namePath.length-1];for(var j=1,len2=namePath.length;j<len2;++j) {var p=namePath[j - 1];if(typeof(myObj[p]) == "undefined") {myObj=undefined;break;};myObj=myObj[p];}
+break;}}
+},setValues: function(obj) {this._createFormElements();this._createRepeaters(obj,this);for(var i=0, len=this.formElements.length; i<len; i++) {var element = this.formElements[i];if (element.name == '') {continue};var namePath = new Array();namePath=element.name.split(".");var myObj=obj;var name=namePath[namePath.length-1];for(var j=1,len2=namePath.length;j<len2;++j) {var p=namePath[j - 1];if(typeof(myObj[p]) == "undefined") {myObj=undefined;break;};myObj=myObj[p];}
 if (typeof(myObj) == "undefined") {continue;}
 if (typeof(myObj[name]) == "undefined" && this.ignoreNullValues) {continue;}
 var type=element.type;if (type == "hidden" || type == "text" || type == "textarea" || type == "password") {type = "text";}
@@ -21,7 +25,8 @@
 break;case "radio":
 element.checked=false;if (typeof(myObj[name]) == 'undefined') {continue};if (myObj[name] == element.value) {element.checked=true;}
 break;case "select-multiple":
-element.selectedIndex=-1;for (var j=0,len2=element.options.length; j<len2; ++j) {for (var k=0,len3=myObj[name].length;k<len3;++k) {if (element.options[j].value == myObj[name][k]) {element.options[j].selected=true;}}}
+element.selectedIndex=-1;for (var j=0,len2=element.options.length; j<len2; ++j) {for (var k=0,len3=myObj[name].length;k<len3;++k) {if (element.options[j].value == myObj[name][k]) {element.options[j].selected=true;}}
+}
 break;case "select-one":
 element.selectedIndex="0";for (var j=0,len2=element.options.length; j<len2; ++j) {if (element.options[j].value == myObj[name]) {element.options[j].selected=true;} else {}}
 break;case "text":
@@ -34,6 +39,7 @@
 if (nameA.length == 1) {myObj=myObj[nameA[0]];} else {myObj=myObj[nameA[0]][nameIndex];}}
 if ((elm.type != "select-multiple" && elm.type != "checkbox" && elm.type != "radio") || (elm.type=="radio" && elm.checked)) {if(name == name.split("[")[0]) {myObj[name]=elm.value;} else {}} else if (elm.type == "checkbox" && elm.checked) {if(typeof(myObj[name]) == 'undefined') {myObj[name]=[ ];}
 myObj[name].push(elm.value);} else if (elm.type == "select-multiple") {if(typeof(myObj[name]) == 'undefined') {myObj[name]=[ ];}
-for (var jdx=0,len3=elm.options.length; jdx<len3; ++jdx) {if (elm.options[jdx].selected) {myObj[name].push(elm.options[jdx].value);}}}
+for (var jdx=0,len3=elm.options.length; jdx<len3; ++jdx) {if (elm.options[jdx].selected) {myObj[name].push(elm.options[jdx].value);}}
+}
 name=undefined;}
 return obj;}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/GoogleMap.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/GoogleMap.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/GoogleMap.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/GoogleMap.js Thu Dec 14 07:45:13 2006
@@ -5,10 +5,12 @@
 else if(uri.host=="dojotoolkit.org"){gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hSaOaO_TgJ5c3mtQFnk5JO2zD5dZBRZk-ieqVs7BORREYNzAERmcJoEjQ";}
 if(!dojo.hostenv.post_load_){if(!gkey || gkey==""){dojo.raise("dojo.widget.GoogleMap: The Google Map widget requires a proper API key in order to be used.");}
 var tag = "<scr"+"ipt src='http://maps.google.com/maps?file=api&amp;v=2&amp;key="+gkey+"'></scri"+"pt>";if(!dj_global["GMap2"]){document.write(tag);}}else{dojo.debug("Cannot initialize Google Map system after the page has been loaded! Please either manually include the script block provided by Google in your page or require() the GoogleMap widget before onload has fired.");}})();dojo.widget.defineWidget(
-"dojo.widget.GoogleMap",dojo.widget.HtmlWidget,function(){this.map=null;this.geocoder=null;this.data=[];this.datasrc="";this.controls=["largemap","scale","maptype"];},{templatePath:null,templateCssPath:null,isContainer: false,_defaultPoint:{lat:39.10662, lng: -94.578209},setControls:function(){var methodmap={largemap:GLargeMapControl,smallmap:GSmallMapControl,smallzoom:GSmallZoomControl,scale:GScaleControl,maptype:GMapTypeControl,overview:GOverviewMapControl};for(var i=0; i<this.controls.length; i++){this.map.addControl(new (methodmap[this.controls[i].toLowerCase()])());}},findCenter:function(bounds){if(this.data.length==1){return (new GLatLng(this.data[0].lat, this.data[0].lng));}
+"dojo.widget.GoogleMap",dojo.widget.HtmlWidget,function(){this.map=null;this.geocoder=null;this.data=[];this.datasrc="";this.controls=["largemap","scale","maptype"];},{templatePath:null,templateCssPath:null,isContainer: false,_defaultPoint:{lat:39.10662, lng: -94.578209},setControls:function(){var methodmap={largemap:GLargeMapControl,smallmap:GSmallMapControl,smallzoom:GSmallZoomControl,scale:GScaleControl,maptype:GMapTypeControl,overview:GOverviewMapControl
+};for(var i=0; i<this.controls.length; i++){this.map.addControl(new (methodmap[this.controls[i].toLowerCase()])());}},findCenter:function(bounds){if(this.data.length==1){return (new GLatLng(this.data[0].lat, this.data[0].lng));}
 var clat=(bounds.getNorthEast().lat()+bounds.getSouthWest().lat())/2;var clng=(bounds.getNorthEast().lng()+bounds.getSouthWest().lng())/2;return (new GLatLng(clat,clng));},createPinpoint:function(pt, overlay){var m=new GMarker(pt);if(overlay){GEvent.addListener(m,"click",function(){m.openInfoWindowHtml("<div>"+overlay+"</div>");});}
 return m;},plot:function(obj){var p=new GLatLng(obj.lat,obj.lng);var d=obj.description||null;var m=this.createPinpoint(p,d);this.map.addOverlay(m);},plotAddress:function(address){var self=this;this.geocoder.getLocations(address, function(response){if(!response || response.Status.code != 200){alert("The address \"" + address + "\" was not found.");return;}
-var obj={lat:response.Placemark[0].Point.coordinates[1],lng:response.Placemark[0].Point.coordinates[0],description:response.Placemark[0].address};self.data.push(obj);self.render();});},parse:function(table){this.data=[];var h=table.getElementsByTagName("thead")[0];if(!h){return;}
+var obj={lat:response.Placemark[0].Point.coordinates[1],lng:response.Placemark[0].Point.coordinates[0],description:response.Placemark[0].address
+};self.data.push(obj);self.render();});},parse:function(table){this.data=[];var h=table.getElementsByTagName("thead")[0];if(!h){return;}
 var a=[];var cols=h.getElementsByTagName("td");if(cols.length==0){cols=h.getElementsByTagName("th");}
 for(var i=0; i<cols.length; i++){var c=cols[i].innerHTML.toLowerCase();if(c=="long") c="lng";a.push(c);}
 var b=table.getElementsByTagName("tbody")[0];if(!b){return;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/HslColorPicker.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/HslColorPicker.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/HslColorPicker.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/HslColorPicker.js Thu Dec 14 07:45:13 2006
@@ -3,5 +3,8 @@
 "dojo.widget.svg.HslColorPicker",dojo.widget.HtmlWidget,function(){dojo.debug("warning: the HslColorPicker is not a finished widget, and is not yet ready for general use");this.filterObject = {};},{hue: "0",saturation: "0",light: "0",storedColor: "#0054aa",templatePath: dojo.uri.dojoUri("src/widget/templates/HslColorPicker.svg"),fillInTemplate: function() {this.height = "131px";this.svgDoc = this.hueNode.ownerDocument;this.leftGradientColorNode = this.hueNode.ownerDocument.getElementById("leftGradientColor");this.rightGradientColorNode = this.hueNode.ownerDocument.getElementById("rightGradientColor");this.hueNode.setAttributeNS(dojo.dom.xmlns.xlink, "href", dojo.uri.dojoUri("src/widget/templates/images/hue.png"));var hsl = dojo.gfx.color.hex2hsl(this.storedColor);this.hue = hsl[0];this.saturation = hsl[1];this.light = hsl[2];this.setSaturationStopColors();},setSaturationStopColors: function() {this.leftGradientStopColor = dojo.gfx.color.rgb2hex(this.hsl2rgb(this.hue, 0, 50))
 ;this.rightGradientStopColor = dojo.gfx.color.rgb2hex(this.hsl2rgb(this.hue, 100, 50));this.leftGradientColorNode.setAttributeNS(null,'stop-color',this.leftGradientStopColor);this.rightGradientColorNode.setAttributeNS(null,'stop-color',this.rightGradientStopColor);},setHue: function(hue) {this.hue = hue;},setHueSlider: function() {this.hueSliderNode.setAttribute("y", parseInt((this.hue/360) * parseInt(this.height) - 2) + "px" );},setSaturationLight: function(saturation, light) {this.saturation = saturation;this.light = light;},setSaturationLightSlider: function() {},onHueClick: function(evt) {var yPosition = parseInt(evt.clientY) - parseInt(evt.target.getAttribute("y"));this.setHue( 360 - parseInt(yPosition*(360/parseInt(this.height))) );this.setSaturationStopColors();this.setStoredColor(dojo.gfx.color.hsl2hex(this.hue, this.saturation, this.light));},onHueDrag: function(evt) {},onSaturationLightClick: function(evt) {var xPosition = parseInt(evt.clientX) - parseInt(evt.targe
 t.getAttribute("y"));var yPosition = parseInt(evt.clientY) - parseInt(evt.target.getAttribute("y"));var saturation = parseInt(parseInt(xPosition)*(101/106));var light = parseInt(parseInt(yPosition)*(101/106));this.setSaturationLight(saturation, light);this.setStoredColor(dojo.gfx.color.hsl2hex(this.hue, this.saturation, this.light));},onSaturationLightDrag: function(evt) {},getStoredColor: function() {return this.storedColor;},setStoredColor: function(rgbHexColor) {this.storedColor = rgbHexColor;dojo.event.topic.publish("/" + this.widgetId + "/setStoredColor", this.filterObject);},hsl2rgb: function(hue, saturation, light)
 {function rgb(q1,q2,hue) {if (hue>360) hue=hue-360;if (hue<0) hue=hue+360;if (hue<60) return (q1+(q2-q1)*hue/60);else if (hue<180) return(q2);else if (hue<240) return(q1+(q2-q1)*(240-hue)/60);else return(q1);}
 this.rgb = rgb
-if (saturation==0) {return [Math.round(light*255/100), Math.round(light*255/100), Math.round(light*255/100)];} else {light = light/100;saturation = saturation/100;if ((light)<0.5) {var temp2 = (light)*(1.0+saturation)} else {var temp2 = (light+saturation-(light*saturation))}
-var temp1 = 2.0*light - temp2;var rgbcolor = [];rgbcolor[0] = Math.round(rgb(temp1,temp2,parseInt(hue)+120)*255);rgbcolor[1] = Math.round(rgb(temp1,temp2,hue)*255);rgbcolor[2] = Math.round(rgb(temp1,temp2,parseInt(hue)-120)*255);return rgbcolor;}}});
\ No newline at end of file
+if (saturation==0) {return [Math.round(light*255/100), Math.round(light*255/100), Math.round(light*255/100)];} else {light = light/100;saturation = saturation/100;if ((light)<0.5) {var temp2 = (light)*(1.0+saturation)
+} else {var temp2 = (light+saturation-(light*saturation))
+}
+var temp1 = 2.0*light - temp2;var rgbcolor = [];rgbcolor[0] = Math.round(rgb(temp1,temp2,parseInt(hue)+120)*255);rgbcolor[1] = Math.round(rgb(temp1,temp2,hue)*255);rgbcolor[2] = Math.round(rgb(temp1,temp2,parseInt(hue)-120)*255);return rgbcolor;}}
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/InlineEditBox.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/InlineEditBox.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/InlineEditBox.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/InlineEditBox.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,8 @@
 
 dojo.provide("dojo.widget.InlineEditBox");dojo.require("dojo.widget.*");dojo.require("dojo.event.*");dojo.require("dojo.lfx.*");dojo.require("dojo.gfx.color");dojo.require("dojo.string");dojo.require("dojo.html.*");dojo.require("dojo.html.layout");dojo.widget.defineWidget(
 "dojo.widget.InlineEditBox",dojo.widget.HtmlWidget,function(){this.history = [];},{templatePath: dojo.uri.dojoUri("src/widget/templates/InlineEditBox.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/InlineEditBox.css"),mode: "text",name: "",minWidth: 100,minHeight: 200,editing: false,value: "",textValue: "",defaultText: "",postMixInProperties: function(){if(this.textValue){dojo.deprecated("InlineEditBox: Use value parameter instead of textValue; will be removed in 0.5");this.value=this.textValue;}
-if(this.defaultText){dojo.deprecated("InlineEditBox: Use value parameter instead of defaultText; will be removed in 0.5");this.value=this.defaultText;}},onSave: function(newValue, oldValue, name){},onUndo: function(value){},postCreate: function(args, frag){this.editable = this.getFragNodeRef(frag);dojo.html.insertAfter(this.editable, this.form);dojo.event.connect(this.editable, "onmouseover", this, "onMouseOver");dojo.event.connect(this.editable, "onmouseout", this, "onMouseOut");dojo.event.connect(this.editable, "onclick", this, "_beginEdit");if(this.value){this.editable.innerHTML = this.value;return;} else {this.value = dojo.string.trim(this.editable.innerHTML);this.editable.innerHTML = this.value;}},onMouseOver: function(){if(!this.editing){if (this.disabled){dojo.html.addClass(this.editable, "editableRegionDisabled");} else {dojo.html.addClass(this.editable, "editableRegion");if(this.mode == "textarea"){dojo.html.addClass(this.editable, "editableTextareaRegion");}}}},onM
 ouseOut: function(){if(!this.editing){dojo.html.removeClass(this.editable, "editableRegion");dojo.html.removeClass(this.editable, "editableTextareaRegion");dojo.html.removeClass(this.editable, "editableRegionDisabled");}},_beginEdit: function(e){if(this.editing || this.disabled){ return; }
+if(this.defaultText){dojo.deprecated("InlineEditBox: Use value parameter instead of defaultText; will be removed in 0.5");this.value=this.defaultText;}},onSave: function(newValue, oldValue, name){},onUndo: function(value){},postCreate: function(args, frag){this.editable = this.getFragNodeRef(frag);dojo.html.insertAfter(this.editable, this.form);dojo.event.connect(this.editable, "onmouseover", this, "onMouseOver");dojo.event.connect(this.editable, "onmouseout", this, "onMouseOut");dojo.event.connect(this.editable, "onclick", this, "_beginEdit");if(this.value){this.editable.innerHTML = this.value;return;} else {this.value = dojo.string.trim(this.editable.innerHTML);this.editable.innerHTML = this.value;}},onMouseOver: function(){if(!this.editing){if (this.disabled){dojo.html.addClass(this.editable, "editableRegionDisabled");} else {dojo.html.addClass(this.editable, "editableRegion");if(this.mode == "textarea"){dojo.html.addClass(this.editable, "editableTextareaRegion");}}
+}},onMouseOut: function(){if(!this.editing){dojo.html.removeClass(this.editable, "editableRegion");dojo.html.removeClass(this.editable, "editableTextareaRegion");dojo.html.removeClass(this.editable, "editableRegionDisabled");}},_beginEdit: function(e){if(this.editing || this.disabled){ return; }
 this.onMouseOut();this.editing = true;var ee = this[this.mode.toLowerCase()];ee.value = dojo.string.trim(this.value);ee.style.fontSize = dojo.html.getStyle(this.editable, "font-size");ee.style.fontWeight = dojo.html.getStyle(this.editable, "font-weight");ee.style.fontStyle = dojo.html.getStyle(this.editable, "font-style");var bb = dojo.html.getBorderBox(this.editable);ee.style.width = Math.max(bb.width, this.minWidth) + "px";if(this.mode.toLowerCase()=="textarea"){ee.style.display = "block";ee.style.height = Math.max(bb.height, this.minHeight) + "px";} else {ee.style.display = "";}
 this.form.style.display = "";this.editable.style.display = "none";ee.focus();ee.select();this.submitButton.disabled = true;},saveEdit: function(e){e.preventDefault();e.stopPropagation();var ee = this[this.mode.toLowerCase()];if((this.value != ee.value)&&
 (dojo.string.trim(ee.value) != "")){this.doFade = true;this.history.push(this.value);this.onSave(ee.value, this.value, this.name);this.value = ee.value;this.editable.innerHTML = "";var textNode = document.createTextNode( this.value );this.editable.appendChild( textNode );}else{this.doFade = false;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/LayoutContainer.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/LayoutContainer.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/LayoutContainer.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/LayoutContainer.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,4 @@
 
 dojo.provide("dojo.widget.LayoutContainer");dojo.require("dojo.widget.*");dojo.require("dojo.widget.html.layout");dojo.widget.defineWidget(
-"dojo.widget.LayoutContainer",dojo.widget.HtmlWidget,{isContainer: true,layoutChildPriority: 'top-bottom',postCreate: function(){dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},addChild: function(child, overrideContainerNode, pos, ref, insertIndex){dojo.widget.LayoutContainer.superclass.addChild.call(this, child, overrideContainerNode, pos, ref, insertIndex);dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},removeChild: function(pane){dojo.widget.LayoutContainer.superclass.removeChild.call(this,pane);dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},onResized: function(){dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},show: function(){this.domNode.style.display="";this.checkSize();this.domNode.style.display="none";this.domNode.style.visibility="";dojo.widget.LayoutContainer.superclass.show.call(this);}});dojo.lang.extend(dojo.widget.Widget, {layoutA
 lign: 'none'});
\ No newline at end of file
+"dojo.widget.LayoutContainer",dojo.widget.HtmlWidget,{isContainer: true,layoutChildPriority: 'top-bottom',postCreate: function(){dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},addChild: function(child, overrideContainerNode, pos, ref, insertIndex){dojo.widget.LayoutContainer.superclass.addChild.call(this, child, overrideContainerNode, pos, ref, insertIndex);dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},removeChild: function(pane){dojo.widget.LayoutContainer.superclass.removeChild.call(this,pane);dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},onResized: function(){dojo.widget.html.layout(this.domNode, this.children, this.layoutChildPriority);},show: function(){this.domNode.style.display="";this.checkSize();this.domNode.style.display="none";this.domNode.style.visibility="";dojo.widget.LayoutContainer.superclass.show.call(this);}});dojo.lang.extend(dojo.widget.Widget, {layoutA
 lign: 'none'
+});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Manager.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Manager.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Manager.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Manager.js Thu Dec 14 07:45:13 2006
@@ -5,10 +5,12 @@
 if(widget.widgetId == ""){if(widget["id"]){widget.widgetId = widget["id"];}else if(widget.extraArgs["id"]){widget.widgetId = widget.extraArgs["id"];}else{widget.widgetId = this.getUniqueId(widget.ns+'_'+widget.widgetType);}}
 if(this.widgetIds[widget.widgetId]){dojo.debug("widget ID collision on ID: "+widget.widgetId);}
 this.widgetIds[widget.widgetId] = widget;}
-this.destroyAll = function(){for(var x=this.widgets.length-1; x>=0; x--){try{this.widgets[x].destroy(true);delete this.widgets[x];}catch(e){ }}}
+this.destroyAll = function(){for(var x=this.widgets.length-1; x>=0; x--){try{this.widgets[x].destroy(true);delete this.widgets[x];}catch(e){ }}
+}
 this.remove = function(widgetIndex){if(dojo.lang.isNumber(widgetIndex)){var tw = this.widgets[widgetIndex].widgetId;delete this.widgetIds[tw];this.widgets.splice(widgetIndex, 1);}else{this.removeById(widgetIndex);}}
 this.removeById = function(id) {if(!dojo.lang.isString(id)){id = id["widgetId"];if(!id){ dojo.debug("invalid widget or id passed to removeById"); return; }}
-for (var i=0; i<this.widgets.length; i++){if(this.widgets[i].widgetId == id){this.remove(i);break;}}}
+for (var i=0; i<this.widgets.length; i++){if(this.widgets[i].widgetId == id){this.remove(i);break;}}
+}
 this.getWidgetById = function(id){if(dojo.lang.isString(id)){return this.widgetIds[id];}
 return id;}
 this.getWidgetsByType = function(type){var lt = type.toLowerCase();var getType = (type.indexOf(":") < 0 ?
@@ -24,10 +26,12 @@
 this.registerWidgetPackage = function(pname) {if(!widgetPackages[pname]){widgetPackages[pname] = true;widgetPackages.push(pname);}}
 this.getWidgetPackageList = function() {return dojo.lang.map(widgetPackages, function(elt) { return(elt!==true ? elt : undefined); });}
 this.getImplementation = function(widgetName, ctorObject, mixins, ns){var impl = this.getImplementationName(widgetName, ns);if(impl){var ret = ctorObject ? new impl(ctorObject) : new impl();return ret;}}
-function buildPrefixCache() {for(var renderer in dojo.render){if(dojo.render[renderer]["capable"] === true){var prefixes = dojo.render[renderer].prefixes;for(var i=0; i<prefixes.length; i++){renderPrefixCache.push(prefixes[i].toLowerCase());}}}}
+function buildPrefixCache() {for(var renderer in dojo.render){if(dojo.render[renderer]["capable"] === true){var prefixes = dojo.render[renderer].prefixes;for(var i=0; i<prefixes.length; i++){renderPrefixCache.push(prefixes[i].toLowerCase());}}
+}}
 var findImplementationInModule = function(lowerCaseWidgetName, module){if(!module){return null;}
 for(var i=0, l=renderPrefixCache.length, widgetModule; i<=l; i++){widgetModule = (i<l ? module[renderPrefixCache[i]] : module);if(!widgetModule){continue;}
-for(var name in widgetModule){if(name.toLowerCase() == lowerCaseWidgetName){return widgetModule[name];}}}
+for(var name in widgetModule){if(name.toLowerCase() == lowerCaseWidgetName){return widgetModule[name];}}
+}
 return null;}
 var findImplementation = function(lowerCaseWidgetName, moduleName){var module = dojo.evalObjPath(moduleName, false);return (module ? findImplementationInModule(lowerCaseWidgetName, module) : null);}
 this.getImplementationName = function(widgetName, ns){var lowerCaseWidgetName = widgetName.toLowerCase();ns=ns||"dojo";var imps = knownWidgetImplementations[ns] || (knownWidgetImplementations[ns]={});var impl = imps[lowerCaseWidgetName];if(impl){return impl;}
@@ -37,7 +41,8 @@
 impl = findImplementation(lowerCaseWidgetName, nsObj.module);if(impl){return(imps[lowerCaseWidgetName] = impl)};nsObj = dojo.ns.require(ns);if((nsObj)&&(nsObj.resolver)){nsObj.resolve(widgetName);impl = findImplementation(lowerCaseWidgetName, nsObj.module);if(impl){return(imps[lowerCaseWidgetName] = impl)};}
 throw new Error('Could not locate widget implementation for "' + widgetName + '" in "' + nsObj.module + '" registered to namespace "' + nsObj.name + '"');}
 this.resizing=false;this.onWindowResized = function(){if(this.resizing){return;}
-try{this.resizing=true;for(var id in this.topWidgets){var child = this.topWidgets[id];if(child.checkSize ){child.checkSize();}}}catch(e){}finally{this.resizing=false;}}
+try{this.resizing=true;for(var id in this.topWidgets){var child = this.topWidgets[id];if(child.checkSize ){child.checkSize();}}
+}catch(e){}finally{this.resizing=false;}}
 if(typeof window != "undefined") {dojo.addOnLoad(this, 'onWindowResized');dojo.event.connect(window, 'onresize', this, 'onWindowResized');}};(function(){var dw = dojo.widget;var dwm = dw.manager;var h = dojo.lang.curry(dojo.lang, "hitch", dwm);var g = function(oldName, newName){dw[(newName||oldName)] = h(oldName);}
 g("add", "addWidget");g("destroyAll", "destroyAllWidgets");g("remove", "removeWidget");g("removeById", "removeWidgetById");g("getWidgetById");g("getWidgetById", "byId");g("getWidgetsByType");g("getWidgetsByFilter");g("getWidgetsByType", "byType");g("getWidgetsByFilter", "byFilter");g("getWidgetByNode", "byNode");dw.all = function(n){var widgets = dwm.getAllWidgets.apply(dwm, arguments);if(arguments.length > 0) {return widgets[n];}
 return widgets;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Menu2.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Menu2.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Menu2.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/Menu2.js Thu Dec 14 07:45:13 2006
@@ -1,10 +1,15 @@
 
 dojo.provide("dojo.widget.Menu2");dojo.require("dojo.widget.PopupContainer");dojo.widget.defineWidget(
-"dojo.widget.PopupMenu2",dojo.widget.PopupContainer,function(){this.targetNodeIds = [];this.eventNames =  {open: ""};},{snarfChildDomOutput: true,eventNaming: "default",templateString: '<table class="dojoPopupMenu2" border=0 cellspacing=0 cellpadding=0 style="display: none;"><tbody dojoAttachPoint="containerNode"></tbody></table>',templateCssPath: dojo.uri.dojoUri("src/widget/templates/Menu2.css"),templateCssString: "",submenuDelay: 500,submenuOverlap: 5,contextMenuForWindow: false,initialize: function(args, frag) {if (this.eventNaming == "default") {for (var eventName in this.eventNames) {this.eventNames[eventName] = this.widgetId+"/"+eventName;}}},postCreate: function(){if (this.contextMenuForWindow){var doc = dojo.body();this.bindDomNode(doc);} else if ( this.targetNodeIds.length > 0 ){dojo.lang.forEach(this.targetNodeIds, this.bindDomNode, this);}
-this._subscribeSubitemsOnOpen();},_subscribeSubitemsOnOpen: function() {var subItems = this.getChildrenOfType(dojo.widget.MenuItem2);for(var i=0; i<subItems.length; i++) {dojo.event.topic.subscribe(this.eventNames.open, subItems[i], "menuOpen")}},getTopOpenEvent: function() {var menu = this;while (menu.parentPopup){ menu = menu.parentPopup; }
+"dojo.widget.PopupMenu2",dojo.widget.PopupContainer,function(){this.targetNodeIds = [];this.eventNames =  {open: ""
+};},{snarfChildDomOutput: true,eventNaming: "default",templateString: '<table class="dojoPopupMenu2" border=0 cellspacing=0 cellpadding=0 style="display: none;"><tbody dojoAttachPoint="containerNode"></tbody></table>',templateCssPath: dojo.uri.dojoUri("src/widget/templates/Menu2.css"),templateCssString: "",submenuDelay: 500,submenuOverlap: 5,contextMenuForWindow: false,initialize: function(args, frag) {if (this.eventNaming == "default") {for (var eventName in this.eventNames) {this.eventNames[eventName] = this.widgetId+"/"+eventName;}}
+},postCreate: function(){if (this.contextMenuForWindow){var doc = dojo.body();this.bindDomNode(doc);} else if ( this.targetNodeIds.length > 0 ){dojo.lang.forEach(this.targetNodeIds, this.bindDomNode, this);}
+this._subscribeSubitemsOnOpen();},_subscribeSubitemsOnOpen: function() {var subItems = this.getChildrenOfType(dojo.widget.MenuItem2);for(var i=0; i<subItems.length; i++) {dojo.event.topic.subscribe(this.eventNames.open, subItems[i], "menuOpen")
+}},getTopOpenEvent: function() {var menu = this;while (menu.parentPopup){ menu = menu.parentPopup; }
 return menu.openEvent;},bindDomNode: function( node){node = dojo.byId(node);var win = dojo.html.getElementWindow(node);if(dojo.html.isTag(node,'iframe') == 'iframe'){win = dojo.html.iframeContentWindow(node);node = dojo.withGlobal(win, dojo.body);}
-dojo.widget.Menu2.OperaAndKonqFixer.fixNode(node);dojo.event.kwConnect({srcObj:     node,srcFunc:    "oncontextmenu",targetObj:  this,targetFunc: "onOpen",once:       true});if(dojo.render.html.moz && win.document.designMode.toLowerCase() == 'on'){dojo.event.browser.addListener(node, "contextmenu", dojo.lang.hitch(this, "onOpen"));}
-dojo.widget.PopupManager.registerWin(win);},unBindDomNode: function( nodeName){var node = dojo.byId(nodeName);dojo.event.kwDisconnect({srcObj:     node,srcFunc:    "oncontextmenu",targetObj:  this,targetFunc: "onOpen",once:       true});dojo.widget.Menu2.OperaAndKonqFixer.cleanNode(node);},_moveToNext: function( evt){this._highlightOption(1);return true;},_moveToPrevious: function( evt){this._highlightOption(-1);return true;},_moveToParentMenu: function( evt){if(this._highlighted_option && this.parentPopup){if(evt._menu2UpKeyProcessed){return true;}else{this._highlighted_option.onUnhover();this.closeSubpopup();evt._menu2UpKeyProcessed = true;}}
+dojo.widget.Menu2.OperaAndKonqFixer.fixNode(node);dojo.event.kwConnect({srcObj:     node,srcFunc:    "oncontextmenu",targetObj:  this,targetFunc: "onOpen",once:       true
+});if(dojo.render.html.moz && win.document.designMode.toLowerCase() == 'on'){dojo.event.browser.addListener(node, "contextmenu", dojo.lang.hitch(this, "onOpen"));}
+dojo.widget.PopupManager.registerWin(win);},unBindDomNode: function( nodeName){var node = dojo.byId(nodeName);dojo.event.kwDisconnect({srcObj:     node,srcFunc:    "oncontextmenu",targetObj:  this,targetFunc: "onOpen",once:       true
+});dojo.widget.Menu2.OperaAndKonqFixer.cleanNode(node);},_moveToNext: function( evt){this._highlightOption(1);return true;},_moveToPrevious: function( evt){this._highlightOption(-1);return true;},_moveToParentMenu: function( evt){if(this._highlighted_option && this.parentPopup){if(evt._menu2UpKeyProcessed){return true;}else{this._highlighted_option.onUnhover();this.closeSubpopup();evt._menu2UpKeyProcessed = true;}}
 return false;},_moveToChildMenu: function( evt){if(this._highlighted_option && this._highlighted_option.submenuId){this._highlighted_option._onClick(true);return true;}
 return false;},_selectCurrentItem: function( evt){if(this._highlighted_option){this._highlighted_option._onClick();return true;}
 return false;},processKey: function( evt){if(evt.ctrlKey || evt.altKey || !evt.key){ return false; }
@@ -22,13 +27,15 @@
 if(curItem.onHover && curItem.isShowing()){return curItem;}
 curItem = dir>0 ? curItem.getNextSibling() : curItem.getPreviousSibling();}},_highlightOption: function(dir){var item;if((!this._highlighted_option)){item = this._findValidItem(dir);}else{item = this._findValidItem(dir, this._highlighted_option);}
 if(item){if(this._highlighted_option) {this._highlighted_option.onUnhover();}
-item.onHover();dojo.html.scrollIntoView(item.domNode);try {var node = dojo.html.getElementsByClass("dojoMenuItem2Label", item.domNode)[0];node.focus();} catch(e) { }}},onItemClick: function( item) {},close: function( force){if(this.animationInProgress){dojo.widget.PopupMenu2.superclass.close.apply(this, arguments);return;}
+item.onHover();dojo.html.scrollIntoView(item.domNode);try {var node = dojo.html.getElementsByClass("dojoMenuItem2Label", item.domNode)[0];node.focus();} catch(e) { }}
+},onItemClick: function( item) {},close: function( force){if(this.animationInProgress){dojo.widget.PopupMenu2.superclass.close.apply(this, arguments);return;}
 if(this._highlighted_option){this._highlighted_option.onUnhover();}
 dojo.widget.PopupMenu2.superclass.close.apply(this, arguments);},closeSubpopup: function(force){if (this.currentSubpopup == null){ return; }
 this.currentSubpopup.close(force);this.currentSubpopup = null;this.currentSubmenuTrigger.is_open = false;this.currentSubmenuTrigger._closedSubmenu(force);this.currentSubmenuTrigger = null;},_openSubmenu: function(submenu, from_item){var fromPos = dojo.html.getAbsolutePosition(from_item.domNode, true);var our_w = dojo.html.getMarginBox(this.domNode).width;var x = fromPos.x + our_w - this.submenuOverlap;var y = fromPos.y;submenu.open(x, y, this, from_item.domNode);this.currentSubmenuTrigger = from_item;this.currentSubmenuTrigger.is_open = true;},onOpen: function( e){this.openEvent = e;if(e["target"]){this.openedForWindow = dojo.html.getElementWindow(e.target);}else{this.openedForWindow = null;}
 var x = e.pageX, y = e.pageY;var win = dojo.html.getElementWindow(e.target);var iframe = win._frameElement || win.frameElement;if(iframe){var cood = dojo.html.abs(iframe, true);x += cood.x - dojo.withGlobal(win, dojo.html.getScroll).left;y += cood.y - dojo.withGlobal(win, dojo.html.getScroll).top;}
 this.open(x, y, null, [x, y]);e.preventDefault();e.stopPropagation();}});dojo.widget.defineWidget(
-"dojo.widget.MenuItem2",dojo.widget.HtmlWidget,function(){this.eventNames = {engage: ""};},{templateString:
+"dojo.widget.MenuItem2",dojo.widget.HtmlWidget,function(){this.eventNames = {engage: ""
+};},{templateString:
 '<tr class="dojoMenuItem2" dojoAttachEvent="onMouseOver: onHover; onMouseOut: onUnhover; onClick: _onClick; onKey:onKey;">'
 +'<td><div class="${this.iconClass}" style="${this.iconStyle}"></div></td>'
 +'<td tabIndex="-1" class="dojoMenuItem2Label">${this.caption}</td>'
@@ -36,7 +43,8 @@
 +'<td><div class="dojoMenuItem2Submenu" style="display:${this.arrowDisplay};"></div></td>'
 +'</tr>',is_hovering: false,hover_timer: null,is_open: false,topPosition: 0,caption: 'Untitled',accelKey: '',iconSrc: '',disabledClass: 'dojoMenuItem2Disabled',iconClass: 'dojoMenuItem2Icon',submenuId: '',eventNaming: "default",highlightClass: 'dojoMenuItem2Hover',postMixInProperties: function(){this.iconStyle="";if (this.iconSrc){if ((this.iconSrc.toLowerCase().substring(this.iconSrc.length-4) == ".png") && (dojo.render.html.ie55 || dojo.render.html.ie60)){this.iconStyle="filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+this.iconSrc+"', sizingMethod='image')";}else{this.iconStyle="background-image: url("+this.iconSrc+")";}}
 this.arrowDisplay = this.submenuId ? 'block' : 'none';dojo.widget.MenuItem2.superclass.postMixInProperties.apply(this, arguments);},fillInTemplate: function(){dojo.html.disableSelection(this.domNode);if (this.disabled){this.setDisabled(true);}
-if (this.eventNaming == "default") {for (var eventName in this.eventNames) {this.eventNames[eventName] = this.widgetId+"/"+eventName;}}},onHover: function(){this.onUnhover();if (this.is_hovering){ return; }
+if (this.eventNaming == "default") {for (var eventName in this.eventNames) {this.eventNames[eventName] = this.widgetId+"/"+eventName;}}
+},onHover: function(){this.onUnhover();if (this.is_hovering){ return; }
 if (this.is_open){ return; }
 if(this.parent._highlighted_option){this.parent._highlighted_option.onUnhover();}
 this.parent.closeSubpopup();this.parent._highlighted_option = this;dojo.widget.PopupManager.setFocusedMenu(this.parent);this._highlightItem();if (this.is_hovering){ this._stopSubmenuTimer(); }
@@ -61,15 +69,18 @@
 rval = this._moveToParentMenu(evt);break;case evt.KEY_RIGHT_ARROW:
 rval = this._moveToNext(evt);break;case evt.KEY_LEFT_ARROW:
 rval = this._moveToPrevious(evt);break;default:
-rval = 	dojo.widget.MenuBar2.superclass.processKey.apply(this, arguments);break;}
+rval = dojo.widget.MenuBar2.superclass.processKey.apply(this, arguments);break;}
 return rval;},postCreate: function(){dojo.widget.MenuBar2.superclass.postCreate.apply(this, arguments);dojo.widget.PopupManager.opened(this);this.isShowingNow = true;},_openSubmenu: function(submenu, from_item){var fromPos = dojo.html.getAbsolutePosition(from_item.domNode, true);var ourPos = dojo.html.getAbsolutePosition(this.domNode, true);var our_h = dojo.html.getBorderBox(this.domNode).height;var x = fromPos.x;var y = ourPos.y + our_h - this.menuOverlap;submenu.open(x, y, this, from_item.domNode);this.currentSubmenuTrigger = from_item;this.currentSubmenuTrigger.is_open = true;}});dojo.widget.defineWidget(
 "dojo.widget.MenuBarItem2",dojo.widget.MenuItem2,{templateString:
 '<td class="dojoMenuBarItem2" dojoAttachEvent="onMouseOver: onHover; onMouseOut: onUnhover; onClick: _onClick;">'
 +'<span>${this.caption}</span>'
-+'</td>',highlightClass: 'dojoMenuBarItem2Hover',setDisabled: function(value){this.disabled = value;if (this.disabled){dojo.html.addClass(this.domNode, 'dojoMenuBarItem2Disabled');}else{dojo.html.removeClass(this.domNode, 'dojoMenuBarItem2Disabled');}}});dojo.widget.Menu2.OperaAndKonqFixer = new function(){var implement = true;var delfunc = false;if (!dojo.lang.isFunction(dojo.doc().oncontextmenu)){dojo.doc().oncontextmenu = function(){implement = false;delfunc = true;}}
++'</td>',highlightClass: 'dojoMenuBarItem2Hover',setDisabled: function(value){this.disabled = value;if (this.disabled){dojo.html.addClass(this.domNode, 'dojoMenuBarItem2Disabled');}else{dojo.html.removeClass(this.domNode, 'dojoMenuBarItem2Disabled');}}
+});dojo.widget.Menu2.OperaAndKonqFixer = new function(){var implement = true;var delfunc = false;if (!dojo.lang.isFunction(dojo.doc().oncontextmenu)){dojo.doc().oncontextmenu = function(){implement = false;delfunc = true;}}
 if (dojo.doc().createEvent){try {var e = dojo.doc().createEvent("MouseEvents");e.initMouseEvent("contextmenu", 1, 1, dojo.global(), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, null);dojo.doc().dispatchEvent(e);} catch (e) {}} else {implement = false;}
 if (delfunc){delete dojo.doc().oncontextmenu;}
 this.fixNode = function(node){if (implement){if (!dojo.lang.isFunction(node.oncontextmenu)){node.oncontextmenu = function(e){}}
-if (dojo.render.html.opera){node._menufixer_opera = function(e){if (e.ctrlKey){this.oncontextmenu(e);}};dojo.event.connect(node, "onclick", node, "_menufixer_opera");} else {node._menufixer_konq = function(e){if (e.button==2 ){e.preventDefault();this.oncontextmenu(e);}};dojo.event.connect(node, "onmousedown", node, "_menufixer_konq");}}}
+if (dojo.render.html.opera){node._menufixer_opera = function(e){if (e.ctrlKey){this.oncontextmenu(e);}};dojo.event.connect(node, "onclick", node, "_menufixer_opera");} else {node._menufixer_konq = function(e){if (e.button==2 ){e.preventDefault();this.oncontextmenu(e);}};dojo.event.connect(node, "onmousedown", node, "_menufixer_konq");}}
+}
 this.cleanNode = function(node){if (implement){if (node._menufixer_opera){dojo.event.disconnect(node, "onclick", node, "_menufixer_opera");delete node._menufixer_opera;} else if(node._menufixer_konq){dojo.event.disconnect(node, "onmousedown", node, "_menufixer_konq");delete node._menufixer_konq;}
-if (node.oncontextmenu){delete node.oncontextmenu;}}}};
\ No newline at end of file
+if (node.oncontextmenu){delete node.oncontextmenu;}}
+}};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/MonthlyCalendar.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/MonthlyCalendar.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/MonthlyCalendar.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/MonthlyCalendar.js Thu Dec 14 07:45:13 2006
@@ -1,6 +1,7 @@
 
 dojo.provide("dojo.widget.MonthlyCalendar");dojo.require("dojo.date.common");dojo.require("dojo.date.format");dojo.require("dojo.widget.*");dojo.require("dojo.widget.DatePicker");dojo.require("dojo.event.*");dojo.require("dojo.html.*");dojo.require("dojo.experimental");dojo.experimental("dojo.widget.MonthlyCalendar");dojo.widget.defineWidget(
-"dojo.widget.MonthlyCalendar",dojo.widget.DatePicker,{dayWidth: 'wide',templatePath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.css"),initializer: function(){this.iCalendars = [];},addCalendar: function( cal) {dojo.debug("Adding Calendar");this.iCalendars.push(cal);dojo.debug("Starting init");this.initUI();dojo.debug("done init");},createDayContents: function(node,mydate) {dojo.html.removeChildren(node);node.appendChild(document.createTextNode(mydate.getDate()));for(var x=0; x<this.iCalendars.length; x++) {var evts = this.iCalendars[x].getEvents(mydate);if ((dojo.lang.isArray(evts)) && (evts.length>0)) {for(var y=0;y<evts.length;y++) {var el = document.createElement("div");dojo.html.addClass(el, "dojoMonthlyCalendarEvent");el.appendChild(document.createTextNode(evts[y].summary.value));el.width = dojo.html.getContentBox(node).width;node.appendChild(el);}}}},initUI: function() {var dayLa
 bels = dojo.date.getNames('days', this.dayWidth, 'standAlone', this.lang);var dayLabelNodes = this.dayLabelsRow.getElementsByTagName("td");for(var i=0; i<7; i++) {dayLabelNodes.item(i).innerHTML = dayLabels[i];}
+"dojo.widget.MonthlyCalendar",dojo.widget.DatePicker,{dayWidth: 'wide',templatePath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.html"),templateCssPath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.css"),initializer: function(){this.iCalendars = [];},addCalendar: function( cal) {dojo.debug("Adding Calendar");this.iCalendars.push(cal);dojo.debug("Starting init");this.initUI();dojo.debug("done init");},createDayContents: function(node,mydate) {dojo.html.removeChildren(node);node.appendChild(document.createTextNode(mydate.getDate()));for(var x=0; x<this.iCalendars.length; x++) {var evts = this.iCalendars[x].getEvents(mydate);if ((dojo.lang.isArray(evts)) && (evts.length>0)) {for(var y=0;y<evts.length;y++) {var el = document.createElement("div");dojo.html.addClass(el, "dojoMonthlyCalendarEvent");el.appendChild(document.createTextNode(evts[y].summary.value));el.width = dojo.html.getContentBox(node).width;node.appendChild(el);}}
+}},initUI: function() {var dayLabels = dojo.date.getNames('days', this.dayWidth, 'standAlone', this.lang);var dayLabelNodes = this.dayLabelsRow.getElementsByTagName("td");for(var i=0; i<7; i++) {dayLabelNodes.item(i).innerHTML = dayLabels[i];}
 this.selectedIsUsed = false;this.currentIsUsed = false;var currentClassName = "";var previousDate = new Date();var calendarNodes = this.calendarDatesContainerNode.getElementsByTagName("td");var currentCalendarNode;previousDate.setHours(8);var nextDate = new Date(this.firstSaturday.year, this.firstSaturday.month, this.firstSaturday.date, 8);var lastDay = new Date(this.firstSaturday.year, this.firstSaturday.month, this.firstSaturday.date + 42, 8);if (this.iCalendars.length > 0) {for (var x=0; x<this.iCalendars.length;x++) {this.iCalendars[x].preComputeRecurringEvents(lastDay);}}
 if(this.firstSaturday.date < 7) {var dayInWeek = 6;for (var i=this.firstSaturday.date; i>0; i--) {currentCalendarNode = calendarNodes.item(dayInWeek);this.createDayContents(currentCalendarNode, nextDate);dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "current"));dayInWeek--;previousDate = nextDate;nextDate = this.incrementDate(nextDate, false);}
 for(var i=dayInWeek; i>-1; i--) {currentCalendarNode = calendarNodes.item(i);this.createDayContents(currentCalendarNode, nextDate);dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "previous"));previousDate = nextDate;nextDate = this.incrementDate(nextDate, false);}} else {nextDate.setDate(1);for(var i=0; i<7; i++) {currentCalendarNode = calendarNodes.item(i);this.createDayContents(currentCalendarNode, nextDate);dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "current"));previousDate = nextDate;nextDate = this.incrementDate(nextDate, true);}}