Browse Source

#2042 missing delegated selector in search

pull/2092/head
jlukic 10 years ago
parent
commit
04df7b8101
2 changed files with 31 additions and 13 deletions
  1. 20
      src/definitions/modules/search.js
  2. 24
      tasks/docs/metadata.js

20
src/definitions/modules/search.js

@ -66,22 +66,24 @@ $.fn.search = function(parameters) {
: 'keyup' : 'keyup'
; ;
if(settings.automatic) { if(settings.automatic) {
$module
.on(inputEvent + eventNamespace, selector.prompt, module.throttle)
;
$prompt $prompt
.on(inputEvent + eventNamespace, module.throttle)
.attr('autocomplete', 'off') .attr('autocomplete', 'off')
; ;
} }
$module $module
// prompt // prompt
.on('focus' + eventNamespace, selector.prompt, module.event.focus) .on('focus' + eventNamespace, selector.prompt, module.event.focus)
.on('blur' + eventNamespace, selector.prompt, module.event.blur) .on('blur' + eventNamespace, selector.prompt, module.event.blur)
.on('keydown' + eventNamespace, selector.prompt, module.handleKeyboard) .on('keydown' + eventNamespace, selector.prompt, module.handleKeyboard)
// search button // search button
.on('click' + eventNamespace, selector.searchButton, module.query) .on('click' + eventNamespace, selector.searchButton, module.query)
// results // results
.on('mousedown' + eventNamespace, selector.results, module.event.result.mousedown) .on('mousedown' + eventNamespace, selector.results, module.event.result.mousedown)
.on('mouseup' + eventNamespace, selector.results, module.event.result.mouseup) .on('mouseup' + eventNamespace, selector.results, module.event.result.mouseup)
.on('click' + eventNamespace, selector.results, selector.result, module.event.result.click) .on('click' + eventNamespace, selector.results, selector.result, module.event.result.click)
; ;
module.instantiate(); module.instantiate();
}, },
@ -102,8 +104,6 @@ $.fn.search = function(parameters) {
event: { event: {
focus: function() { focus: function() {
module.set.focus(); module.set.focus();
clearTimeout(module.timer);
module.throttle();
if( module.has.minimumCharacters() ) { if( module.has.minimumCharacters() ) {
module.showResults(); module.showResults();
} }
@ -882,7 +882,7 @@ $.fn.search.settings = {
], ],
searchFullText : true, searchFullText : true,
automatic : 'true', automatic : true,
hideDelay : 0, hideDelay : 0,
searchDelay : 100, searchDelay : 100,
maxResults : 7, maxResults : 7,

24
tasks/docs/metadata.js

@ -22,6 +22,14 @@ function startsWith(str, prefix) {
return str.indexOf(prefix) === 0; return str.indexOf(prefix) === 0;
}; };
function inArray(needle, haystack) {
var length = haystack.length;
for(var i = 0; i < length; i++) {
if(haystack[i] == needle) return true;
}
return false;
}
/** /**
* Parses a file for metadata and stores result in data object. * Parses a file for metadata and stores result in data object.
* @param {File} file - object provided by map-stream. * @param {File} file - object provided by map-stream.
@ -46,7 +54,8 @@ function parser(file, callback) {
lines = text.split('\n') lines = text.split('\n')
filename = file.path.substring(0, file.path.length - 4), filename = file.path.substring(0, file.path.length - 4),
key = 'server/documents', key = 'server/documents',
position = filename.indexOf(key) position = filename.indexOf(key),
categories
; ;
// exit conditions // exit conditions
@ -67,7 +76,8 @@ function parser(file, callback) {
meta, meta,
line line
; ;
for (index = 0; index < lineCount; index++) { for(index = 0; index < lineCount; index++) {
line = lines[index]; line = lines[index];
@ -85,9 +95,17 @@ function parser(file, callback) {
yaml.push(line); yaml.push(line);
} }
categories = [
'UI Element',
'UI Collection',
'UI View',
'UI Module',
'UI Behavior'
];
// Parse yaml. // Parse yaml.
meta = YAML.parse(yaml.join('\n')); meta = YAML.parse(yaml.join('\n'));
if(meta && meta.category !== 'Draft' && meta.title !== undefined) { if(meta && inArray(meta.category, categories) && meta.title !== undefined) {
meta.category = meta.type; meta.category = meta.type;
meta.filename = filename; meta.filename = filename;
meta.title = meta.title; meta.title = meta.title;

|||||||
100:0
Loading…
Cancel
Save