X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=7a98ed8b8dfd326abc18443b5ae912a31627f0ba;hb=b347eef13c87c5cdeb57a504fb3a927a2388310d;hp=0af84a93d94935e69a0a7bfd2f9b1aa310f242b4;hpb=82b78674032447e08477c34258c999fea92cbadc;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 0af84a9..7a98ed8 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -78,6 +78,9 @@ var mkws = {
   }
 };
 
+// We may be using a separate copy
+if (!mkws_jQuery) mkws_jQuery = jQuery;
+mkws.$ = mkws_jQuery;
 
 mkws.log = function(string) {
   if (!mkws.log_level)
@@ -111,10 +114,11 @@ mkws.M = function(word) {
 
 // This function is taken from a StackOverflow answer
 // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
-mkws.getParameterByName = function(name) {
+mkws.getParameterByName = function(name, url) {
+  if (!url) url = location.search;
   name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
   var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-  results = regex.exec(location.search);
+  results = regex.exec(url);
   return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
 
@@ -258,11 +262,18 @@ mkws.defaultTemplate = function(name) {
         <br/>\
       </a>\
 ';
+  } else if (name === 'Facet') {
+    return '\
+<a href="#"\
+{{#if fn}}\
+onclick="mkws.{{fn}}(\'{{team}}\', \'{{field}}\', \'{{term}}\');return false;"\
+{{/if}}\
+>{{term}}</a>\
+<span>{{count}}</span>\
+';
   }
 
-  var s = "There is no default '" + name +"' template!";
-  alert(s);
-  return s;
+  return null;
 };
 
 
@@ -573,4 +584,4 @@ mkws.pagerNext = function(tname) {
     var widgetSelector = selectorForAllWidgets();
     if (widgetSelector && $(widgetSelector).length !== 0) init();
   });
-})(jQuery);
+})(mkws_jQuery);