projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Part of ACREP-30.
[mkws-moved-to-github.git]
/
src
/
mkws-team.js
diff --git
a/src/mkws-team.js
b/src/mkws-team.js
index
e5cb746
..
17f0f1f
100644
(file)
--- a/
src/mkws-team.js
+++ b/
src/mkws-team.js
@@
-77,8
+77,7
@@
mkws.makeTeam = function($, teamName) {
var s;
// Expand the filterSet into a set of key=value properties
var s;
// Expand the filterSet into a set of key=value properties
- var state = $.extend(true, {}, m_state);
- $.extend(state, overrides ? overrides : {});
+ var state = $.extend(true, {}, m_state, overrides ? overrides : {});
var tmp = state.filters;
delete state.filters;
$.extend(state, tmp.fragmentItems());
var tmp = state.filters;
delete state.filters;
$.extend(state, tmp.fragmentItems());
@@
-135,6
+134,11
@@
mkws.makeTeam = function($, teamName) {
if (that.submitted()) {
that.reShow();
}
if (that.submitted()) {
that.reShow();
}
+ } else if (key.indexOf('xt-') == 0) {
+ that.limitTarget(key.substring(3), val);
+ } else if (key.indexOf('xf-') == 0) {
+ var a = key.split('-');
+ that.limitQuery(a[1], a[2]);
}
}
}
}
}
}