From d239fb9425b458b7d8f7a72029e7677801dbbe3b Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 28 May 2014 15:51:41 +0100 Subject: [PATCH] Rename variables in autosearch method. --- src/mkws-widget.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mkws-widget.js b/src/mkws-widget.js index 705af74..33c977f 100644 --- a/src/mkws-widget.js +++ b/src/mkws-widget.js @@ -68,13 +68,13 @@ function widget($, team, type, node) { // Utility function for use by all widgets that can invoke autosearch. that.autosearch = function() { - var widget = this; - var query = widget.config.autosearch; + var that = this; + var query = this.config.autosearch; if (query) { if (query.match(/^!param!/)) { var param = query.replace(/^!param!/, ''); query = mkws.getParameterByName(param); - widget.log("obtained query '" + query + "' from param '" + param + "'"); + this.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"); } @@ -82,34 +82,34 @@ function widget($, team, type, node) { var index = query.replace(/^!path!/, ''); var path = window.location.pathname.split('/'); query = path[path.length - index]; - widget.log("obtained query '" + query + "' from path-component '" + index + "'"); + this.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); } } else if (query.match(/^!var!/)) { var name = query.replace(/^!var!/, ''); query = window[name]; // It's ridiculous that this works - widget.log("obtained query '" + query + "' from variable '" + name + "'"); + this.log("obtained query '" + query + "' from variable '" + name + "'"); if (!query) { alert("This page has a MasterKey widget that needs a query specified by the '" + name + "' variable"); } } // Stash this for subsequent inspection - widget.team.config().query = query; + this.team.config().query = query; - widget.team.queue("ready").subscribe(function() { + this.team.queue("ready").subscribe(function() { // Postpone testing for the configuration items: these are not // yet set for Record subclass widgets that fill them in in the // subclass, as widget.autosearch is called in the superclass, // before the subclass fiddles with the configuration. - var sortOrder = widget.config.sort; - var maxrecs = widget.config.maxrecs; - var perpage = widget.config.perpage; - var limit = widget.config.limit; - var targets = widget.config.targets; - var targetfilter = widget.config.targetfilter; - var target = widget.config.target; + var sortOrder = that.config.sort; + var maxrecs = that.config.maxrecs; + var perpage = that.config.perpage; + var limit = that.config.limit; + var targets = that.config.targets; + var targetfilter = that.config.targetfilter; + var target = that.config.target; if (target) targetfilter = 'udb=="' + target + '"'; var s = "running auto search: '" + query + "'"; @@ -119,9 +119,9 @@ function widget($, team, type, node) { if (limit) s += " limited by '" + limit + "'"; if (targets) s += " in targets '" + targets + "'"; if (targetfilter) s += " constrained by targetfilter '" + targetfilter + "'"; - widget.log(s); + that.log(s); - widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter); + that.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter); }); } }; -- 1.7.10.4