change handling of user-set flags

nmggithub · web-flow · commit 9fa2c8a9967d · 2019-05-29T15:54:15.000-04:00
Originally, would only allow user-set flags that disable a flag enabled by default. Now it will also allow user-set flags that enable a flag that is disabled by default.
diff --git a/lib/ConnectionConfig.js b/lib/ConnectionConfig.js
@@ -66,7 +66,7 @@ ConnectionConfig.mergeFlags = function mergeFlags(defaultFlags, userFlags) {
 
   // Merge the new flags
   for (var flag in newFlags) {
-    if (allFlags[flag] !== false) {
+    if (allFlags[flag] !== newFlags[flag]) {
       allFlags[flag] = newFlags[flag];
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ ConnectionConfig.mergeFlags = function mergeFlags(defaultFlags, userFlags) {`
`66`	`66`
`67`	`67`	`// Merge the new flags`
`68`	`68`	`for (var flag in newFlags) {`
`69`		`- if (allFlags[flag] !== false) {`
	`69`	`+ if (allFlags[flag] !== newFlags[flag]) {`
`70`	`70`	`allFlags[flag] = newFlags[flag];`
`71`	`71`	`}`
`72`	`72`	`}`