dchart-core - npm Package Compare versions

Comparing version 1.0.25 to 1.0.26

com/axis.js

@@ -1,1 +0,1 @@
-function Axis(i,t,e){this.reset(),this.options={key:"x",type:"defaults",orient:null,dy:0,padding:.3,groupPadding:null,min:0,max:null,tickSize:1,tickValues:null,tickFormat:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelInAxis:!0},this.x=null,this.axisx=null,this.init(i,t,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Axis=Com.extend(Axis,{_valid:function(){var i=this.options,t=["defaults","category","time","nondecile"];-1===_.indexOf(t,i.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.type+" in types.",i.type=t[0],this.valid=!1),i.type=_.initialUpperCase(i.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,i.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.orient+" in orients.",i.orient=e[0],this.valid=!1),i.orient=_.initialUpperCase(i.orient)},renderSeries:function(){var i=this.options;this["cal"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)},format:function(){var i=this.options;if("function"==typeof i.format){var t=this;this.axisx.tickFormat(function(e,n){return i.format.call(t._data[n],e,n)})}},_afterAxis:function(){var i=this.options;"function"==typeof i._afterAxis&&i._afterAxis.call(this)},renderLabel:function(){var i=this.options;if(i.label&&i.labelInAxis){var t=this.el.selectAll(".tick")[0];d3.select(t[t.length-1]).select("text").text(i.label)}},calLeft:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("left").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(n)},updateLeft:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx)},calRight:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("right").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(n)},updateRight:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx)},calTop:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("top").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(n)},updateTop:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).call(this.axisx)},calBottom:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("bottom").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(n)},updateBottom:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing).attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx)},axisDefaults:function(i){var t=this.x=d3.scale.linear().range(i),e=this.calExtent();return t.domain(e),t},updateAxisDefaults:function(i){return this.x.range(i),this.x.domain(this.calExtent()),this.x},axisCategory:function(i){var t,e=this.options;t=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(i,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(i,e.padding/2,e.padding);var n=this.calExtent();return t.domain(n),t},updateAxisCategory:function(i){var t=this.options;return _.isArray(t.padding)?this.x.rangeBands(i,t.padding[0],t.padding[1]):this.x.rangeBands(i,t.padding/2,t.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(i){var t,e=this.options,n=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:(console.log("date error: "+i[e.key]+"is not a Date"),e.min&&(t[0]=_.isDate(e.min)?e.min:new Date(e.min)),void(e.max&&(t[1]=_.isDate(e.max)?e.max:new Date(e.max))))})),n.domain(t),n},updateAxisTime:function(i){var t,e=this.options,n=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"date"==typeof i[e.key]?i[e.key]:void console.log("date error: "+i[e.key]+"is not a Date")})),n.domain(t),n},axisNondecile:function(i){var t=this.options,e=this.x=d3.scale.linear().range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,t.key),a=this._data=[],s=0,r=a.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in n){var l={sum:_.sum(n[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,a.push(l)}return t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},t.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(i){var t=this.options,e=this.x.range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,t.key),a=this._data=[],s=0,r=a.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in n){var l={sum:_.sum(n[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,a.push(l)}return e.domain(this.calExtent()),t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var i=this.options,t=[];return _.isNumber(i.min)&&_.isNumber(i.max)?t=[i.min,i.max]:"category"!==i.type.toLocaleLowerCase()?(t=d3.extent(_.map(this._data,function(t){return t[i.key]})),_.isNumber(i.min)&&(t[0]=i.min),_.isNumber(i.max)&&(t[1]=i.max)):t=_.map(this._data,function(t){return t[i.key]}),t},getX:function(){return this.x},getAxisX:function(){return this.axisx},getMin:function(){return _.first(this.x.domain())},getMax:function(){return _.last(this.x.domain())},calGroupStep:function(i){var t=this.options,e=t.groupPadding;return this.groupX=Array.isArray(e)?d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],e[0]||.4,e[1]||0):d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],e||8),Array.isArray(i)||(i=this._createCategory(parseInt(i))),this.groupX.domain(i),this.groupX},getGroupStep:function(i){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(i),this.groupX.rangeBand())},_createCategory:function(i){for(var t=[],e=0;i>e;e++)t.push(""+e);return t},getGroupX:function(){return this.groupX||this.calGroupStep()},updateSeries:function(){var i=this.options;this["update"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)}}),module.exports=Axis;
+function Axis(i,t,e){this.reset(),this.options={key:"x",type:"defaults",orient:null,dy:0,padding:.3,groupPadding:null,min:0,max:null,tickSize:1,tickValues:null,tickFormat:null,nondecile:{key:"y",tickPadding:10},format:"%Y-%m-%d",label:null,labelInAxis:!0},this.x=null,this.axisx=null,this.init(i,t,e),this._valid()}var _=require("../util"),Com=require("./index"),d3=require("d3");Axis=Com.extend(Axis,{_valid:function(){var i=this.options,t=["defaults","category","time","nondecile"];-1===_.indexOf(t,i.type.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.type+" in types.",i.type=t[0],this.valid=!1),i.type=_.initialUpperCase(i.type);var e=["left","top","right","bottom"];-1===_.indexOf(e,i.orient.toLowerCase())&&(this.msg="axis arguments error. there is no "+i.orient+" in orients.",i.orient=e[0],this.valid=!1),i.orient=_.initialUpperCase(i.orient)},renderSeries:function(){var i=this.options;this["cal"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)},format:function(){var i=this.options;if("function"==typeof i.format){var t=this;this.axisx.tickFormat(function(e,n){return i.format.call(t._data[n],e,n)})}},_afterAxis:function(){var i=this.options;"function"==typeof i._afterAxis&&i._afterAxis.call(this)},renderLabel:function(){var i=this.options;if(i.label&&i.labelInAxis){var t=this.el.selectAll(".tick")[0];d3.select(t[t.length-1]).select("text").text(i.label)}},calLeft:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("left").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(n)},updateLeft:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated&&this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing),this.el.call(this.axisx)},calRight:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),n=this.axisx=d3.svg.axis().scale(e).orient("right").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr({"class":"axis",transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(n)},updateRight:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[i.innerHeight||t.innerHeight,0]),this._afterAxis(),t.withAnimated&&this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing),this.el.attr({transform:"translate("+(i.innerWidth||t.innerWidth)+", 0)"}).call(this.axisx)},calTop:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("top").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").call(n)},updateTop:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated&&this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing),this.el.call(this.axisx)},calBottom:function(){var i=this.options,t=this.alloptions,e=this.x=this["axis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),n=this.axisx=d3.svg.axis().scale(e).orient("bottom").tickPadding(i.dy).tickFormat(i.tickFormat);"object"==typeof i.tickSize?n.tickSize.apply(this,i.tickSize):n.tickSize(i.tickSize),i.tickValues&&n.tickValues(i.tickValues),i.ticks&&n.ticks.apply(this,i.ticks),this.format(),this._afterAxis();this.el=this.el.append("g").attr("class","axis").attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(n)},updateBottom:function(){var i=this.options,t=this.alloptions;this["updateAxis"+i.type].call(this,[0,i.innerWidth||t.innerWidth]),this._afterAxis(),t.withAnimated&&this.el.transition().duration(t.animatedTiming).ease(t.animatedEasing),this.el.attr("transform","translate(0,"+(i.innerHeight||t.innerHeight)+")").call(this.axisx)},axisDefaults:function(i){var t=this.x=d3.scale.linear().range(i),e=this.calExtent();return t.domain(e),t},updateAxisDefaults:function(i){return this.x.range(i),this.x.domain(this.calExtent()),this.x},axisCategory:function(i){var t,e=this.options;t=this.x=_.isArray(e.padding)?d3.scale.ordinal().rangeBands(i,e.padding[0],e.padding[1]):d3.scale.ordinal().rangeBands(i,e.padding/2,e.padding);var n=this.calExtent();return t.domain(n),t},updateAxisCategory:function(i){var t=this.options;return _.isArray(t.padding)?this.x.rangeBands(i,t.padding[0],t.padding[1]):this.x.rangeBands(i,t.padding/2,t.padding),this.x.domain(this.calExtent()),this.x},axisTime:function(i){var t,e=this.options,n=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"object"==typeof i[e.key]?i[e.key]:(console.log("date error: "+i[e.key]+"is not a Date"),e.min&&(t[0]=_.isDate(e.min)?e.min:new Date(e.min)),void(e.max&&(t[1]=_.isDate(e.max)?e.max:new Date(e.max))))})),n.domain(t),n},updateAxisTime:function(i){var t,e=this.options,n=this.x=d3.time.scale().range(i);return t=_.isDate(e.min)&&_.isDate(e.max)?[e.min,e.max]:e.min&&e.max?[new Date(e.min),new Date(e.max)]:d3.extent(_.map(this._data,function(i){return"string"==typeof i[e.key]?d3.time.format(e.format).parse(i[e.key]):"date"==typeof i[e.key]?i[e.key]:void console.log("date error: "+i[e.key]+"is not a Date")})),n.domain(t),n},axisNondecile:function(i){var t=this.options,e=this.x=d3.scale.linear().range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,t.key),a=this._data=[],s=0,r=a.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in n){var l={sum:_.sum(n[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,a.push(l)}return t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center"))},t.afterRender=function(){this.el.selectAll(".tick").data(this._data)},e},updateAxisNondecile:function(i){var t=this.options,e=this.x.range(i);t.max=_.sum(this._data,t.nondecile.key),e.domain(this.calExtent());var n=_.groupBy(this._data,t.key),a=this._data=[],s=0,r=a.length,o=(i[1]-i[0])/(e.domain()[1]-e.domain()[0]);for(var d in n){var l={sum:_.sum(n[d],t.nondecile.key),begin:s,end:0,center:0,radio:0};r--,l[t.key]=d,l.end=l.begin+l.sum,s+=l.sum,l.center=(l.begin+l.end)/2,t.nondecile.tickPadding&&0!==l.begin&&(l.begin=(e(l.begin)-t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),t.nondecile.tickPadding&&0!==r&&(l.end=(e(l.end)+t.nondecile.tickPadding/2-i[0])/o+e.domain()[0]),l.radio=(l.end-l.begin)/l.sum,a.push(l)}return e.domain(this.calExtent()),t._afterAxis=function(){this.axisx.tickValues(_.pluck(this._data,"center")),this.el&&this.el.selectAll(".tick").data(_.pluck(this._data,"center"))},e},calExtent:function(){var i=this.options,t=[];return _.isNumber(i.min)&&_.isNumber(i.max)?t=[i.min,i.max]:"category"!==i.type.toLocaleLowerCase()?(t=d3.extent(_.map(this._data,function(t){return t[i.key]})),_.isNumber(i.min)&&(t[0]=i.min),_.isNumber(i.max)&&(t[1]=i.max)):t=_.map(this._data,function(t){return t[i.key]}),t},getX:function(){return this.x},getAxisX:function(){return this.axisx},getMin:function(){return _.first(this.x.domain())},getMax:function(){return _.last(this.x.domain())},calGroupStep:function(i){var t=this.options,e=t.groupPadding;return this.groupX=Array.isArray(e)?d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],e[0]||.4,e[1]||0):d3.scale.ordinal().rangeBands([0,this.x.rangeBand()],e||8),Array.isArray(i)||(i=this._createCategory(parseInt(i))),this.groupX.domain(i),this.groupX},getGroupStep:function(i){return this.groupX?this.groupX.rangeBand():(this.calGroupStep(i),this.groupX.rangeBand())},_createCategory:function(i){for(var t=[],e=0;i>e;e++)t.push(""+e);return t},getGroupX:function(){return this.groupX||this.calGroupStep()},updateSeries:function(){var i=this.options;this["update"+i.orient](),this.renderLabel(),"function"==typeof i.afterRender&&i.afterRender.call(this)}}),module.exports=Axis;

package.json

 {
   "name": "dchart-core",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "",
@@ -5,0 +5,0 @@ "scripts": {

No alert changes

Improved metrics

Total package byte prevSize

81461

increased by0.12%

No dependency changes