Addon to #87: After merging, update the version.

cburschka · cburschka · commit b81e5b7c3404 · 2014-03-26T01:13:52.000+01:00
Once the settings have been merged, they're considered updated.
The version string should reflect this so we don't need to do this
more than once.
diff --git a/js/core/init.js b/js/core/init.js
@@ -25,6 +25,8 @@ init = {
     if (cookie) {
       if (cookie.version == config.version) config.settings = cookie;
       else config.settings = objMerge(config.settings, cookie);
+      // After merging, update the version.
+      config.settings.version = config.defaultSettings.version;
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ init = {`
`25`	`25`	`if (cookie) {`
`26`	`26`	`if (cookie.version == config.version) config.settings = cookie;`
`27`	`27`	`else config.settings = objMerge(config.settings, cookie);`
	`28`	`+ // After merging, update the version.`
	`29`	`+ config.settings.version = config.defaultSettings.version;`
`28`	`30`	`}`
`29`	`31`	`},`
`30`	`32`