Skip to content

Commit

Permalink
Code cleaning and improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
wa0x6e committed Oct 10, 2013
1 parent d550852 commit cb785bc
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions src/cal-heatmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -656,14 +656,14 @@ var CalHeatMap = function() {
if (self.options.nextSelector !== false) {
d3.select(self.options.nextSelector).on("click." + self.options.itemNamespace, function() {
d3.event.preventDefault();
return self.loadNextDomain();
return self.loadNextDomain(1);
});
}

if (self.options.previousSelector !== false) {
d3.select(self.options.previousSelector).on("click." + self.options.itemNamespace, function() {
d3.event.preventDefault();
return self.loadPreviousDomain();
return self.loadPreviousDomain(1);
});
}

Expand All @@ -676,9 +676,10 @@ var CalHeatMap = function() {
self.afterLoad();
}

var domains = self.getDomainKeys();

// Fill the graph with some datas
if (self.options.loadOnInit) {
var domains = self.getDomainKeys();
self.getDatas(
self.options.data,
new Date(domains[0]),
Expand All @@ -691,6 +692,15 @@ var CalHeatMap = function() {
} else {
self.onComplete();
}

// Check for calendar limits
if (self.minDomainIsReached(domains[0])) {
self.onMinDomainReached(true);
}

if (self.maxDomainIsReached(self.getNextDomain().getTime())) {
self.onMaxDomainReached(true);
}
}

return true;
Expand Down Expand Up @@ -1455,10 +1465,6 @@ CalHeatMap.prototype = {
return false;
}

if (arguments.length === 0) {
n = 1;
}

var newDomains = this.getDomain(this.getNextDomain(), n);

var parent = this;
Expand Down Expand Up @@ -1499,15 +1505,15 @@ CalHeatMap.prototype = {

this.afterLoadNextDomain(newDomains[newDomains.length-1]);

if (this.maxDomainIsReached(this.getNextDomain().getTime())) {
this.onMaxDomainReached(true);
}

// Try to "disengage" the min domain reached setting
if (this._minDomainReached && !this.minDomainIsReached(domains[1])) {
this.onMinDomainReached(false);
}

if (this.maxDomainIsReached(this.getNextDomain().getTime())) {
this.onMaxDomainReached(true);
}

return true;
},

Expand All @@ -1524,10 +1530,6 @@ CalHeatMap.prototype = {
return false;
}

if (arguments.length === 0) {
n = 1;
}

var domains = this.getDomainKeys();
var newDomains = this.getDomain(domains[0], -n).reverse();

Expand Down

0 comments on commit cb785bc

Please sign in to comment.