From: Mike Taylor <mike@indexdata.com>
Date: Thu, 20 Nov 2014 10:18:18 +0000 (+0000)
Subject: Get rid of local variable log; all invocation are explicitly on this or that.
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=76f8c51b73693396840cb91f3f9251df398c84ed

Get rid of local variable log; all invocation are explicitly on this or that.
---

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 47fb6fd..bb10767 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -13,8 +13,7 @@ mkws.makeWidget = function($, team, type, node) {
     config: mkws.objectInheritingFrom(team.config)
   };
 
-  var log = team.log;
-  that.log = log;
+  that.log = team.log;
 
   that.toString = function() {
     return '[Widget ' + team.name() + ':' + type + ']';
@@ -36,12 +35,12 @@ mkws.makeWidget = function($, team, type, node) {
     for (var name in this.config) {
       if (this.config.hasOwnProperty(name)) {
         attrs[name] = this.config[name];
-        log(this + " copied property " + name + "='" + attrs[name] + "' to " + type + " subwidget");
+        this.log(this + " copied property " + name + "='" + attrs[name] + "' to " + type + " subwidget");
       }
     }
     
     for (var name in overrides) {
-      log(this + " overrode property " + name + "='" + overrides[name] + "' (was '" + attrs[name] + "') for " + type + " subwidget");
+      this.log(this + " overrode property " + name + "='" + overrides[name] + "' (was '" + attrs[name] + "') for " + type + " subwidget");
       attrs[name] = overrides[name];
     }
 
@@ -49,7 +48,7 @@ mkws.makeWidget = function($, team, type, node) {
       for (var name in defaults) {
         if (!attrs[name]) {
           attrs[name] = defaults[name];
-          log(this + " fell back to default property " + name + "='" + attrs[name] + "' for " + type + " subwidget");
+          this.log(this + " fell back to default property " + name + "='" + attrs[name] + "' for " + type + " subwidget");
         }
       }
     }
@@ -68,7 +67,7 @@ mkws.makeWidget = function($, team, type, node) {
     if (val.match(/^!param!/)) {
       var param = val.replace(/^!param!/, '');
       val = mkws.getParameterByName(param);
-      log("obtained val '" + val + "' from param '" + param + "'");
+      that.log("obtained val '" + val + "' from param '" + param + "'");
       if (!val) {
         alert("This page has a MasterKey widget that needs a val specified by the '" + param + "' parameter");
       }
@@ -76,14 +75,14 @@ mkws.makeWidget = function($, team, type, node) {
       var index = val.replace(/^!path!/, '');
       var path = window.location.pathname.split('/');
       val = path[path.length - index];
-      log("obtained val '" + val + "' from path-component '" + index + "'");
+      that.log("obtained val '" + val + "' from path-component '" + index + "'");
       if (!val) {
         alert("This page has a MasterKey widget that needs a val specified by the path-component " + index);
       }
     } else if (val.match(/^!var!/)) {
       var name = val.replace(/^!var!/, '');
       val = window[name]; // It's ridiculous that this works
-      log("obtained val '" + val + "' from variable '" + name + "'");
+      that.log("obtained val '" + val + "' from variable '" + name + "'");
       if (!val) {
         alert("This page has a MasterKey widget that needs a val specified by the '" + name + "' variable");
       }
@@ -153,12 +152,12 @@ mkws.makeWidget = function($, team, type, node) {
     var val = expandValue(a.value);
     if (a.name === 'data-mkws-config') {
       // Treat as a JSON fragment configuring just this widget
-      log(node + ": parsing config fragment '" + val + "'");
+      this.log(node + ": parsing config fragment '" + val + "'");
       var data;
       try {
         data = $.parseJSON(val);
         for (var key in data) {
-          log(node + ": adding config element " + key + "='" + data[key] + "'");
+          this.log(node + ": adding config element " + key + "='" + data[key] + "'");
           that.config[key] = data[key];
         }
       } catch (err) {
@@ -167,21 +166,21 @@ mkws.makeWidget = function($, team, type, node) {
     } else if (a.name.match (/^data-mkws-/)) {
       var name = a.name.replace(/^data-mkws-/, '')
       that.config[name] = val;
-      log(that + ": set data-mkws attribute " + name + "='" + val + "'");
+      this.log(that + ": set data-mkws attribute " + name + "='" + val + "'");
     } else if (!ignoreAttrs[a.name]) {
       that.config[a.name] = val;
-      log(that + ": set regular attribute " + a.name + "='" + val + "'");
+      this.log(that + ": set regular attribute " + a.name + "='" + val + "'");
     }
   }
 
   var fn = mkws.promotionFunction(type);
   if (fn) {
     fn.call(that);
-    log("made " + type + " widget(node=" + node + ")");
+    this.log("made " + type + " widget(node=" + node + ")");
   } else if (type.match(/-Container-(narrow|wide)$/)) {
     // Not really a widget: no need to log its lack of promotion
   } else {
-    log("made UNPROMOTED widget(type=" + type + ", node=" + node + ")");
+    this.log("made UNPROMOTED widget(type=" + type + ", node=" + node + ")");
   }
 
   return that;