diff --git a/chrome/iso.js b/chrome/iso.js index e8dd4f3..dd162d4 100644 --- a/chrome/iso.js +++ b/chrome/iso.js @@ -152,12 +152,11 @@ Iso = (function() { }; Iso.prototype.loadStats = function() { - var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakEnd, tempStreakStart; + var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakStart; streakLongest = 0; streakCurrent = 0; tempStreak = 0; tempStreakStart = null; - tempStreakEnd = null; longestStreakStart = null; longestStreakEnd = null; currentStreakStart = null; @@ -166,7 +165,7 @@ Iso = (function() { contribColumns = $('.contrib-column'); days = $('.js-calendar-graph rect.day'); days.each(function(d) { - var currentDayCount; + var currentDayCount, tempStreakEnd; currentDayCount = ($(this)).data('count'); yearTotal += currentDayCount; if (d === 0) { @@ -182,18 +181,14 @@ Iso = (function() { if (currentDayCount > 0) { if (tempStreak === 0) { tempStreakStart = ($(this)).data('date'); - tempStreakEnd = ($(this)).data('date'); } tempStreak++; - if (tempStreak >= streakLongest) { - return tempStreakEnd = ($(this)).data('date'); - } - } else { if (tempStreak >= streakLongest) { longestStreakStart = tempStreakStart; - longestStreakEnd = tempStreakEnd; - streakLongest = tempStreak; + longestStreakEnd = ($(this)).data('date'); + return streakLongest = tempStreak; } + } else { tempStreak = 0; tempStreakStart = null; return tempStreakEnd = null; diff --git a/chrome/manifest.json b/chrome/manifest.json index c4cab88..02da594 100644 --- a/chrome/manifest.json +++ b/chrome/manifest.json @@ -1,6 +1,6 @@ { "name": "Isometric Contributions", - "version": "1.0.12", + "version": "1.0.13", "description": "Renders an isometric pixel view of GitHub contribution graphs.", "content_scripts": [ { "css": [ "iso.css" ], diff --git a/firefox/isometric-contributions.xpi b/firefox/isometric-contributions.xpi index 815ac09..edb6536 100644 Binary files a/firefox/isometric-contributions.xpi and b/firefox/isometric-contributions.xpi differ diff --git a/firefox/isometric-contributions/iso.js b/firefox/isometric-contributions/iso.js index e8dd4f3..dd162d4 100644 --- a/firefox/isometric-contributions/iso.js +++ b/firefox/isometric-contributions/iso.js @@ -152,12 +152,11 @@ Iso = (function() { }; Iso.prototype.loadStats = function() { - var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakEnd, tempStreakStart; + var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakStart; streakLongest = 0; streakCurrent = 0; tempStreak = 0; tempStreakStart = null; - tempStreakEnd = null; longestStreakStart = null; longestStreakEnd = null; currentStreakStart = null; @@ -166,7 +165,7 @@ Iso = (function() { contribColumns = $('.contrib-column'); days = $('.js-calendar-graph rect.day'); days.each(function(d) { - var currentDayCount; + var currentDayCount, tempStreakEnd; currentDayCount = ($(this)).data('count'); yearTotal += currentDayCount; if (d === 0) { @@ -182,18 +181,14 @@ Iso = (function() { if (currentDayCount > 0) { if (tempStreak === 0) { tempStreakStart = ($(this)).data('date'); - tempStreakEnd = ($(this)).data('date'); } tempStreak++; - if (tempStreak >= streakLongest) { - return tempStreakEnd = ($(this)).data('date'); - } - } else { if (tempStreak >= streakLongest) { longestStreakStart = tempStreakStart; - longestStreakEnd = tempStreakEnd; - streakLongest = tempStreak; + longestStreakEnd = ($(this)).data('date'); + return streakLongest = tempStreak; } + } else { tempStreak = 0; tempStreakStart = null; return tempStreakEnd = null; diff --git a/firefox/isometric-contributions/manifest.json b/firefox/isometric-contributions/manifest.json index 7fa5cec..df41d91 100644 --- a/firefox/isometric-contributions/manifest.json +++ b/firefox/isometric-contributions/manifest.json @@ -1,6 +1,6 @@ { "name": "Isometric Contributions", - "version": "1.0.12", + "version": "1.0.13", "description": "Renders an isometric pixel view of GitHub contribution graphs.", "content_scripts": [ { "css": [ "iso.css" ], diff --git a/safari/isometric-contributions.safariextension/Info.plist b/safari/isometric-contributions.safariextension/Info.plist index 54b62b6..50fa641 100644 --- a/safari/isometric-contributions.safariextension/Info.plist +++ b/safari/isometric-contributions.safariextension/Info.plist @@ -13,9 +13,9 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleShortVersionString - 1.0.12 + 1.0.13 CFBundleVersion - 1.0.12 + 1.0.13 Chrome Database Quota diff --git a/safari/isometric-contributions.safariextension/iso.js b/safari/isometric-contributions.safariextension/iso.js index e8dd4f3..dd162d4 100644 --- a/safari/isometric-contributions.safariextension/iso.js +++ b/safari/isometric-contributions.safariextension/iso.js @@ -152,12 +152,11 @@ Iso = (function() { }; Iso.prototype.loadStats = function() { - var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakEnd, tempStreakStart; + var contribColumns, countTotal, currentDayCount, currentStreakEnd, currentStreakStart, d, dateBest, dateFirst, dateLast, datesCurrent, datesLongest, datesTotal, days, i, j, len, longestStreakEnd, longestStreakStart, streakCurrent, streakLongest, tempStreak, tempStreakStart; streakLongest = 0; streakCurrent = 0; tempStreak = 0; tempStreakStart = null; - tempStreakEnd = null; longestStreakStart = null; longestStreakEnd = null; currentStreakStart = null; @@ -166,7 +165,7 @@ Iso = (function() { contribColumns = $('.contrib-column'); days = $('.js-calendar-graph rect.day'); days.each(function(d) { - var currentDayCount; + var currentDayCount, tempStreakEnd; currentDayCount = ($(this)).data('count'); yearTotal += currentDayCount; if (d === 0) { @@ -182,18 +181,14 @@ Iso = (function() { if (currentDayCount > 0) { if (tempStreak === 0) { tempStreakStart = ($(this)).data('date'); - tempStreakEnd = ($(this)).data('date'); } tempStreak++; - if (tempStreak >= streakLongest) { - return tempStreakEnd = ($(this)).data('date'); - } - } else { if (tempStreak >= streakLongest) { longestStreakStart = tempStreakStart; - longestStreakEnd = tempStreakEnd; - streakLongest = tempStreak; + longestStreakEnd = ($(this)).data('date'); + return streakLongest = tempStreak; } + } else { tempStreak = 0; tempStreakStart = null; return tempStreakEnd = null; diff --git a/src/iso.coffee b/src/iso.coffee index 05b479a..d437c72 100644 --- a/src/iso.coffee +++ b/src/iso.coffee @@ -22,7 +22,7 @@ class Iso if graphContainer observer = new MutationObserver (mutations) => isGraphAdded = mutations.find (mutation) -> - [].find.call mutation.addedNodes, (node) -> + [].find.call mutation.addedNodes, (node) -> node.className == "js-contribution-graph" if isGraphAdded this.generateIsometricChart() @@ -129,7 +129,6 @@ class Iso streakCurrent = 0 tempStreak = 0 tempStreakStart = null - tempStreakEnd = null longestStreakStart = null longestStreakEnd = null currentStreakStart = null @@ -155,19 +154,15 @@ class Iso if currentDayCount > 0 if tempStreak == 0 tempStreakStart = ($ this).data('date') - tempStreakEnd = ($ this).data('date') tempStreak++ - if tempStreak >= streakLongest - tempStreakEnd = ($ this).data('date') - - else if tempStreak >= streakLongest longestStreakStart = tempStreakStart - longestStreakEnd = tempStreakEnd + longestStreakEnd = ($ this).data('date') streakLongest = tempStreak + else tempStreak = 0 tempStreakStart = null tempStreakEnd = null