--- a/client/js/list-bin.js Fri Apr 19 13:39:39 2013 +0200
+++ b/client/js/list-bin.js Fri Apr 19 15:31:56 2013 +0200
@@ -12,53 +12,53 @@
);
Rkns.ResourceList.Bin.prototype._init = function(_renkan, _opts) {
- this.renkan = _renkan;
+ this.renkan = _renkan;
this.title_$.html(_opts.title);
if (_opts.list) {
- this.data = _opts.list;
+ this.data = _opts.list;
}
this.refresh();
}
Rkns.ResourceList.Bin.prototype.render = function(searchstr) {
if (searchstr) {
- var _rgxp = new RegExp('('+(searchstr).replace(/(\W)/g,'\\$1')+')','gi'),
- rxtest = new RegExp(searchstr.replace(/(\W)/g,'\\$1'),'i');
+ var _rgxp = new RegExp('('+(searchstr).replace(/(\W)/g,'\\$1')+')','gi'),
+ rxtest = new RegExp(searchstr.replace(/(\W)/g,'\\$1'),'i');
}
function highlight(_text) {
- if (searchstr) {
- return _text.replace(_rgxp, "<span class='searchmatch'>$1</span>");
- } else {
- return _text;
- }
+ if (searchstr) {
+ return _text.replace(_rgxp, "<span class='searchmatch'>$1</span>");
+ } else {
+ return _text;
+ }
}
var _html = "",
_this = this,
count = 0;
Rkns._(this.data).each(function(_item) {
- if (typeof _item === "string") {
- if (/^(https?:\/\/|www)/.test(_item)) {
- var _element = { url: _item }
- } else {
- var _element = { title: _item.replace(/[:,]?\s?(https?:\/\/|www)[\d\w\/.&?=#%-_]+\s?/,'').trim() },
- _match = _item.match(/(https?:\/\/|www)[\d\w\/.&?=#%-_]+/);
- if (_match) {
- _element.url = _match[0];
- }
- if (_element.title.length > 80) {
- _element.description = _element.title;
- _element.title = _element.title.replace(/^(.{30,60})\s.+$/,'$1…');
- }
- }
- } else {
- var _element = _item;
- }
+ if (typeof _item === "string") {
+ if (/^(https?:\/\/|www)/.test(_item)) {
+ var _element = { url: _item }
+ } else {
+ var _element = { title: _item.replace(/[:,]?\s?(https?:\/\/|www)[\d\w\/.&?=#%-_]+\s?/,'').trim() },
+ _match = _item.match(/(https?:\/\/|www)[\d\w\/.&?=#%-_]+/);
+ if (_match) {
+ _element.url = _match[0];
+ }
+ if (_element.title.length > 80) {
+ _element.description = _element.title;
+ _element.title = _element.title.replace(/^(.{30,60})\s.+$/,'$1…');
+ }
+ }
+ } else {
+ var _element = _item;
+ }
var title = _element.title || (_element.url || "").replace(/^https?:\/\/(www\.)?/,'').replace(/^(.{40}).+$/,'$1…'),
url = _element.url || "",
description = _element.description || "",
image = _element.image || "";
if (url && !/^https?:\/\//.test(url)) {
- url = 'http://' + url;
+ url = 'http://' + url;
}
if (searchstr && !rxtest.test(title) && !rxtest.test(description)) {
return;
@@ -90,6 +90,6 @@
Rkns.ResourceList.Bin.prototype.refresh = function() {
if (this.data) {
- this.render();
+ this.render();
}
}
\ No newline at end of file