Changeset 20024

Timestamp:

09/27/08 12:48:36 (5 years ago)

Author:

janus_wel

Message:

add dictionary property to SITE_DEFINITION.
remove the variable "g:lookupDictionary_dictionary".
switch over dictionary by site definition.

Files:

• lang/javascript/vimperator-plugins/trunk/lookupDictionary.js (modified) (6 diffs)

lang/javascript/vimperator-plugins/trunk/lookupDictionary.js

@@ -14 +14 @@
     url: 'http://eow.alc.co.jp/%s/UTF-8/',
     shortHelp: 'SPACE ALC (英辞郎 on the Web)',
-    xpath: 'id("resultList")'
+    xpath: 'id("resultList")',
+    dictionary: 'en-US',
 },{
     names: ['goo'],
@@ -21 +22 @@
     encode: 'EUC-JP',
     xpath: '//div[@id="incontents"]/*[@class="ch04" or @class="fs14" or contains(@class,"diclst")]',
-    multi: true
+    multi: true,
+    dictionary: 'en-US',
 },{
     names: ['infokanji'],
@@ -27 +29 @@
     shorthelp: 'Infoseek 漢字辞書',
     encode: 'EUC-JP',
-    xpath: '//div[@class="NetDicHead"]'
+    xpath: '//div[@class="NetDicHead"]',
 },{
     names: ['answers'],
     url: 'http://www.answers.com/%s',
     shortHelp: 'Answers.com(英英辞書)',
-    xpath: 'id("firstDs")'
+    xpath: 'id("firstDs")',
+    dictionary: 'en-US',
 }];
 
@@ -78 +81 @@
      */
     setDictionary: function (dict) {
-        this.engine.dictionary = dict;
+        var dictionaries = this.getDictionaryList()
+        for (var i=0, max=dictionaries.length ; i<max ; ++i) {
+            if (dictionaries[i] === dict) {
+                this.engine.dictionary = dict;
+                return dict;
+            }
+        }
+        return null;
     },
 
@@ -148 +158 @@
         {
             completer: function (arg) {
-                if (!spellChecker.dictionary()) return [0, []];
+                if (!spellChecker ||
+                    !dictionary.dictionary ||
+                    !spellChecker.setDictionary(dictionary.dictionary))
+                return [0, []];
 
                 var suggestions = spellChecker.suggest(arg);
@@ -233 +246 @@
 
     var spellChecker = new SpellChecker();
-    var dict = liberator.globalVariables.lookupDictionary_dictionary || 'en-US';
-    var dictionaries = spellChecker.getDictionaryList()
-    for (var i=0, max=dictionaries.length ; i<max ; ++i) {
-        if (dictionaries[i] === dict) spellChecker.setDictionary(dict);
-    }
 
     var isBeginningWith = liberator.globalVariables.lookupDictionary_beginningWith