Merge branch 'master' into urlstate

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index bae55cf..cfbe165 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -67,14 +67,25 @@ mkws.makeTeam = function($, teamName) {
 
   m_state.sort = config.sort_default;
   m_state.size = config.perpage_default;
+
   var m_default = $.extend(true, {}, m_state);
+  var tmp = m_default.filters;
+  delete m_default.filters;
+  $.extend(m_default, tmp.fragmentItems());
 
-  that.urlFragment = function () {
+  that.urlFragment = function(overrides) {
     var s;
 
-    for (var key in m_state) {
-      if (m_state.hasOwnProperty(key) &&
-          m_state[key] != m_default[key]) {
+    that.warn("making urlFragment with overrides " + mkws.$.toJSON(overrides));
+    // Expand the filterSet into a set of key=value properties 
+    var state = $.extend(true, {}, m_state, overrides ? overrides : {});
+    var tmp = state.filters;
+    delete state.filters;
+    $.extend(state, tmp.fragmentItems());
+
+    for (var key in state) {
+      if (state.hasOwnProperty(key) &&
+          state[key] != m_default[key]) {
         if (!s) {
           var s = 'mkws';
           if (m_teamName !== 'AUTO') s += m_teamName;
@@ -83,7 +94,8 @@ mkws.makeTeam = function($, teamName) {
           s += "@";
         }
 
-        s += key + '=' + m_state[key];
+        // ### how do we need to quote this?
+        s += key + '=' + state[key];
       }
     }
 
@@ -288,6 +300,7 @@ mkws.makeTeam = function($, teamName) {
   that.showPage = function(pageNum) {
     m_state.page = pageNum;
     m_paz.showPage(m_state.page - 1);
+    that.warn("fragment: " + that.urlFragment());
   };
 
 
@@ -295,13 +308,16 @@ mkws.makeTeam = function($, teamName) {
     if (m_totalRecordCount - m_state.size * m_state.page > 0) {
       m_paz.showNext();
       m_state.page++;
+      that.warn("fragment: " + that.urlFragment());
     }
   };
 
 
   that.pagerPrev = function() {
-    if (m_paz.showPrev() != false)
+    if (m_paz.showPrev() != false) {
       m_state.page--;
+      that.warn("fragment: " + that.urlFragment());
+    }
   };
 
 
@@ -376,6 +392,7 @@ mkws.makeTeam = function($, teamName) {
   that.fetchDetails = function(recId) {
     that.info("fetchDetails() requesting record '" + recId + "'");
     m_paz.record(recId);
+    that.warn("fragment: " + that.urlFragment());
   };