Breaking change - geb no longer available on server, and made deep me…

…rging the default update behaviour (leaving option to turn off)
lorengreenfield · Jul 17, 2017 · 2853d5d · 2853d5d
1 parent 6ba6067
commit 2853d5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -189,7 +189,7 @@ geb.on('fieldUpdate', newValue => {
             value: newValue
         }
     }, {
-        deepMerge: true
+        deepMerge: false//deep merging on by default, set to false o overwrite whole objects without merging
     })
 });
 

diff --git a/dist/halfcab.js b/dist/halfcab.js
@@ -132,10 +132,10 @@ function setMaxStates(num){
 
 function updateState(updateObject, options){
 
-    if(options && options.deepMerge){
-        states.push(Object.assign({}, merge(getLatestState(), updateObject)));
-    }else{
+    if(options && options.deepMerge === false){
         states.push(Object.assign({}, getLatestState(), updateObject));
+    }else{
+        states.push(Object.assign({}, merge(getLatestState(), updateObject)));
     }
     if(states.length > maxStates){
         states.shift();

diff --git a/halfcab.js b/halfcab.js
@@ -75,10 +75,10 @@ function setMaxStates(num){
 
 function updateState(updateObject, options){
 
-    if(options && options.deepMerge){
-        states.push(Object.assign({}, merge(getLatestState(), updateObject)));
-    }else{
+    if(options && options.deepMerge === false){
         states.push(Object.assign({}, getLatestState(), updateObject));
+    }else{
+        states.push(Object.assign({}, merge(getLatestState(), updateObject)));
     }
     if(states.length > maxStates){
         states.shift();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halfcab",
-  "version": "1.9.1",
+  "version": "2.0.0",
   "description": "A simple universal JavaScript framework focused on making use of es2015 template strings to build components.",
   "main": "dist/halfcab.js",
   "module": "halfcab.js",