10 Commits

7 changed files with 91 additions and 40 deletions

2
.gitignore vendored
View File

@@ -1,2 +1,2 @@
.DS_Store .DS_Store
_releases

View File

@@ -109,6 +109,7 @@ There are some more options available too for customization, so I recommend you
* Better documentation and readme. * Better documentation and readme.
* Handle mouse hovering and keyboard navigation a bit better when used at the same time on a suggest box. * Handle mouse hovering and keyboard navigation a bit better when used at the same time on a suggest box.
* Support suggesting search terms in addition to currently only supporting results. * Support suggesting search terms in addition to currently only supporting results.
* Add callbacks for most things.
## Notice ## Notice

40
Rakefile Normal file
View File

@@ -0,0 +1,40 @@
require 'fileutils'
RLS_PATH = "_releases"
RLS_IGNORE = ["#{RLS_PATH}/*", ".git*", "*.DS_Store", "Rakefile"]
desc "Build a release package"
task :release do
FileUtils.mkdir_p(RLS_PATH)
file = File.read("suggest_results/jquery.suggest_results.js")
if file =~ /\* Suggest Results v([0-9\.]+)\n/
version = $1
target = "#{RLS_PATH}/jquery.suggest_results-#{version}.zip"
if File.exist?(target)
puts "ERROR: #{target} already exists."
else
ignore = RLS_IGNORE.map { |i| "-x \"#{i}\"" }.join(" ")
system("zip #{ignore} -r #{target} .")
puts "packaged #{target}"
end
end
end
desc "Update demo page."
task :demo do
rsync(".", "jimeh@jimeh.me:jimeh.me/files/projects/suggest_results", ["--exclude='#{RLS_PATH}'", "--delete"])
end
def rsync(source, dest, options = [])
if source.is_a?(Array)
source.map! { |dir, i| "\"#{dir}\"" }
source = source.join(" ")
end
options << "--exclude='.DS_Store'"
options << "--exclude='.git*'"
system "rsync -vr #{options.join(" ")} #{source} #{dest}"
end

View File

