diff -r 9859c4bae904 -r f9d51dd4a3fe src/js/model.js --- a/src/js/model.js Fri Nov 30 10:49:26 2012 +0100 +++ b/src/js/model.js Wed Dec 19 19:02:52 2012 +0100 @@ -241,7 +241,8 @@ var _iexact = _iexact || false, _rgxp = Model.regexpFromTextOrArray(_text, true); return this.filter(function(_element) { - return _rgxp.test(_element.description) || _rgxp.test(_element.title); + var keywords = (_element.keywords || _element.getTagTexts() || []).join(", "); + return _rgxp.test(_element.description) || _rgxp.test(_element.title) || _rgxp.test(keywords); }); } @@ -426,7 +427,7 @@ } _res += pad(2, _hms.minutes) + ':' + pad(2, _hms.seconds); if (showCs) { - _res += "." + Math.round(_hms.milliseconds / 100) + _res += "." + Math.floor(_hms.milliseconds / 100) } return _res; } @@ -1002,12 +1003,12 @@ Model.Source.prototype.getList = function(_listId, _global) { _global = (typeof _global !== "undefined" && _global); - if (_global || typeof this.contents[_listId] === "undefined") { + if (_global) { return this.directory.getGlobalList().filter(function(_e) { return (_e.elementType === _listId); }); } else { - return this.contents[_listId]; + return this.contents[_listId] || new IriSP.Model.List(this.directory); } } @@ -1141,6 +1142,7 @@ url: this.url, dataType: dataType, data: urlparams, + traditional: true, success: function(_result) { _this.deSerialize(_result); _this.handleCallbacks();