X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmkws-team.js;h=4d63ca2a6140b331be8a94a335fd40a91fb74bf4;hb=48487fa80ac19ef47fb767c0f72b6553c4a9668d;hp=d2318d3e01cfcad18e66e6ba0412225ea7896c18;hpb=e15c02069c87a13752f9029cca644e759a42623a;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index d2318d3..4d63ca2 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -1,3 +1,4 @@ +"use strict"; // Factory function for team objects. As much as possible, this uses // only member variables (prefixed "m_") and inner functions with // private scope. @@ -17,12 +18,14 @@ mkws.makeTeam = function($, teamName) { // Member variables are separated into two categories // 1. Persistent state (to be coded in URL fragment) - var m_query; // initially undefined - var m_sortOrder; // will be set below - var m_perpage; // will be set below - var m_filterSet = filterSet(that); - var m_currentPage = 1; - var m_currentRecordId = ''; + var m_state = { + query: null, // initially undefined + sort: null, // will be set below + size: null, // will be set below + page: 1, + recid: '', + filters: filterSet(that) + } // 2. Internal state (not to be coded) var m_teamName = teamName; @@ -48,19 +51,19 @@ mkws.makeTeam = function($, teamName) { // Accessor methods for individual widgets: readers that.name = function() { return m_teamName; }; that.submitted = function() { return m_submitted; }; - that.sortOrder = function() { return m_sortOrder; }; - that.perpage = function() { return m_perpage; }; - that.query = function() { return m_query; }; + that.sortOrder = function() { return m_state.sort; }; + that.perpage = function() { return m_state.size; }; + that.query = function() { return m_state.query; }; that.totalRecordCount = function() { return m_totalRecordCount; }; - that.currentPage = function() { return m_currentPage; }; - that.currentRecordId = function() { return m_currentRecordId; }; + that.currentPage = function() { return m_state.page; }; + that.currentRecordId = function() { return m_state.recid; }; that.currentRecordData = function() { return m_currentRecordData; }; - that.filters = function() { return m_filterSet; }; + that.filters = function() { return m_state.filters; }; that.gotRecords = function() { return m_gotRecords; }; // Accessor methods for individual widgets: writers - that.set_sortOrder = function(val) { m_sortOrder = val }; - that.set_perpage = function(val) { m_perpage = val }; + that.set_sortOrder = function(val) { m_state.sort = val }; + that.set_perpage = function(val) { m_state.size = val }; // The following PubSub code is modified from the jQuery manual: @@ -103,8 +106,8 @@ mkws.makeTeam = function($, teamName) { that.info("making new widget team"); - m_sortOrder = config.sort_default; - m_perpage = config.perpage_default; + m_state.sort = config.sort_default; + m_state.size = config.perpage_default; // pz2.js event handlers: function onInit() { @@ -213,22 +216,22 @@ mkws.makeTeam = function($, teamName) { that.targetFiltered = function(id) { - return m_filterSet.targetFiltered(id); + return m_state.filters.targetFiltered(id); }; that.limitTarget = function(id, name) { that.info("limitTarget(id=" + id + ", name=" + name + ")"); - m_filterSet.add(targetFilter(id, name)); - if (m_query) triggerSearch(); + m_state.filters.add(targetFilter(id, name)); + if (m_state.query) triggerSearch(); return false; }; that.limitQuery = function(field, value) { that.info("limitQuery(field=" + field + ", value=" + value + ")"); - m_filterSet.add(fieldFilter(field, value)); - if (m_query) triggerSearch(); + m_state.filters.add(fieldFilter(field, value)); + if (m_state.query) triggerSearch(); return false; }; @@ -236,58 +239,58 @@ mkws.makeTeam = function($, teamName) { that.limitCategory = function(id) { that.info("limitCategory(id=" + id + ")"); // Only one category filter at a time - m_filterSet.removeMatching(function(f) { return f.type === 'category' }); - if (id !== '') m_filterSet.add(categoryFilter(id)); - if (m_query) triggerSearch(); + m_state.filters.removeMatching(function(f) { return f.type === 'category' }); + if (id !== '') m_state.filters.add(categoryFilter(id)); + if (m_state.query) triggerSearch(); return false; }; that.delimitTarget = function(id) { that.info("delimitTarget(id=" + id + ")"); - m_filterSet.removeMatching(function(f) { return f.type === 'target' }); - if (m_query) triggerSearch(); + m_state.filters.removeMatching(function(f) { return f.type === 'target' }); + if (m_state.query) triggerSearch(); return false; }; that.delimitQuery = function(field, value) { that.info("delimitQuery(field=" + field + ", value=" + value + ")"); - m_filterSet.removeMatching(function(f) { return f.type == 'field' && + m_state.filters.removeMatching(function(f) { return f.type == 'field' && field == f.field && value == f.value }); - if (m_query) triggerSearch(); + if (m_state.query) triggerSearch(); return false; }; that.showPage = function(pageNum) { - m_currentPage = pageNum; - m_paz.showPage(m_currentPage - 1); + m_state.page = pageNum; + m_paz.showPage(m_state.page - 1); }; that.pagerNext = function() { - if (m_totalRecordCount - m_perpage*m_currentPage > 0) { + if (m_totalRecordCount - m_state.size * m_state.page > 0) { m_paz.showNext(); - m_currentPage++; + m_state.page++; } }; that.pagerPrev = function() { if (m_paz.showPrev() != false) - m_currentPage--; + m_state.page--; }; that.reShow = function() { resetPage(); - m_paz.show(0, m_perpage, m_sortOrder); + m_paz.show(0, m_state.size, m_state.sort); }; function resetPage() { - m_currentPage = 1; + m_state.page = 1; m_totalRecordCount = 0; m_gotRecords = false; } @@ -302,7 +305,7 @@ mkws.makeTeam = function($, teamName) { return; } - m_filterSet.removeMatching(function(f) { return f.type !== 'category' }); + m_state.filters.removeMatching(function(f) { return f.type !== 'category' }); triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery); switchView('records'); // In case it's configured to start off as hidden m_submitted = true; @@ -314,14 +317,14 @@ mkws.makeTeam = function($, teamName) { resetPage(); // Continue to use previous query/sort-order unless new ones are specified - if (query) m_query = query; - if (sortOrder) m_sortOrder = sortOrder; - if (perpage) m_perpage = perpage; - if (targets) m_filterSet.add(targetFilter(targets, targets)); - - var pp2filter = m_filterSet.pp2filter(); - var pp2limit = m_filterSet.pp2limit(limit); - var pp2catLimit = m_filterSet.pp2catLimit(); + if (query) m_state.query = query; + if (sortOrder) m_state.sort = sortOrder; + if (perpage) m_state.size = perpage; + if (targets) m_state.filters.add(targetFilter(targets, targets)); + + var pp2filter = m_state.filters.pp2filter(); + var pp2limit = m_state.filters.pp2limit(limit); + var pp2catLimit = m_state.filters.pp2catLimit(); if (pp2catLimit) { pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit; } @@ -335,10 +338,10 @@ mkws.makeTeam = function($, teamName) { params.torusquery = torusquery; } - that.info("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " + + that.info("triggerSearch(" + m_state.query + "): filters = " + m_state.filters.toJSON() + ", " + "pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); - m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params); + m_paz.search(m_state.query, m_state.size, m_state.sort, pp2filter, undefined, params); queue("searchtriggered").publish(); } @@ -378,15 +381,15 @@ mkws.makeTeam = function($, teamName) { // detailed record drawing that.showDetails = function(recId) { - var oldRecordId = m_currentRecordId; - m_currentRecordId = recId; + var oldRecordId = m_state.recid; + m_state.recid = recId; // remove current detailed view if any findnode('#' + recordDetailsId(oldRecordId)).remove(); // if the same clicked, just hide if (recId == oldRecordId) { - m_currentRecordId = ''; + m_state.recid = ''; m_currentRecordData = null; return; }