Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/vml/Chart.js URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/vml/Chart.js?view=diff&rev=487242&r1=487241&r2=487242 ============================================================================== --- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/vml/Chart.js (original) +++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/widget/vml/Chart.js Thu Dec 14 07:45:13 2006 @@ -1,6 +1,10 @@ dojo.provide("dojo.widget.vml.Chart");dojo.require("dojo.widget.HtmlWidget");dojo.require("dojo.widget.Chart");dojo.require("dojo.math");dojo.require("dojo.html.layout");dojo.require("dojo.gfx.color");dojo.widget.defineWidget( -"dojo.widget.vml.Chart",[dojo.widget.HtmlWidget, dojo.widget.Chart],function(){this.templatePath=null;this.templateCssPath=null;this._isInitialize=false;this.hasData=false;this.vectorNode=null;this.plotArea=null;this.dataGroup=null;this.axisGroup=null;this.properties={height:0,width:0,defaultWidth:600,defaultHeight:400,plotType:null,padding:{top:10,bottom:2,left:60,right:30},axes:{x:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200}},y:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200}}}};},{parseProperties:function(node){var bRangeX=false;var bRangeY=false;if (node.getAttribute("width")){this.properties.width=node.getAttribute("width");} +"dojo.widget.vml.Chart",[dojo.widget.HtmlWidget, dojo.widget.Chart],function(){this.templatePath=null;this.templateCssPath=null;this._isInitialize=false;this.hasData=false;this.vectorNode=null;this.plotArea=null;this.dataGroup=null;this.axisGroup=null;this.properties={height:0,width:0,defaultWidth:600,defaultHeight:400,plotType:null,padding:{top:10,bottom:2,left:60,right:30 +},axes:{x:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200 +}},y:{plotAt:0,label:"",unitLabel:"",unitType:Number,nUnitsToShow:10,range:{min:0,max:200 +}} +}};},{parseProperties:function(node){var bRangeX=false;var bRangeY=false;if (node.getAttribute("width")){this.properties.width=node.getAttribute("width");} if (node.getAttribute("height")){this.properties.height=node.getAttribute("height");} if (node.getAttribute("plotType")){this.properties.plotType=node.getAttribute("plotType");} if (node.getAttribute("padding")){if (node.getAttribute("padding").indexOf(",") > -1) @@ -19,7 +23,8 @@ for(var i=0; i<this.series.length; i++){dojo.widget.vml.Chart.Plotter.plot(this.series[i], this);}},postCreate:function(){var table=this.domNode.getElementsByTagName("table")[0];if (table){var ranges=this.parseProperties(table);var bRangeX=false;var bRangeY=false;var axisValues = this.parseData(table);if(!bRangeX){this.properties.axes.x.range={min:axisValues.x.min, max:axisValues.x.max};} if(!bRangeY){this.properties.axes.y.range={min:axisValues.y.min, max:axisValues.y.max};} this.setAxesPlot(table);this.domNode.removeChild(table);} -if(this.series.length>0){this.render();}}});dojo.widget.vml.Chart.Plotter=new function(){var self=this;var plotters = {};var types=dojo.widget.Chart.PlotTypes;this.getX=function(value, chart){var v=parseFloat(value);var min=chart.properties.axes.x.range.min;var max=chart.properties.axes.x.range.max;var ofst=0-min;min+=ofst; max+=ofst; v+=ofst;var xmin = 0;var xmax=chart.properties.width-chart.properties.padding.left-chart.properties.padding.right;var x=(v*((xmax-xmin)/max))+xmin;return x;};this.getY=function(value, chart){var v=parseFloat(value);var max=chart.properties.axes.y.range.max;var min=chart.properties.axes.y.range.min;var ofst=0;if(min<0)ofst+=Math.abs(min);min+=ofst; max+=ofst; v+=ofst;var ymin=chart.properties.height-chart.properties.padding.top-chart.properties.padding.bottom;var ymax = 0;var y=(((ymin-ymax)/(max-min))*(max-v))+ymax;return y;};this.addPlotter=function(name, func){plotters[name]=func;};this.plot=function(series, chart){if (series.values.length==0 ) return;if (series.plotType && plotters[series.plotType]){return plotters[series.plotType](series, chart);} +if(this.series.length>0){this.render();}} +});dojo.widget.vml.Chart.Plotter=new function(){var self=this;var plotters = {};var types=dojo.widget.Chart.PlotTypes;this.getX=function(value, chart){var v=parseFloat(value);var min=chart.properties.axes.x.range.min;var max=chart.properties.axes.x.range.max;var ofst=0-min;min+=ofst; max+=ofst; v+=ofst;var xmin = 0;var xmax=chart.properties.width-chart.properties.padding.left-chart.properties.padding.right;var x=(v*((xmax-xmin)/max))+xmin;return x;};this.getY=function(value, chart){var v=parseFloat(value);var max=chart.properties.axes.y.range.max;var min=chart.properties.axes.y.range.min;var ofst=0;if(min<0)ofst+=Math.abs(min);min+=ofst; max+=ofst; v+=ofst;var ymin=chart.properties.height-chart.properties.padding.top-chart.properties.padding.bottom;var ymax = 0;var y=(((ymin-ymax)/(max-min))*(max-v))+ymax;return y;};this.addPlotter=function(name, func){plotters[name]=func;};this.plot=function(series, chart){if (series.values.length==0) return;if (series.plotType && plotters[ series.plotType]){return plotters[series.plotType](series, chart);} else if (chart.plotType && plotters[chart.plotType]){return plotters[chart.plotType](series, chart);}};plotters["bar"]=function(series, chart){var space=1;var lastW = 0;var ys = [];var yAxis=self.getY(chart.properties.axes.x.plotAt, chart);var yA = yAxis;for (var i=0; i<series.values.length; i++){var x=self.getX(series.values[i].x, chart);var w;if (i==series.values.length-1){w=lastW;} else{w=self.getX(series.values[i+1].x, chart)-x-space;lastW=w;} x-=(w/2);var y=self.getY(series.values[i].value, chart);var h=Math.abs(yA-y);if (parseFloat(series.values[i].value) < chart.properties.axes.x.plotAt){y=yA;} var bar=document.createElement("v:rect");bar.style.position="absolute";bar.style.top=y+"px";bar.style.left=x+"px";bar.style.width=w+"px";bar.style.height=h+"px";bar.setAttribute("fillColor", series.color);bar.setAttribute("stroked", "false");bar.style.antialias="false";bar.setAttribute("title", series.label + " (" + i + "): " + series.values[i].value);var fill=document.createElement("v:fill");fill.setAttribute("opacity", "0.9");bar.appendChild(fill);chart.dataGroup.appendChild(bar);}};plotters["line"]=function(series, chart){var tension=1.5;var line=document.createElement("v:shape");line.setAttribute("strokeweight", "2px");line.setAttribute("strokecolor", series.color);line.setAttribute("fillcolor", "none");line.setAttribute("filled", "false");line.setAttribute("title", series.label);line.setAttribute("coordsize", chart.properties.width + "," + chart.properties.height);line.style.position="absolute";line.style.top="0px";line.style.left="0px";line.style.width= chart.propertie s.width+"px";line.style.height=chart.properties.height+"px";var stroke=document.createElement("v:stroke");stroke.setAttribute("opacity", "0.85");line.appendChild(stroke);var path = [];for (var i=0; i<series.values.length; i++){var x = Math.round(self.getX(series.values[i].x, chart));var y = Math.round(self.getY(series.values[i].value, chart));if (i==0){path.push("m");path.push(x+","+y);}else{var lastx=Math.round(self.getX(series.values[i-1].x, chart));var lasty=Math.round(self.getY(series.values[i-1].value, chart));var dx=x-lastx;var dy=y-lasty;path.push("c");var cx=Math.round((x-(tension-1)*(dx/tension)));path.push(cx+","+lasty);cx=Math.round((x-(dx/tension)));path.push(cx+","+y);path.push(x+","+y);}}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/Parse.js URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/Parse.js?view=diff&rev=487242&r1=487241&r2=487242 ============================================================================== --- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/Parse.js (original) +++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/Parse.js Thu Dec 14 07:45:13 2006 @@ -4,16 +4,17 @@ if((dojo.widget)&&(dojo.widget.tags[tagName])){return tagName;} var p = tagName.indexOf(":");if(p>=0){return tagName;} if(tagName.substr(0,5) == "dojo:"){return tagName;} -if(dojo.render.html.capable && dojo.render.html.ie && node.scopeName != 'HTML'){return node.scopeName.toLowerCase() + ':' + tagName;} +if(dojo.render.html.capable && dojo.render.html.ie && node.scopeName && node.scopeName != 'HTML'){return node.scopeName.toLowerCase() + ':' + tagName;} if(tagName.substr(0,4) == "dojo"){return "dojo:" + tagName.substring(4);} var djt = node.getAttribute("dojoType") || node.getAttribute("dojotype");if(djt){if (djt.indexOf(":")<0){djt = "dojo:"+djt;} return djt.toLowerCase();} djt = node.getAttributeNS && node.getAttributeNS(dojo.dom.dojoml,"type");if(djt){return "dojo:" + djt.toLowerCase();} try{djt = node.getAttribute("dojo:type");}catch(e){} if(djt){ return "dojo:"+djt.toLowerCase(); } -if((dj_global["djConfig"])&&(!djConfig["ignoreClassNames"])){var classes = node.className||node.getAttribute("class");if((classes )&&(classes.indexOf)&&(classes.indexOf("dojo-")!=-1)){var aclasses = classes.split(" ");for(var x=0, c=aclasses.length; x<c; x++){if(aclasses[x].slice(0, 5) == "dojo-"){return "dojo:"+aclasses[x].substr(5).toLowerCase();}}}} +if((dj_global["djConfig"])&&(!djConfig["ignoreClassNames"])){var classes = node.className||node.getAttribute("class");if((classes )&&(classes.indexOf)&&(classes.indexOf("dojo-")!=-1)){var aclasses = classes.split(" ");for(var x=0, c=aclasses.length; x<c; x++){if(aclasses[x].slice(0, 5) == "dojo-"){return "dojo:"+aclasses[x].substr(5).toLowerCase();}} +}} return '';} -this.parseElement = function( node,hasParentNodeSet,optimizeForDojoML,thisIdx ){var tagName = getTagName(node);if(isIE && tagName.indexOf("/")==0){ return null; } +this.parseElement = function(node,hasParentNodeSet,optimizeForDojoML,thisIdx){var tagName = getTagName(node);if(isIE && tagName.indexOf("/")==0){ return null; } try{var attr = node.getAttribute("parseWidgets");if(attr && attr.toLowerCase() == "false"){return {};}}catch(e){} var process = true;if(optimizeForDojoML){var dojoTagName = getDojoTagName(node);tagName = dojoTagName || tagName;process = Boolean(dojoTagName);} var parsedNodeSet = {};parsedNodeSet[tagName] = [];var pos = tagName.indexOf(":");if(pos>0){var ns = tagName.substring(0,pos);parsedNodeSet["ns"] = ns;if((dojo.ns)&&(!dojo.ns.allow(ns))){process=false;}} @@ -22,7 +23,7 @@ parsedNodeSet[tagName].nodeRef = node;parsedNodeSet.tagName = tagName;parsedNodeSet.index = thisIdx||0;} var count = 0;for(var i = 0; i < node.childNodes.length; i++){var tcn = node.childNodes.item(i);switch(tcn.nodeType){case dojo.dom.ELEMENT_NODE: var ctn = getDojoTagName(tcn) || getTagName(tcn);if(!parsedNodeSet[ctn]){parsedNodeSet[ctn] = [];} -parsedNodeSet[ctn].push(this.parseElement(tcn, true, optimizeForDojoML, count));if( (tcn.childNodes.length == 1)&& +parsedNodeSet[ctn].push(this.parseElement(tcn, true, optimizeForDojoML, count));if((tcn.childNodes.length == 1)&& (tcn.childNodes.item(0).nodeType == dojo.dom.TEXT_NODE)){parsedNodeSet[ctn][parsedNodeSet[ctn].length-1].value = tcn.childNodes.item(0).nodeValue;} count++;break;case dojo.dom.TEXT_NODE: if(node.childNodes.length == 1){parsedNodeSet[tagName].push({ value: node.childNodes.item(0).nodeValue });} @@ -32,5 +33,6 @@ (typeof attnode.nodeValue == 'undefined')|| (attnode.nodeValue == null)|| (attnode.nodeValue == '')){continue;}} -var nn = attnode.nodeName.split(":");nn = (nn.length == 2) ? nn[1] : attnode.nodeName;parsedAttributeSet[nn] = {value: attnode.nodeValue};} +var nn = attnode.nodeName.split(":");nn = (nn.length == 2) ? nn[1] : attnode.nodeName;parsedAttributeSet[nn] = {value: attnode.nodeValue +};} return parsedAttributeSet;};}; Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/XslTransform.js URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/XslTransform.js?view=diff&rev=487242&r1=487241&r2=487242 ============================================================================== --- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/XslTransform.js (original) +++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/XslTransform.js Thu Dec 14 07:45:13 2006 @@ -20,7 +20,8 @@ var xsltDocument = null;var xsltProcessor = null;if(IS_IE){xsltDocument = new ActiveXObject(getActiveXImpl(ACTIVEX_FT_DOMS));xsltDocument.async = false;}else{xsltProcessor = new XSLTProcessor();xsltDocument = document.implementation.createDocument("", "", null);xsltDocument.addEventListener("load", onXslLoad, false);} xsltDocument.load(xsltUri);if(IS_IE){var xslt = new ActiveXObject(getActiveXImpl(ACTIVEX_TEMPLATES));xslt.stylesheet = xsltDocument; xsltProcessor = xslt.createProcessor();} -function onXslLoad(){xsltProcessor.importStylesheet(xsltDocument); } +function onXslLoad(){xsltProcessor.importStylesheet(xsltDocument); +} function getResultDom(xmlDoc, params){if(IS_IE){addIeParams(params);var result = getIeResultDom(xmlDoc);removeIeParams(params); return result;}else{return getMozillaResultDom(xmlDoc, params);}} function addIeParams(params){if(!params){ return; } @@ -36,16 +37,19 @@ for(var i=0; i<params.length; i++){xsltProcessor.setParameter(null, params[i][0], params[i][1]);}} function getMozillaResultDom(xmlDoc, params){addMozillaParams(params);var resultDoc = xsltProcessor.transformToDocument(xmlDoc);xsltProcessor.clearParameters();return resultDoc;} function getMozillaResultStr(xmlDoc, params, parentDoc){addMozillaParams(params);var resultDoc = xsltProcessor.transformToFragment(xmlDoc, parentDoc);var serializer = new XMLSerializer();xsltProcessor.clearParameters();return serializer.serializeToString(resultDoc);} -this.getResultString = function( xmlDoc, +this.getResultString = function(xmlDoc, params, -parentDoc){var content = null;if(IS_IE){addIeParams(params);content = getIeResultStr(xmlDoc, params);removeIeParams(params); }else{content = getMozillaResultStr(xmlDoc, params, parentDoc);} -return content;};this.transformToContentPane = function( xmlDoc,params, +parentDoc){var content = null;if(IS_IE){addIeParams(params);content = getIeResultStr(xmlDoc, params);removeIeParams(params); +}else{content = getMozillaResultStr(xmlDoc, params, parentDoc);} +return content;};this.transformToContentPane = function(xmlDoc,params, contentPane, -parentDoc){var content = this.getResultString(xmlDoc, params, parentDoc);contentPane.setContent(content);};this.transformToRegion = function( xmlDoc, +parentDoc){var content = this.getResultString(xmlDoc, params, parentDoc);contentPane.setContent(content);};this.transformToRegion = function(xmlDoc, params, region, -parentDoc){try{var content = this.getResultString(xmlDoc, params, parentDoc);region.innerHTML = content;}catch (e){dojo.raise(e.message + "\n\n xsltUri: " + xsltUri)}};this.transformToDocument = function( xmlDoc, +parentDoc){try{var content = this.getResultString(xmlDoc, params, parentDoc);region.innerHTML = content;}catch (e){dojo.raise(e.message + "\n\n xsltUri: " + xsltUri) +}};this.transformToDocument = function( xmlDoc, params){return getResultDom(xmlDoc, params);} -this.transformToWindow = function( xmlDoc,params, +this.transformToWindow = function( xmlDoc,params, windowDoc, -parentDoc){try{windowDoc.open();windowDoc.write(this.getResultString(xmlDoc, params, parentDoc));windowDoc.close();}catch(e){dojo.raise(e.message + "\n\n xsltUri: " + xsltUri)}};}; \ No newline at end of file +parentDoc){try{windowDoc.open();windowDoc.write(this.getResultString(xmlDoc, params, parentDoc));windowDoc.close();}catch(e){dojo.raise(e.message + "\n\n xsltUri: " + xsltUri) +}};}; \ No newline at end of file Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/__package__.js URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/__package__.js?view=diff&rev=487242&r1=487241&r2=487242 ============================================================================== --- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/__package__.js (original) +++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/xml/__package__.js Thu Dec 14 07:45:13 2006 @@ -1,2 +1,3 @@ -dojo.require("dojo.xml.Parse");dojo.kwCompoundRequire({common: ["dojo.dom"],browser: ["dojo.html.*"],dashboard: ["dojo.html.*"]});dojo.provide("dojo.xml.*"); \ No newline at end of file +dojo.require("dojo.xml.Parse");dojo.kwCompoundRequire({common:["dojo.dom"],browser: ["dojo.html.*"],dashboard: ["dojo.html.*"] +});dojo.provide("dojo.xml.*"); \ No newline at end of file
