diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js
index 44e2f62550..26e2d3593b 100644
--- a/frappe/public/js/frappe/ui/toolbar/search.js
+++ b/frappe/public/js/frappe/ui/toolbar/search.js
@@ -3,7 +3,15 @@ frappe.provide('frappe.search');
frappe.search.UnifiedSearch = Class.extend({
setup: function() {
- var d = new frappe.ui.Dialog();
+ var d;
+ if(!frappe.search.dialog) {
+ d = new frappe.ui.Dialog();
+ frappe.search.dialog = d;
+ } else {
+ d = frappe.search.dialog;
+ $(d.body).empty();
+ }
+
$(frappe.render_template("search")).appendTo($(d.body));
$(d.header).html($(frappe.render_template("search_header")));
@@ -12,51 +20,95 @@ frappe.search.UnifiedSearch = Class.extend({
this.search_modal.addClass('search-dialog');
this.input = this.search_modal.find(".search-input");
- this.sidelist = this.search_modal.find(".search-sidelist");
+ this.sidebar = this.search_modal.find(".search-sidebar");
this.results_area = this.search_modal.find(".results-area");
},
- setup_search: function(keywords, search_objects) {
+ setup_search: function(init_keywords, search_objects) {
var me = this;
+ var keywords = init_keywords;
this.search_objects = search_objects;
this.search_types = search_objects.map(function(s) {
return s.search_type;
});
- this.current_type = '';
+ this.current_type = "All Results";
this.reset();
+ this.bind_keyboard_events();
this.input.val(keywords);
this.input.on("input", function() {
var $this = $(this);
clearTimeout($this.data('timeout'));
- $this.data('timeout', setTimeout(function(){
- var keywords = me.input.val();
+ $this.data('timeout', setTimeout(function() {
+ if(me.input.val() === keywords) return;
+ keywords = me.input.val();
me.reset();
if(keywords.length > 2) {
me.build_results(keywords);
} else {
me.current_type = '';
}
- }, 600));
+ }, 300));
});
this.build_results(keywords);
setTimeout(function() { me.input.select(); }, 500);
},
reset: function() {
- this.sidelist.empty();
+ this.sidebar.empty();
this.results_area.empty();
+ this.results_area.append($('
' +
+ ''+__("Search for anything")+'
'));
+ },
+
+ bind_keyboard_events: function() {
+ var me = this;
+ this.search_modal.on('keydown', function(e) {
+ if(me.sidebar.find('.list-link').length > 1) {
+ var list_types = me.get_all_list_types();
+ var current_type_index = list_types.indexOf(me.current_type);
+ // DOWN and UP keys navigate sidebar
+ if(e.which === 40) {
+ if(current_type_index < list_types.length - 1) {
+ next_type = list_types[current_type_index + 1];
+ me.sidebar.find('*[data-category="'+ next_type +'"]').trigger('click');
+ }
+ } else if(e.which === 38) {
+ if(current_type_index > 0) {
+ last_type = list_types[current_type_index - 1];
+ me.sidebar.find('*[data-category="'+ last_type +'"]').trigger('click');
+ }
+ } else if (e.which === 9) {
+ // Tab key rolls back after the last result
+ if(me.results_area.find('a').last().is(":focus")) {
+ e.preventDefault();
+ me.results_area.find('.module-section-link').first().focus();
+ }
+ } else if(e.which === 8) {
+ // Backspace key focuses input
+ if(!me.input.is(":focus")) {
+ me.input.focus();
+ }
+ }
+ }
+ });
+ this.search_modal.on('keypress', function(e) {
+ if(!me.input.is(":focus")) {
+ me.input.focus();
+ }
+ });
},
build_results: function(keywords) {
var me = this;
this.summary = $('
');
+ this.sidelist = $('');
this.full_lists = {};
this.current = 0;
this.search_objects[me.current].build_results_object(me, keywords);
},
- render_results: function(results_obj, keywords){
+ render_results: function(results_obj, keywords) {
var me = this;
if(this.current === 0) { this.reset() }
results_obj.sidelist.forEach(function(list_item) {
@@ -67,47 +119,42 @@ frappe.search.UnifiedSearch = Class.extend({
me.summary.append(section);
});
this.full_lists = Object.assign(this.full_lists, results_obj.lists);
+ this.full_lists["All Results"] = this.summary;
this.render_next_search(keywords);
},
bind_events: function() {
var me = this;
- this.results_area.on('scroll', function() {
- if(me.results_area.find('.all-results-link').length !== 0) {
- return;
- }
- var r = me.results_area.find('.module-section')[1];
- me.results_area.find('.module-section').each(function() {
- if(($(this).position().top < 120) && ($(this).position().top + $(this).height() > 120)) {
- var types = $(this).attr('data-type').split(',');
- me.sidelist.find('.list-link').removeClass('active');
- types.forEach(function(type) {
- me.sidelist.find('*[data-category="'+ type +'"]').addClass('active');
- });
- }
- });
- });
- this.sidelist.find('.list-link').on('click', function() {
- me.set_sidelist_link_action($(this));
+ this.sidebar.find('.list-link').on('click', function() {
+ me.set_sidebar_link_action($(this));
});
this.results_area.find('.section-more').on('click', function() {
var type = $(this).attr('data-category');
- me.sidelist.find('*[data-category="'+ type +'"]').trigger('click');
+ me.sidebar.find('*[data-category="'+ type +'"]').trigger('click');
+ return false;
});
+ this.results_area.find('.Help-result a').on('click', frappe.help.show_results);
},
- set_sidelist_link_action: function(link) {
- this.sidelist.find(".list-link").removeClass("active");
- this.sidelist.find(".list-link i").addClass("hide");
+ set_sidebar_link_action: function(link) {
+ var me = this;
+ this.sidebar.find(".list-link").removeClass("active");
link.addClass("active");
- link.find("i").removeClass("hide");
var type = link.attr('data-category');
this.results_area.empty().html(this.full_lists[type]);
+ me.results_area.find('.module-section-link').first().focus();
+
+ this.results_area.find('.section-more').on('click', function() {
+ var type = $(this).attr('data-category');
+ me.sidebar.find('*[data-category="'+ type +'"]').trigger('click');
+ return false;
+ });
this.current_type = type;
this.set_back_link();
this.set_list_more_link(type);
+ this.results_area.find('.Help-result a').on('click', frappe.help.show_results);
},
set_back_link: function() {
@@ -120,9 +167,8 @@ frappe.search.UnifiedSearch = Class.extend({
show_summary: function() {
this.current_type = '';
- this.sidelist.find(".list-link i").addClass("hide");
- this.sidelist.find(".list-link").removeClass("active");
- this.sidelist.find(".list-link").first().addClass("active");
+ this.sidebar.find(".list-link").removeClass("active");
+ this.sidebar.find(".list-link").first().addClass("active");
this.results_area.empty().html(this.summary);
this.bind_events();
},
@@ -141,7 +187,9 @@ frappe.search.UnifiedSearch = Class.extend({
var me = this;
var more_results = more_data[0];
var more = more_data[1];
+ this.results_area.find('.module-section-link').last().addClass('.current-last');
this.results_area.find('.list-more').before(more_results);
+ setTimeout(function() { me.results_area.find('.more-results').last().find('.module-section-link').first().focus(); }, 200);
if(!more) {
this.results_area.find('.list-more').hide();
var no_of_results = this.results_area.find('.result').length;
@@ -166,34 +214,38 @@ frappe.search.UnifiedSearch = Class.extend({
// More searches to go
this.search_objects[this.current].build_results_object(this, keywords);
} else {
- // If there's only one link in sidelist, there's no summary (show its full list)
- if(this.sidelist.find('.list-link').length === 1) {
+ this.sidebar.append(this.sidelist);
+ // If there's only one link in sidebar, there's no summary (show its full list)
+ if(this.sidebar.find('.list-link').length === 1) {
this.bind_events();
- this.sidelist.find('.list-link').trigger('click');
+ this.sidebar.find('.list-link').trigger('click');
this.results_area.find('.all-results-link').hide();
- } else if (this.sidelist.find('.list-link').length === 0) {
+ } else if (this.sidebar.find('.list-link').length === 0) {
this.results_area.html('
'+
'No results found for: '+ "'"+ keywords +"'" +'
');
} else {
+ this.sidebar.find('.search-sidelist').prepend('');
var list_types = this.get_all_list_types();
- if(list_types.indexOf(this.current_type) >= 0) {
- this.bind_events();
- this.sidelist.find('*[data-category="'+ this.current_type +'"]').trigger('click');
- } else {
- this.show_summary();
+ if(list_types.indexOf(this.current_type) === -1) {
+ this.current_type = "All Results";
}
+ this.bind_events();
+ this.sidebar.find('*[data-category="'+ this.current_type +'"]').trigger('click');
+ this.bind_events();
}
}
},
get_all_list_types: function() {
var types = [];
- this.sidelist.find('.list-link').each(function() {
+ this.sidebar.find('.list-link').each(function() {
types.push($(this).attr('data-category'));
});
return types;
- }
+ },
});
@@ -244,8 +296,9 @@ frappe.search.GlobalSearch = Class.extend({
},
make_sidelist_item: function(type) {
- var sidelist_item = '';
+ var sidelist_item = '';
return $(__(sidelist_item, [this.search_type, type]));
},
@@ -303,7 +356,7 @@ frappe.search.GlobalSearch = Class.extend({
make_result_item: function(type, result) {
var link_html = '
' +
- '
{1}' +
+ '
{1}' +
'
{2}
' +
'
';
var formatted_result = this.format_result(result);
@@ -324,7 +377,7 @@ frappe.search.GlobalSearch = Class.extend({
if(part.toLowerCase().indexOf(keywords) !== -1) {
var colon_index = part.indexOf(':');
part = '
' +
- part.slice(0, colon_index + 1) + '' +
+ me.bold_keywords(part.slice(0, colon_index + 1), keywords) + '' +
me.bold_keywords(part.slice(colon_index + 1), keywords);
content += part + ', ';
}
@@ -349,8 +402,8 @@ frappe.search.GlobalSearch = Class.extend({
results_col.append(me.make_result_item(type, result));
});
if(results.length > this.section_length) {
- results_col.append('
');
+ results_col.append('
'+__("More...")+'');
}
return results_section;
@@ -394,8 +447,8 @@ frappe.search.GlobalSearch = Class.extend({
results_col.append(me.make_result_item(type, result));
});
if(more) {
- results_col.append('
');
+ results_col.append('
'+__("More...")+'');
}
return results_list;
},
@@ -484,7 +537,7 @@ frappe.search.GlobalSearch = Class.extend({
value: __("{0}: {1}", [__(data.doctype), data.name]),
route: ["Form", data.doctype, data.name],
match: data.doctype,
- index: 41,
+ index: 40,
default: "Global",
description: me.get_finds(data.content, keywords).slice(0,86) + '...'
}
@@ -503,15 +556,9 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
set_types: function() {
var me = this;
this.section_length = 4;
- this.awesome_bar = new frappe.search.AwesomeBar();
- this.nav_results = {
- "Search in ...": me.awesome_bar.make_search_in_list(me.keywords),
- "Lists": me.awesome_bar.get_doctypes(me.keywords),
- "Reports": me.awesome_bar.get_reports(me.keywords),
- "Pages": me.awesome_bar.get_pages(me.keywords),
- "Modules": me.awesome_bar.get_modules(me.keywords)
- }
- var types = ["Search in ...", "Lists", "Reports", "Pages", "Modules"];
+
+ this.set_nav_results(me.keywords);
+ var types = ["Lists", "Reports", "Pages", "Modules"];
types.forEach(function(type) {
if(me.nav_results[type].length > 0) {
me.types.push(type);
@@ -526,6 +573,20 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
}
},
+ set_nav_results: function(keywords) {
+ var me = this;
+ this.awesome_bar = new frappe.search.AwesomeBar();
+ var compare = function(a, b) {
+ return a.index - b.index;
+ }
+ this.nav_results = {
+ "Lists": me.awesome_bar.get_doctypes(keywords).sort(compare),
+ "Reports": me.awesome_bar.get_reports(keywords).sort(compare),
+ "Pages": me.awesome_bar.get_pages(keywords).sort(compare),
+ "Modules": me.awesome_bar.get_modules(keywords).sort(compare)
+ }
+ },
+
get_results: function() {
var me = this;
this.types.forEach(function(type) {
@@ -563,7 +624,16 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
this.make_more_list(type, results, more)
},
+ make_path: function(route) {
+ path = '#';
+ route.forEach(function(r) {
+ path += r + '/';
+ });
+ return path.slice(0, -1);
+ },
+
make_result_item: function(type, result) {
+ var me = this;
if(!result.subtypes) {
var link_html = '
' +
'
{1}' +
@@ -571,30 +641,20 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
return this.make_result_link(type, result, link_html);
} else {
- var result_div = $('
');
- var button_html = '
'
+ var result_div = $('
');
result.subtypes.forEach(function(s) {
if(["Gantt", "Report", "Calendar"].indexOf(s.type) !== -1) {
- var button = $(__(button_html, [s.type]));
- button.on('click', function() {
- if(s.route_options) {
- frappe.route_options = s.route_options;
- }
- frappe.set_route(s.route);
- return false;
- });
+ var button_html = '
';
+ var button = $(__(button_html, [me.make_path(s.route), s.type]));
result_div.append(button);
} else {
- title_link_html = '
{1}';
- var link = $(__(title_link_html, ['#', result.title + ' ' + s.type]));
- link.on('click', function() {
- if(s.route_options) {
- frappe.route_options = s.route_options;
- }
- frappe.set_route(s.route);
- return false;
- });
+ title_link_html = '
{1}';
+ if(s.type === "List") {
+ var link = $(__(title_link_html, [me.make_path(s.route), result.title]));
+ } else {
+ var link = $(__(title_link_html, [me.make_path(s.route), result.title + ' ' + s.type]));
+ }
result_div.append(link);
}
})
@@ -605,8 +665,9 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
},
make_result_link: function(type, result, link_html) {
+ var me = this;
if(!result.onclick) {
- var link = $(__(link_html, ['#', result.label]));
+ var link = $(__(link_html, [me.make_path(result.route), result.label]));
link.on('click', function() {
if(result.route_options) {
frappe.route_options = result.route_options;
@@ -668,8 +729,8 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
results_column.append(me.make_result_item(type, result));
});
if(results.length > this.section_length) {
- results_column.append('
');
+ results_column.append('
'+__("More...")+'');
}
return results_column;
}
@@ -681,6 +742,7 @@ frappe.search.HelpSearch = frappe.search.GlobalSearch.extend({
},
set_types: function() {
+ this.section_length = 4;
this.types = [this.search_type];
this.sidelist = this.make_sidelist();
this.get_result_set(this.types[0]);
@@ -688,9 +750,9 @@ frappe.search.HelpSearch = frappe.search.GlobalSearch.extend({
make_sidelist: function() {
var sidelist = [];
- var sidelist_item = '';
+ this.search_type +'
';
sidelist.push(sidelist_item);
return sidelist;
},
@@ -719,14 +781,42 @@ frappe.search.HelpSearch = frappe.search.GlobalSearch.extend({
this.lists[type] = this.make_full_list(type, results, more);
},
+ make_section: function(type, results) {
+ var me = this;
+ var results_section = $(''+
+ '
' +
+ '
'+type+'
' +
+ '
'+
+ '
' +
- '
{1}' +
+ '
{1}' +
'
{2}
' +
'