From 0a8dda7361d33dc0b5c1267c4870c665f9e0993f Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Tue, 1 Apr 2014 13:01:58 +0100 Subject: [PATCH] Move much of the "ready" callback code outside. It's static analysis of the auto-search query. --- src/mkws-widgets.js | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js index 429aa97..39e0816 100644 --- a/src/mkws-widgets.js +++ b/src/mkws-widgets.js @@ -269,26 +269,25 @@ mkws.registerWidgetType('Records', function() { var node = $(that.node); var query = node.attr('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 = 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); - that.log("node=" + node + ", class='" + node.className + "', query=" + query); - + this.team.queue("ready").subscribe(function() { var sortOrder = node.attr('sort'); var targets = node.attr('targets'); var s = "running auto search: '" + query + "'"; -- 1.7.10.4