@@ -1,4 +1,4 @@
var data = [ var exampleData = [
{"title": "Ädams, Egbert", "info": "Bedfordshire", "href": "/demo/user/1", "match": "zzzz"}, {"title": "Ädams, Egbert", "info": "Bedfordshire", "href": "/demo/user/1", "match": "zzzz"},
{"title": "Altman, Alisha", "info": "Buckinghamshire", "href": "/demo/user/2", "match": "zzzz"}, {"title": "Altman, Alisha", "info": "Buckinghamshire", "href": "/demo/user/2", "match": "zzzz"},
{"title": "Archibald, Janna", "info": "Cambridgeshire", "href": "/demo/user/3", "match": "zzzz"}, {"title": "Archibald, Janna", "info": "Cambridgeshire", "href": "/demo/user/3", "match": "zzzz"},

View File

@@ -19,19 +19,26 @@
$(document).ready(function(){ $(document).ready(function(){
$("#example1").suggest_results({ $("#example1").suggest_results({
data: data data: exampleData
}); });
$("#example2").suggest_results({ $("#example2").suggest_results({
url: "server-side.php" url: "server-side.php",
}); });
$("#example3").suggest_results({ $("#example3").suggest_results({
url: "server-side.php", url: "server-side.php",
name: "example3", name: "example3",
empty: false, no_results: false,
limit: 4, limit: 4,
tpl_result_body: '<span class="title">{{title}}</span><span class="info">{{info}}</span>' tpl_result_body: '<span class="title">{{title}}</span><span class="info">{{ info }}</span>'
});
$("#example4").suggest_results({
data: exampleData,
pos_top: 0,
pos_left: 20,
width: 168
}); });
}); });
@@ -68,6 +75,10 @@
<strong>Customized results from ajax call:</strong><br /> <strong>Customized results from ajax call:</strong><br />
<input type="text" name="example3" value="" id="example3" /> <input type="text" name="example3" value="" id="example3" />
</p> </p>
<p>
<strong>Customized position with results from local array:</strong><br />
<input type="text" name="example4" value="" id="example4" />
</p>
<p> <p>
<a href="http://github.com/jimeh/suggest_results">GitHub Project Page</a> <a href="http://github.com/jimeh/suggest_results">GitHub Project Page</a>
</p> </p>

View File

@@ -9,7 +9,7 @@
#suggest_results ol { #suggest_results ol {
background: #fbfbfb; background: #fbfbfb;
border: 1px solid #bbb; border: 1px solid #bbb;
border-top: none; border-top-style: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
list-style: none; list-style: none;

View File

@@ -1,5 +1,5 @@
/*! /*!
* Suggest Results v0.1.2 * Suggest Results v0.1.3
* http://github.com/jimeh/suggest_results * http://github.com/jimeh/suggest_results
* *
* Copyright (c) 2010 Jim Myhrberg. * Copyright (c) 2010 Jim Myhrberg.
@@ -24,7 +24,7 @@
$e.focus(function(){ $e.focus(function(){
self.attach($e, $options); self.attach($e, $options);
if ($e.val().length > 0) { if ($e.val().length > 0) {
self.search_timeout = self.setTimeout(function(){ self.setTimeout(function(){
self.search($e, $options); self.search($e, $options);
}, $options.delay); }, $options.delay);
}; };
@@ -47,9 +47,6 @@
return false; return false;
} }
break; break;
default:
self.clearTimeout();
self.search($e, $options);
} }
}).keyup(function(e){ }).keyup(function(e){
if (e.keyCode > SPECIALS_END || e.keyCode == BACKSPACE) { if (e.keyCode > SPECIALS_END || e.keyCode == BACKSPACE) {
@@ -74,13 +71,13 @@
if (self.box.length == 0) { if (self.box.length == 0) {
$("body").append(self.mustache(options.tpl_container, {id: options.tpl_container_id})); $("body").append(self.mustache(options.tpl_container, {id: options.tpl_container_id}));
self.box = $("#" + options.tpl_container_id); self.box = $("#" + options.tpl_container_id);
self.list = $("ol", self.box); self.list = self.box.children("ol");
}; };
}; };
$.fn.suggest_results.search = function(elm, options){ $.fn.suggest_results.search = function(elm, options){
var self = $.fn.suggest_results; var self = $.fn.suggest_results;
var terms = (options.exact_match) ? $.trim(elm.val()) : elm.val().split(/\s/); var terms = (options.exact_match) ? $.trim(elm.val()) : $.trim(elm.val()).split(/\s+/);
if (typeof(options.url) === "string" && options.url !== "") { if (typeof(options.url) === "string" && options.url !== "") {
self.query_for_data(elm, options); self.query_for_data(elm, options);
} else { } else {
@@ -131,7 +128,7 @@
}; };
self.list.html(html); self.list.html(html);
$(".result", self.list).click(function(){ $(".result", self.list).click(function(){
self.redirect_to($("a", $(this)).attr("href")); window.redirect_to($("a", $(this)).attr("href"));
}).hover(function(){ }).hover(function(){
$(".selected", self.list).removeClass("selected"); $(".selected", self.list).removeClass("selected");
$(this).addClass("selected"); $(this).addClass("selected");
@@ -148,12 +145,13 @@
var offset = elm.offset(); var offset = elm.offset();
// left offset // left offset
self.box.css("left", offset.left + "px"); self.box.css("left", (offset.left + options.pos_left));
// top offset // top offset
var top = offset.top + elm.innerHeight(); var top = offset.top + elm.innerHeight();
top += parseInt(elm.css("border-top-width"), 10) + parseInt(elm.css("border-bottom-width"), 10); top += parseInt(elm.css("border-top-width"), 10) + parseInt(elm.css("border-bottom-width"), 10);
self.box.css("top", top + "px"); top += options.pos_top;
self.box.css("top", top);
// width // width
if (typeof(options.width) === "number" || (typeof(options.width) === "string" && options.width != "")) { if (typeof(options.width) === "number" || (typeof(options.width) === "string" && options.width != "")) {
@@ -162,7 +160,7 @@
var width = elm.innerWidth(); var width = elm.innerWidth();
width += parseInt(elm.css("border-left-width"), 10) + parseInt(elm.css("border-right-width"), 10); width += parseInt(elm.css("border-left-width"), 10) + parseInt(elm.css("border-right-width"), 10);
width -= parseInt(self.box.css("border-left-width"), 10) + parseInt(self.box.css("border-right-width"), 10); width -= parseInt(self.box.css("border-left-width"), 10) + parseInt(self.box.css("border-right-width"), 10);
self.box.css("width", width + "px"); self.box.css("width", width);
}; };
self.attached_to = elm_uid; self.attached_to = elm_uid;
}; };
@@ -227,7 +225,7 @@
$.fn.suggest_results.activate_selected = function(options){ $.fn.suggest_results.activate_selected = function(options){
var self = $.fn.suggest_results; var self = $.fn.suggest_results;
if (self.selected_result !== null) { if (self.selected_result !== null) {
self.redirect_to(self.current_results[self.selected_result].href); window.redirect_to(self.current_results[self.selected_result].href);
}; };
}; };
@@ -235,7 +233,8 @@
if (typeof(terms) === "string") { terms = [terms]; }; if (typeof(terms) === "string") { terms = [terms]; };
var matched = ""; var matched = "";
var results = []; var results = [];
for (var i = terms.length - 1; i >= 0; i--){ var terms_length = terms.length;
for (var i=0; i < terms_length; i++) {
var term = terms[i]; var term = terms[i];
term = term.toLowerCase(); term = term.toLowerCase();
if (data !== null && typeof(term) !== "undefined" && term !== "") { if (data !== null && typeof(term) !== "undefined" && term !== "") {
@@ -284,7 +283,6 @@
} else { } else {
self.no_results(elm, options); self.no_results(elm, options);
}; };
return [];
}; };
$.fn.suggest_results.elm_uid = function(elm){ $.fn.suggest_results.elm_uid = function(elm){
@@ -301,30 +299,12 @@
$.fn.suggest_results.mustache = function(string, data){ $.fn.suggest_results.mustache = function(string, data){
if (typeof(string) === "string" && typeof(data) === "object") { if (typeof(string) === "string" && typeof(data) === "object") {
for (var key in data) { for (var key in data) {
string = string.replace(new RegExp("{{" + key + "}}", "g"), data[key]); string = string.replace(new RegExp("{{\\s*" + key + "\\s*}}", "g"), data[key]);
} }
}; };
return string; return string;
}; };
$.fn.suggest_results.redirect_to = function(url, location){
if (typeof(location) == "undefined") {
location = window.location;
};
var redirect_to = "";
if (url.match(/.+\:\/\/.+/) === null) {
redirect_to += location.protocol + "//";
redirect_to += location.hostname;
if (location.port != "") { redirect_to += ":" + location.port; };
if (url.charAt(0) !== "/") {
redirect_to += location.pathname.substr(0, location.pathname.lastIndexOf("/")+1);
};
window.location.href = redirect_to + url;
} else {
window.location.href = url;
};
};
$.fn.suggest_results.setTimeout = function(callback, delay){ $.fn.suggest_results.setTimeout = function(callback, delay){
var self = $.fn.suggest_results; var self = $.fn.suggest_results;
self.clearTimeout(); self.clearTimeout();
@@ -362,6 +342,8 @@
url: null, url: null,
url_method: "get", url_method: "get",
url_query_var: "search", url_query_var: "search",
pos_top: 0,
pos_left: 0,
delay: 100, delay: 100,
data: null, data: null,
tpl_container_id: "suggest_results", tpl_container_id: "suggest_results",
@@ -375,6 +357,23 @@
})(jQuery); })(jQuery);
/*
redirect_to method from: http://gist.github.com/327227
*/
window.redirect_to = function(url, location){
var redirect_to = "";
if (typeof(location) == "undefined") location = window.location;
if (url.match(/^[a-zA-Z]+\:\/\/.+/) === null) {
redirect_to += location.protocol + "//" + location.hostname;
if (location.port != "") redirect_to += ":" + location.port;
if (url.charAt(0) !== "/") redirect_to += location.pathname.substr(0, location.pathname.lastIndexOf("/")+1);
window.location.href = redirect_to + url;
} else {
window.location.href = url;
};
};
/* /*
Crossbrowser hasOwnProperty solution, based on answers from: Crossbrowser hasOwnProperty solution, based on answers from:
http://stackoverflow.com/questions/135448/how-do-i-check-to-see-if-an-object-has-an-attribute-in-javascript http://stackoverflow.com/questions/135448/how-do-i-check-to-see-if-an-object-has-an-attribute-in-javascript