Changeset 28805 for extensions/rv_autocomplete/res

Timestamp:

Jun 26, 2014, 10:21:57 PM (10 years ago)

Author:

rvelices

Message:

rv_autocomplete - better suggestions when combining words and using backspace ...

File:

• extensions/rv_autocomplete/res/suggest-core.js (modified) (8 diffs)

extensions/rv_autocomplete/res/suggest-core.js

@@ -69 +69 @@
 
 function ac_normalize(str) {
-        return str.replace(RVAC.rSpaceLike, ' ').replace(/ {2,}/g, ' ').replace(/(^ | $)/g, '');
-}
-
-function ac_analyze(input, lastFocusStr) {
+        return str.replace(RVAC.rSpaceLike, ' ').replace(/ {2,}/g, ' ').trim();
+}
+
+function ac_analyze(input, previous) {
         var intent="", quoted=0, brackets=0, is_complex=0, scope="", i=0;
 
-        if (lastFocusStr.length) {
-                if (input.indexOf(lastFocusStr) == 0) {
-                        i = lastFocusStr.length;
+        var lastIgnoreMatchStr = previous.lastIgnoreMatchStr,
+                lastFocusStr = previous.lastFocusStr;
+        if (previous.lastIgnoreMatchStr.length) {
+                if (input.indexOf(previous.input) != 0)
+                        lastIgnoreMatchStr = lastFocusStr; // some chars deleted from previous
+                if (lastFocusStr.length && input.indexOf(lastIgnoreMatchStr) == 0) {
+                        i = lastIgnoreMatchStr.length;
                         is_complex = 1;
                 }
                 else
-                        lastFocusStr = "";
+                        lastIgnoreMatchStr = lastFocusStr = "";
         }
 
@@ -152 +156 @@
                 scope: scope,
                 lastFocusStr: lastFocusStr,
+                lastIgnoreMatchStr: lastIgnoreMatchStr,
                 input: input
         }
@@ -274 +279 @@
 var $input = $("#qsearchInput");
 $input.autocomplete({
-        rv:{lastFocusStr: ""}, minLength: 1,
+        rv:{lastFocusStr: "", lastIgnoreMatchStr: ""}, minLength: 1,
 
         focus: function(event,ui) {
@@ -306 +311 @@
                         this.setSelectionRange(999, 999);
 
-                expr.lastFocusStr = this.value;
+                expr.lastFocusStr = expr.lastIgnoreMatchStr = this.value;
                 return false;
         },
@@ -326 +331 @@
                 }
                 else {
-                        this.value = this.value.replace( / $/, '');
+                        this.value = this.value.trim();
                         var form = $(this).parents("form");
                         form.append( $("<input type='hidden' name='acs' />").val(ac.term) );
@@ -336 +341 @@
 
         source: function(request, response) {
-                this.options.rv = ac_analyze(request.term, this.options.rv.lastFocusStr);
+                this.options.rv = ac_analyze(request.term, this.options.rv);
 
                 var res = ac_search(this.options.rv);
@@ -347 +352 @@
 
                         while ( (matches = raw_q.match(/^[ &.,;!\?-]*[^ &.,;!\?-]+[ &.,;!\?-]+/)) != null ) {
-                                current.lastFocusStr += raw_q.substr(0, matches[0].length);
+                                current.lastIgnoreMatchStr += raw_q.substr(0, matches[0].length);
                                 current.raw_q = raw_q = raw_q.substr(matches[0].length);
                                 current.q = remove_accents( ac_normalize( raw_q.toLowerCase() ) );
@@ -368 +373 @@
                 + "</a></li>";
 
-        return $(s)
-                .appendTo(ul);
+        return $(s).appendTo(ul);
 };
 
+if (window.localStorage) {
+        RVAC.searchHistory = "pwgAutoComplete" in localStorage ? JSON.parse( localStorage.getItem("pwgAutoComplete") ) : [];
+        $input.parents("form").on( "submit", function() {
+                var val = $input.val().trim();
+                //TODO - save to storage...
+        } );
+}
 };