projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3b68cf
)
Extend state by filter entries and overrides in a single shot.
author
Mike Taylor
<mike@indexdata.com>
Fri, 8 May 2015 20:07:37 +0000
(21:07 +0100)
committer
Mike Taylor
<mike@indexdata.com>
Fri, 8 May 2015 20:07:37 +0000
(21:07 +0100)
src/mkws-team.js
patch
|
blob
|
history
diff --git
a/src/mkws-team.js
b/src/mkws-team.js
index
90f9d4f
..
6f5d7b5
100644
(file)
--- a/
src/mkws-team.js
+++ b/
src/mkws-team.js
@@
-80,8
+80,7
@@
mkws.makeTeam = function($, teamName) {
var state = $.extend(true, {}, m_state);
var tmp = state.filters;
delete state.filters;
- $.extend(state, tmp.fragmentItems());
- $.extend(state, overrides ? overrides : {});
+ $.extend(state, tmp.fragmentItems(), overrides ? overrides : {});
for (var key in state) {
if (state.hasOwnProperty(key) &&