From 44fe214025658f9abe407e744db78b308f1e3db2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 15 May 2014 13:49:24 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/js/treelist.js | 16 +++++++++-------
skins/larry/styles.css | 3 +--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/program/js/treelist.js b/program/js/treelist.js
index a99ee1e..85d8aa9 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -282,12 +282,14 @@
search_active = search_;
// add clone to current search results (top level)
- $('<li>')
- .attr('id', li.attr('id') + '--xsR')
- .attr('class', li.attr('class'))
- .addClass('searchresult__')
- .append(li.children().first().clone(true, true))
- .appendTo(container);
+ if (!li.is(':visible')) {
+ $('<li>')
+ .attr('id', li.attr('id') + '--xsR')
+ .attr('class', li.attr('class'))
+ .addClass('searchresult__')
+ .append(li.children().first().clone(true, true))
+ .appendTo(container);
+ }
}
}
// insert at top level
@@ -434,7 +436,7 @@
var search_tree = function(items) {
$.each(items, function(i, node) {
var li, sli;
- if (!node.virtual && !node.deleted && String(node.text).toLowerCase().indexOf(q) >= 0) {
+ if (!node.virtual && !node.deleted && String(node.text).toLowerCase().indexOf(q) >= 0 && hits.indexOf(node.id) < 0) {
li = id2dom(node.id);
sli = $('<li>')
.attr('id', li.attr('id') + '--xsR')
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 1062798..0ddb296 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -439,8 +439,7 @@
background-position: -2px -317px;
}
-a.iconbutton.searchicon,
-a.iconbutton.searchoptions {
+a.iconbutton.searchicon {
width: 15px;
}
--
Gitblit v1.9.1