Use mkws.getParameterByName

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

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 429aa97..3a24b0e 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -266,31 +266,28 @@ mkws.registerWidgetType('Records', function() {
        }
     });
 
-    var node = $(that.node);
-    var query = node.attr('autosearch');
+    var query = that.config.autosearch;
     if (query) {
-       this.team.queue("ready").subscribe(function() {
-           if (query.match(/^!param!/)) {
-               var param = query.replace(/^!param!/, '');
-               query = getParameterByName(param);
-               that.log("obtained query '" + query + "' from param '" + param + "'");
-               if (!query) {
-                   alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
-               }
-           } else if (query.match(/^!path!/)) {
-               var index = query.replace(/^!path!/, '');
-               var path = window.location.pathname.split('/');
-               query = path[path.length - index];
-               that.log("obtained query '" + query + "' from path-component '" + index + "'");
-               if (!query) {
-                   alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
-               }
+       if (query.match(/^!param!/)) {
+           var param = query.replace(/^!param!/, '');
+           query = mkws.getParameterByName(param);
+           that.log("obtained query '" + query + "' from param '" + param + "'");
+           if (!query) {
+               alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
            }
+       } else if (query.match(/^!path!/)) {
+           var index = query.replace(/^!path!/, '');
+           var path = window.location.pathname.split('/');
+           query = path[path.length - index];
+           that.log("obtained query '" + query + "' from path-component '" + index + "'");
+           if (!query) {
+               alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
+           }
+       }
 
-           that.log("node=" + node + ", class='" + node.className + "', query=" + query);
-
-           var sortOrder = node.attr('sort');
-           var targets = node.attr('targets');
+       this.team.queue("ready").subscribe(function() {
+           var sortOrder = that.config.sort;
+           var targets = that.config.targets;
            var s = "running auto search: '" + query + "'";
            if (sortOrder) s += " sorted by '" + sortOrder + "'";
            if (targets) s += " in targets '" + targets + "'";