// Factory function for widget objects.
-function widget($, team, type, node) {
+mkws.makeWidget = function($, team, type, node) {
// Static register of attributes that do not contribute to config
var ignoreAttrs = {
id:1, 'class':1, style:1, name:1, action:1, type:1, size:1,
team: team,
type: type,
node: $(node),
- config: mkws.objectInheritingFrom(team.config())
+ config: mkws.objectInheritingFrom(team.config)
};
function log(s) {
}
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) {
}
var s = [];
- s.push('<div class="mkws', type, ' mkwsTeam_', attrs._team, '"');
+ s.push('<div class="mkws', type, ' mkws-team-', attrs._team, '"');
for (var name in attrs) {
if (name !== '_team')
s.push(' ', name, '="', attrs[name], '"');
return s.join('');
};
- that.expandValue = function(val) {
+ function expandValue(val) {
if (val.match(/^!param!/)) {
var param = val.replace(/^!param!/, '');
val = mkws.getParameterByName(param);
var that = this;
var query = this.config.autosearch;
if (query) {
- query = this.expandValue(query);
- var old = this.team.config().query;
+ var old = this.team.config.query;
if (!old) {
// Stash this for subsequent inspection
- this.team.config().query = query;
+ this.team.config.query = query;
} else if (old === query) {
this.log("duplicate autosearch: '" + query + "': ignoring");
return;
for (var i = 0; i < node.attributes.length; i++) {
var a = node.attributes[i];
- var val = that.expandValue(a.value);
+ 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 + "'");
}
return that;
-}
+};