Changeset 1166884

Timestamp:

05/25/2015 04:53:41 AM (11 years ago)

Author:

Dan Kirshner

Message:

beta10 for 3.00 - placeholder revision, allow zero-length metaphones to match zero-length metaphones

Location:

qwiz-online-quizzes-and-flashcards/tags/0.00

Files:

• qwiz-online-quizzes-wp-plugin.php (modified) (1 diff)
• qwiz.js (modified) (2 diffs)
• qwizcards.js (modified) (2 diffs)

qwiz-online-quizzes-and-flashcards/tags/0.00/qwiz-online-quizzes-wp-plugin.php

@@ -4 +4 @@
  * Plugin URI: http://dkprojects.net/qwiz
  * Description: Easy online quizzes and flashcards for WordPress
- * Version: beta9 for 3.00
+ * Version: beta10 for 3.00
  * Author: Dan Kirshner
  * Author URI: http://dkprojects.net/qwiz

qwiz-online-quizzes-and-flashcards/tags/0.00/qwiz.js

@@ -1855 +1855 @@
          } else {
             minlength = Math.max (minlength, 3);
-            placeholder = T ('Type %s+ chars, then select from list');
+            placeholder = T ('Type %s+ letters/numbers, then select');
             placeholder = placeholder.replace ('%s', minlength);
          }
@@ -3269 +3269 @@
          console.log ('[find_matching_terms] request.term:', request.term,', entry_metaphone:', entry_metaphone, ', entry_metaphone.length:', entry_metaphone.length);
       }
-      textentry_matches[textentry_i_qwiz] = $.map (current_question_textentry_terms_metaphones[textentry_i_qwiz], function (term_i) {
-         if ((entry_metaphone != '' && term_i[1].indexOf (entry_metaphone) === 0)
-                            || term_i[0].toLowerCase ().indexOf (entry) === 0) {
-            if (debug[5]) {
+      textentry_matches[textentry_i_qwiz] 
+            = $.map (current_question_textentry_terms_metaphones[textentry_i_qwiz], 
+                     function (term_i) {
+         var ok_f;
+         if (entry_metaphone == '') {
+
+            // A number, or perhaps other non-alpha characters.  Match similar
+            // terms.
+            ok_f = term_i[1] == '' 
+                             || term_i[0].toLowerCase ().indexOf (entry) === 0;
+         } else {
+            ok_f = term_i[1].indexOf (entry_metaphone) === 0
+                             || term_i[0].toLowerCase ().indexOf (entry) === 0;
+         }
+         if (ok_f) {
+            if (debug[6]) {
                console.log ('[find_matching_terms] term_i:', term_i);
             }

qwiz-online-quizzes-and-flashcards/tags/0.00/qwizcards.js

@@ -460 +460 @@
    } else {
       minlength = Math.max (minlength, 3);
-      placeholder = T ('Type %s+ chars, then select from list');
+      placeholder = T ('Type %s+ letters/numbers, then select');
       placeholder = placeholder.replace ('%s', minlength);
    }
@@ -2622 +2622 @@
          console.log ('[find_matching_terms] request.term:', request.term, entry_metaphone, entry_metaphone.length);
       }
-      textentry_matches[textentry_i_deck] = $.map (current_card_textentry_terms_metaphones[textentry_i_deck], function (term_i) {
-         if ((entry_metaphone != '' && term_i[1].indexOf (entry_metaphone) === 0)
-                              || term_i[0].toLowerCase ().indexOf (entry) === 0) {
+      textentry_matches[textentry_i_deck] 
+            = $.map (current_card_textentry_terms_metaphones[textentry_i_deck], 
+                     function (term_i) {
+         var ok_f;
+         if (entry_metaphone == '') {
+
+            // A number, or perhaps other non-alpha characters.  Match similar
+            // terms.
+            ok_f = term_i[1] == '' 
+                             || term_i[0].toLowerCase ().indexOf (entry) === 0;
+         } else {
+            ok_f = term_i[1].indexOf (entry_metaphone) === 0
+                             || term_i[0].toLowerCase ().indexOf (entry) === 0;
+         }
+         if (ok_f) {
             if (debug[6]) {
                console.log ('[find_matching_terms] term_i:', term_i);