digilib-old: webapp/src/main/webapp/jquery/jquery.digilib.regions.js comparison

comparison webapp/src/main/webapp/jquery/jquery.digilib.regions.js @ 1141:bbb09797d7fc

better search autocompletion; better colors

author	hertzhaft
date	Sat, 17 Nov 2012 01:20:55 +0100
parents	3b5968aeefac
children

comparison

equal deleted inserted replaced

-:50d6eaa74b4b
+:bbb09797d7fc
 // find a region by text data and higlight it
 findData : function (data) {
 var $elem = data.$elem;
 var findSelector = '#'+CSS+'regionFindData';
 if (fn.isOnScreen(data, findSelector)) return; // already onscreen
-var textOptions = getTextOptions(data, 'regionHTML');
+var options = filteredOptions(data, 'regionHTML');
 var html = '\
 <div id="'+CSS+'regionFindData" class="'+CSS+'keep '+CSS+'regionInfo">\
-<div>text to find:</div>\
+<div>Find object:</div>\
 <form class="'+CSS+'form">\
 <div>\
 <select class="'+CSS+'finddata">\
 <option/>\
-'+textOptions+'\
+'+options+'\
 </select>\
 </div>\
 <input class="'+CSS+'input" name="data" type="text" size="30" /> \
 <input class="'+CSS+'submit" type="submit" name="sub" value="Ok"/>\
 <input class="'+CSS+'cancel" type="button" value="Cancel"/>\
 fn.withdraw($info);
 actions.highlightRegions(data, id);
 return false;
 };
 // adapt dropdown, show only matching entries
-var filterOptions = function (text) {
+var filterOptions = function (filter) {
-if (!text) {
+var options = filteredOptions(data, 'regionHTML', filter);
-// not text, display all options, select first (empty)
+$select.empty();
-// $options.show();
+$select.append($(options));
-$select.prop("selectedIndex", 0);
-return;
-}
-var first = true;
-$options.each(function (index) {
-var $option = $(this);
-// TODO: more sophisticated matching
-if (matchText($option.text(), text)) {
-$option.show();
-if (first) {
-$select.prop("selectedIndex", index);
-first = false;
-}
-} else {
-if (index > 0) $option.hide();
-}
-if (first) { // no hit, display and select empty option
-$select.prop("selectedIndex", 0);
-}
-});
 };
 // handle submit
 $form.on('submit', findRegion);
 $select.on('change', findRegion);
 $input.on('keyup', function (event) {
 fn.centerOnScreen(data, $info);
 $input.focus();
 }
 };
-// match search text
-var matchText = function (optiontext, text) {
-// sanitize and split
-var parts = text.replace(/([\\\(\)\-\!.+?*])/g, '\\$1').split(/\s+/);
-// match all parts anywhere in optiontext
-var regexparts = $.map(parts, function(part) {
-return '(?=.*'+part+')'; // one lookahead for each part
-});
-var RE = new RegExp(regexparts.join(''), 'i');
-var result = optiontext.match(RE);
-return result;
-};
 // make a coords string
 var packCoords = function (rect, sep) {
 if (sep == null) sep = ','; // comma as default separator
 return [
 fn.cropFloatStr(rect.x),
 var getRegions = function (data, selector) {
 var $regions = data.$elem.find('div.'+CSS+selector);
 return $regions;
 };
+// create a filter text matcher
+var getFilterRE = function (filter) {
+if (!filter) return null;
+// sanitize and split
+var parts = filter.replace(/([\\\(\)\-\!.+?*])/g, '\\$1').split(/\s+/);
+// match all parts anywhere in optiontext
+var regexparts = $.map(parts, function(part) {
+// one lookahead for each filter part
+return '(?=.*'+part+')';
+});
+var RE = new RegExp(regexparts.join(''), 'i');
+return RE;
+};
 // make HTML option from regions text data
-var getTextOptions = function (data, selector) {
+var filteredOptions = function (data, selector, filter) {
-var sortfunc = data.settings.regionSortString;
 var options = [];
+var sort = data.settings.regionSortString;
+var RE = getFilterRE(filter);
 var createOption = function (index, region) {
 var $region = $(region);
 var rect = $region.data('rect');
-if (rect == null)
+if (rect == null) return;
-return null;
 // var coords = packCoords(rect, ',');
-var id = $region.attr('id');
 var text = $region.data('text');
-var sortstring = $region.data('sort')
+if (RE == null || text.match(RE)) {
-|| (typeof sortfunc === 'function')
+var id = $region.attr('id');
-? sortfunc(text)
+var sortstring = $region.data('sort')
-: text;
+|| (typeof sort === 'function')
-var option = '<option value="'+id+'">'+text+'</option>';
+? sort(text)
-options.push([sortstring, option]);
+: text;
+var option = '<option value="'+id+'">'+text+'</option>';
+options.push([sortstring, option]);
+}
 };
 var $regions = getRegions(data, selector);
 $.each($regions, createOption);
 options.sort(function (a, b) {
 return a[0].localeCompare(b[0]);