move silent flag out of payload (vuejs#278)

ktsn · yyx990803 · commit faac7ca82777 · 2016-08-15T08:52:17.000-05:00
diff --git a/src/index.js b/src/index.js
@@ -30,8 +30,8 @@ class Store {
     this.dispatch = function boundDispatch (type, payload) {
       return dispatch.call(store, type, payload)
     }
-    this.commit = function boundCommit (type, payload) {
-      return commit.call(store, type, payload)
+    this.commit = function boundCommit (type, payload, options) {
+      return commit.call(store, type, payload, options)
     }
 
     // strict mode
@@ -58,10 +58,11 @@ class Store {
     assert(false, `Use store.replaceState() to explicit replace store state.`)
   }
 
-  commit (type, payload) {
+  commit (type, payload, options) {
     // check object-style commit
     let mutation
     if (isObject(type) && type.type) {
+      options = payload
       payload = mutation = type
       type = type.type
     } else {
@@ -77,7 +78,7 @@ class Store {
         handler(payload)
       })
     })
-    if (!payload || !payload.silent) {
+    if (!options || !options.silent) {
       this._subscribers.forEach(sub => sub(mutation, this.state))
     }
   }
diff --git a/test/unit/test.js b/test/unit/test.js
@@ -623,10 +623,12 @@ describe('Vuex', () => {
       type: TEST,
       n: 2
     })
+    store.commit(TEST, { n: 3 }, { silent: true })
     store.commit({
       type: TEST,
-      silent: true,
-      n: 3
+      n: 4
+    }, {
+      silent: true
     })
     expect(mutations.length).toBe(2)
     expect(mutations[0].type).toBe(TEST)

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ class Store {`
`30`	`30`	`this.dispatch = function boundDispatch (type, payload) {`
`31`	`31`	`return dispatch.call(store, type, payload)`
`32`	`32`	`}`
`33`		`- this.commit = function boundCommit (type, payload) {`
`34`		`- return commit.call(store, type, payload)`
	`33`	`+ this.commit = function boundCommit (type, payload, options) {`
	`34`	`+ return commit.call(store, type, payload, options)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// strict mode`
`@@ -58,10 +58,11 @@ class Store {`
`58`	`58`	assert(false, `Use store.replaceState() to explicit replace store state.`)
`59`	`59`	`}`
`60`	`60`
`61`		`- commit (type, payload) {`
	`61`	`+ commit (type, payload, options) {`
`62`	`62`	`// check object-style commit`
`63`	`63`	`let mutation`
`64`	`64`	`if (isObject(type) && type.type) {`
	`65`	`+ options = payload`
`65`	`66`	`payload = mutation = type`
`66`	`67`	`type = type.type`
`67`	`68`	`} else {`
`@@ -77,7 +78,7 @@ class Store {`
`77`	`78`	`handler(payload)`
`78`	`79`	`})`
`79`	`80`	`})`
`80`		`- if (!payload \|\| !payload.silent) {`
	`81`	`+ if (!options \|\| !options.silent) {`
`81`	`82`	`this._subscribers.forEach(sub => sub(mutation, this.state))`
`82`	`83`	`}`
`83`	`84`	`}`