Merge pull request #77 from jasonlong/save-normal-chart-state

Save normal chart state
jasonlong · Mar 15, 2017 · 999a3d8 · 999a3d8
2 parents 955d7a0 + 481a99c
commit 999a3d8
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 26 deletions.
diff --git a/chrome/iso.js b/chrome/iso.js
diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Isometric Contributions",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "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
diff --git a/firefox/isometric-contributions/iso.js b/firefox/isometric-contributions/iso.js
diff --git a/firefox/isometric-contributions/manifest.json b/firefox/isometric-contributions/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Isometric Contributions",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "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
@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.17</string>
+	<string>1.0.18</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.17</string>
+	<string>1.0.18</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>

diff --git a/safari/isometric-contributions.safariextension/iso.js b/safari/isometric-contributions.safariextension/iso.js
diff --git a/src/iso.coffee b/src/iso.coffee
@@ -37,11 +37,13 @@ class Iso
     # The storage API is not supported in content scripts.
     # https://developer.mozilla.org/Add-ons/WebExtensions/Chrome_incompatibilities#storage
     if chrome?.storage?
-      chrome.storage.local.get ['toggleSetting'], ({toggleSetting}) =>
+      chrome.storage.local.get ['toggleSetting', 'show2DSetting'], ({toggleSetting, show2DSetting}) =>
         this.toggleSetting = toggleSetting ? 'cubes'
+        this.show2DSetting = show2DSetting ? 'no'
         callback()
     else
       this.toggleSetting = localStorage.toggleSetting ? 'cubes'
+      this.show2DSetting = localStorage.show2DSetting ? 'no'
       callback()
 
   persistSetting: (key, value, callback = ->) ->
@@ -120,9 +122,21 @@ class Iso
       if contributionsBox.hasClass 'show-2d'
         ($ this).text 'Show normal chart ▾'
         contributionsBox.removeClass 'show-2d'
+        self.persistSetting "show2DSetting", 'no'
+        self.show2DSetting = 'no'
       else
         ($ this).text 'Hide normal chart ▴'
         contributionsBox.addClass 'show-2d'
+        self.persistSetting "show2DSetting", 'yes'
+        self.show2DSetting = 'yes'
+
+    # Apply user preference
+    if (this.show2DSetting == "yes")
+      contributionsBox.addClass 'show-2d'
+      ($ '.ic-2d-toggle').text 'Hide normal chart ▴'
+    else
+      contributionsBox.removeClass 'show-2d'
+      ($ '.ic-2d-toggle').text 'Show normal chart ▾'
 
   loadStats: ->
     streakLongest      = 0