Commit 2e24c0f1 authored by Joshua Gould's avatar Joshua Gould

case insens fields for autocomplete

parent b1261049
...@@ -32,29 +32,24 @@ morpheus.Util.loadTrackingCode = function () { ...@@ -32,29 +32,24 @@ morpheus.Util.loadTrackingCode = function () {
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
if (morpheus.Util.TRACKING_CODE_LOADED) { if (morpheus.Util.TRACKING_CODE_LOADED) {
return; return;
} else if (typeof ga !== 'undefined') { } else if (typeof ga === 'undefined') {
morpheus.Util.TRACKING_CODE_LOADED = true; morpheus.Util.TRACKING_CODE_LOADED = true;
return; (function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
} }
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments);
}, i[r].l = 1 * new Date();
a = s.createElement(o), m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m);
})(window, document, 'script',
'//www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-53973555-1', 'auto', 'morpheus'); ga('create', 'UA-53973555-1', 'auto', 'morpheus');
ga('morpheus.send', 'pageview'); ga('morpheus.send', 'pageview');
morpheus.Util.TRACKING_CODE_LOADED = true; morpheus.Util.TRACKING_CODE_LOADED = true;
} }
}; };
morpheus.Util.trackEvent = function (options) { morpheus.Util.trackEvent = function (options) {
...@@ -485,6 +480,11 @@ morpheus.Util.autosuggest = function (options) { ...@@ -485,6 +480,11 @@ morpheus.Util.autosuggest = function (options) {
if (ui.item.skip) { if (ui.item.skip) {
return false; return false;
} }
if (ui.item.select) {
ui.item.select(options.$el);
return false;
}
if (options.multi) { if (options.multi) {
var terms = morpheus.Util var terms = morpheus.Util
.getAutocompleteTokens( .getAutocompleteTokens(
...@@ -495,9 +495,7 @@ morpheus.Util.autosuggest = function (options) { ...@@ -495,9 +495,7 @@ morpheus.Util.autosuggest = function (options) {
}); });
var value = ui.item.value; var value = ui.item.value;
var show = ui.item.show; // || (ui.item.space var show = ui.item.show;
// &&
// options.suggestWhenEmpty);
// replace the current input // replace the current input
if (terms.length === 0) { if (terms.length === 0) {
...@@ -1003,13 +1001,20 @@ morpheus.Util.escapeRegex = function (value) { ...@@ -1003,13 +1001,20 @@ morpheus.Util.escapeRegex = function (value) {
morpheus.Util.createSearchPredicates = function (options) { morpheus.Util.createSearchPredicates = function (options) {
options = $.extend({}, { options = $.extend({}, {
validateFieldNames: true validateFieldNames: true,
caseSensitive: true
}, options); }, options);
var tokens = options.tokens; var tokens = options.tokens;
if (tokens == null) { if (tokens == null) {
return []; return [];
} }
var availableFields = options.fields; var availableFields = options.fields;
if (!options.caseSensitive && availableFields != null) {
for (var i = 0; i < availableFields.length; i++) {
availableFields[i] = availableFields[i].toLowerCase();
}
}
var validateFieldNames = options.validateFieldNames; var validateFieldNames = options.validateFieldNames;
var fieldSearchEnabled = !validateFieldNames var fieldSearchEnabled = !validateFieldNames
|| (availableFields != null && availableFields.length > 0); || (availableFields != null && availableFields.length > 0);
...@@ -1053,7 +1058,7 @@ morpheus.Util.createSearchPredicates = function (options) { ...@@ -1053,7 +1058,7 @@ morpheus.Util.createSearchPredicates = function (options) {
} }
if (!validateFieldNames if (!validateFieldNames
|| availableFields.indexOf(possibleField) !== -1) { || availableFields.indexOf(options.caseSensitive ? possibleField : possibleField.toLowerCase()) !== -1) {
token = possibleToken; token = possibleToken;
field = possibleField; field = possibleField;
} }
...@@ -1135,7 +1140,8 @@ morpheus.Util.createSearchPredicates = function (options) { ...@@ -1135,7 +1140,8 @@ morpheus.Util.createSearchPredicates = function (options) {
}); });
return predicates; return predicates;
}; }
;
morpheus.Util.createRegExpStringToMatchText = function (text) { morpheus.Util.createRegExpStringToMatchText = function (text) {
var tokens = morpheus.Util.getAutocompleteTokens(text); var tokens = morpheus.Util.getAutocompleteTokens(text);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment