diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js index 5e61ee3f2..0e02efb5f 100644 --- a/src/definitions/modules/search.js +++ b/src/definitions/modules/search.js @@ -66,22 +66,24 @@ $.fn.search = function(parameters) { : 'keyup' ; if(settings.automatic) { + $module + .on(inputEvent + eventNamespace, selector.prompt, module.throttle) + ; $prompt - .on(inputEvent + eventNamespace, module.throttle) .attr('autocomplete', 'off') ; } $module // prompt - .on('focus' + eventNamespace, selector.prompt, module.event.focus) - .on('blur' + eventNamespace, selector.prompt, module.event.blur) - .on('keydown' + eventNamespace, selector.prompt, module.handleKeyboard) + .on('focus' + eventNamespace, selector.prompt, module.event.focus) + .on('blur' + eventNamespace, selector.prompt, module.event.blur) + .on('keydown' + eventNamespace, selector.prompt, module.handleKeyboard) // search button - .on('click' + eventNamespace, selector.searchButton, module.query) + .on('click' + eventNamespace, selector.searchButton, module.query) // results .on('mousedown' + eventNamespace, selector.results, module.event.result.mousedown) - .on('mouseup' + eventNamespace, selector.results, module.event.result.mouseup) - .on('click' + eventNamespace, selector.results, selector.result, module.event.result.click) + .on('mouseup' + eventNamespace, selector.results, module.event.result.mouseup) + .on('click' + eventNamespace, selector.results, selector.result, module.event.result.click) ; module.instantiate(); }, @@ -102,8 +104,6 @@ $.fn.search = function(parameters) { event: { focus: function() { module.set.focus(); - clearTimeout(module.timer); - module.throttle(); if( module.has.minimumCharacters() ) { module.showResults(); } @@ -882,7 +882,7 @@ $.fn.search.settings = { ], searchFullText : true, - automatic : 'true', + automatic : true, hideDelay : 0, searchDelay : 100, maxResults : 7, diff --git a/tasks/docs/metadata.js b/tasks/docs/metadata.js index ec61c437e..6a7c9de93 100644 --- a/tasks/docs/metadata.js +++ b/tasks/docs/metadata.js @@ -22,6 +22,14 @@ function startsWith(str, prefix) { 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. * @param {File} file - object provided by map-stream. @@ -46,7 +54,8 @@ function parser(file, callback) { lines = text.split('\n') filename = file.path.substring(0, file.path.length - 4), key = 'server/documents', - position = filename.indexOf(key) + position = filename.indexOf(key), + categories ; // exit conditions @@ -67,7 +76,8 @@ function parser(file, callback) { meta, line ; - for (index = 0; index < lineCount; index++) { + + for(index = 0; index < lineCount; index++) { line = lines[index]; @@ -85,9 +95,17 @@ function parser(file, callback) { yaml.push(line); } + categories = [ + 'UI Element', + 'UI Collection', + 'UI View', + 'UI Module', + 'UI Behavior' + ]; + // Parse yaml. 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.filename = filename; meta.title = meta.title;