Ignore vim swap files.

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

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index d7ce3ba..39513d9 100644 (file)
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -43,8 +43,8 @@ function widget($, team, type, node) {
     }
     
     for (var name in overrides) {
+      log(this + " overrode property " + name + "='" + overrides[name] + "' (was '" + attrs[name] + "') for " + type + " subwidget");
       attrs[name] = overrides[name];
-      log(this + " overrode property " + name + "='" + attrs[name] + "' for " + type + " subwidget");
     }
 
     if (defaults) {
@@ -70,7 +70,7 @@ function widget($, team, type, node) {
     if (val.match(/^!param!/)) {
       var param = val.replace(/^!param!/, '');
       val = mkws.getParameterByName(param);
-      this.log("obtained val '" + val + "' from param '" + param + "'");
+      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");
       }
@@ -78,14 +78,14 @@ function widget($, team, type, node) {
       var index = val.replace(/^!path!/, '');
       var path = window.location.pathname.split('/');
       val = path[path.length - index];
-      this.log("obtained val '" + val + "' from path-component '" + index + "'");
+      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
-      this.log("obtained val '" + val + "' from variable '" + name + "'");
+      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");
       }
@@ -98,7 +98,6 @@ function widget($, team, type, node) {
     var that = this;
     var query = this.config.autosearch;
     if (query) {
-      query = this.expandValue(query);
       var old = this.team.config().query;
       if (!old) {
         // Stash this for subsequent inspection
@@ -153,26 +152,27 @@ function widget($, team, type, node) {
 
   for (var i = 0; i < node.attributes.length; i++) {
     var a = node.attributes[i];
+    var val = that.expandValue(a.value);
     if (a.name === 'data-mkws-config') {
       // Treat as a JSON fragment configuring just this widget
-      log(node + ": parsing config fragment '" + a.value + "'");
+      log(node + ": parsing config fragment '" + val + "'");
       var data;
       try {
-        data = $.parseJSON(a.value);
+        data = $.parseJSON(val);
         for (var key in data) {
           log(node + ": adding config element " + key + "='" + data[key] + "'");
           that.config[key] = data[key];
         }
       } catch (err) {
-        alert("Can't parse " + node + " data-mkws-config as JSON: " + a.value);
+        alert("Can't parse " + node + " data-mkws-config as JSON: " + val);
       }
     } else if (a.name.match (/^data-mkws-/)) {
       var name = a.name.replace(/^data-mkws-/, '')
-      that.config[name] = a.value;
-      log(that + ": set data-mkws attribute " + name + "='" + a.value + "'");
+      that.config[name] = val;
+      log(that + ": set data-mkws attribute " + name + "='" + val + "'");
     } else if (!ignoreAttrs[a.name]) {
-      that.config[a.name] = a.value;
-      log(that + ": set regular attribute " + a.name + "='" + a.value + "'");
+      that.config[a.name] = val;
+      log(that + ": set regular attribute " + a.name + "='" + val + "'");
     }
   }