Deconflicted #176

Author: JPJPJPOPOP

Makefile

@@ -46,7 +46,8 @@ JSFILES= \
 	assets/js/translator.js \
 	assets/js/analyzer.js \
 	assets/js/generator.js \
-	assets/js/sandbox.js
+	assets/js/sandbox.js \
+        assets/js/spellchecker.js
 
 build/js/config.js: $(CONFIG) tools/read-conf.py build/js/.d
 	./tools/read-conf.py -c $< js > $@

assets/css/translation.css

@@ -77,6 +77,36 @@ html[dir='rtl'] #srcLanguages {
     clear: both;
 }
 
+/* Spell Checker */
+
+#spellcheckerInput {
+    display: block;
+    height: 131px;
+    overflow: auto;
+    resize: both;
+}
+
+.spellcheckVisible .spellError {
+    border-bottom: 1px solid #f00;
+}
+
+.popover-content { /* sass-lint:disable-line class-name-format */
+    max-height: 190px;
+    overflow: auto;
+    padding: 0;
+    width: 110%;
+}
+
+.list-group { /* sass-lint:disable-line class-name-format */
+    margin-bottom: 0;
+}
+
+.list-group-item { /* sass-lint:disable-line class-name-format */
+    border: 0;
+    cursor: pointer;
+    padding: 4px 10px;
+}
+
 #translatedWebpage {
     border: 1px solid #ccc;
     border-radius: 4px;

assets/js/localization.js

@@ -13,7 +13,8 @@ var localizedLanguageCodes /*: {[string]: string} */ = {}, localizedLanguageName
 
 /* global config, getPairs, getGenerators, getAnalyzers, persistChoices, getURLParam, cache, ajaxSend, ajaxComplete, sendEvent,
     srcLangs, dstLangs, generators, analyzers, readCache, modeEnabled, populateTranslationList, populateGeneratorList,
-    populateAnalyzerList, analyzerData, generatorData, curSrcLang, curDstLang, restoreChoices, refreshLangList, onlyUnique */
+    populateAnalyzerList, analyzerData, generatorData, curSrcLang, curDstLang, restoreChoices, refreshLangList, onlyUnique
+    getSpellers */
 
 var dynamicLocalizations /*: {[lang: string]: {[string]: string}} */ = {
     'fallback': {
@@ -52,7 +53,12 @@ $(document).ready(function () {
         iso639CodesInverse[language] = code;
     });
 
-    var possibleItems = {'translation': getPairs, 'generation': getGenerators, 'analyzation': getAnalyzers};
+    var possibleItems = {
+        'translation': getPairs,
+        'generation': getGenerators,
+        'analyzation': getAnalyzers,
+        'spellchecker': getSpellers
+    };
     var deferredItems = [getLocale(), getLocales()];
     if(config.ENABLED_MODES) {
         $.each(config.ENABLED_MODES, function () {
@@ -427,3 +433,4 @@ function setLocale(newLocale /*: string */) {
 /*:: import {generatorData, generators, getGenerators, populateGeneratorList} from "./generator.js" */
 /*:: import {analyzerData, analyzers, getAnalyzers, populateAnalyzerList} from "./analyzer.js" */
 /*:: import {cache, persistChoices, readCache, restoreChoices} from "./persistence.js" */
+/*:: import {getSpellers} from "./spellchecker.js" */

assets/js/persistence.js

@@ -3,7 +3,7 @@
 /* exported persistChoices, restoreChoices, cache, readCache */
 
 /* global config, Store, getURLParam, iso639CodesInverse, pairs, refreshLangList populateSecondaryAnalyzerList,
-    populateSecondaryGeneratorList, isSubset, handleNewCurrentLang */
+    populateSecondaryGeneratorList, populateSecondarySpellcheckerList, isSubset, handleNewCurrentLang */
 /* global srcLangs, dstLangs, recentSrcLangs, recentDstLangs, setCurDstLang, setCurSrcLang, setRecentDstLangs, setRecentSrcLangs, setLocale,
     curSrcLang, curDstLang, locale */
 
@@ -73,6 +73,14 @@ function persistChoices(mode /*: string */, updatePermalink /*: ?boolean */) {
                 'generatorInput': $('#morphGeneratorInput').val()
             };
         }
+        else if(mode === 'spellchecker') {
+            objects = {
+                'primarySpellcheckerChoice': $('#primarySpellcheckerMode').val(),
+                'secondarySpellcheckerChoice': $('#secondarySpellcheckerMode').val(),
+                'spellcheckerInput': $('#spellcheckerInput').text(),
+                'instantChecking': $('#instantChecking').val()
+            };
+        }
         else if(mode === 'localization') {
             objects = {
                 'locale': $('.localeSelect').val()
@@ -122,6 +130,11 @@ function persistChoices(mode /*: string */, updatePermalink /*: ?boolean */) {
             urlParams.push('choice=' + encodeURIComponent($('#secondaryGeneratorMode').val()));
             qVal = $('#morphGeneratorInput').val();
         }
+        else if(hash === '#spellchecker' && $('#secondarySpellcheckerMode').val()) {
+            urlParams = [];
+            urlParams.push('choice=' + encodeURIComponent($('#secondarySpellcheckerMode').val()));
+            qVal = $('#spellcheckerInput').text();
+        }
 
         var qName /*: string */ = HASH_URL_MAP[hash];
 
@@ -266,6 +279,33 @@ function restoreChoices(mode /*: string */) {
             $('#morphGeneratorInput').val(decodeURIComponent(getURLParam('qG')));
         }
     }
+    else if(mode === 'spellchecker') {
+        if(store.able()) {
+            var primarySpellcheckerChoice = store.get('primarySpellcheckerChoice', ''),
+                secondarySpellcheckerChoice = store.get('secondarySpellcheckerChoice', '');
+            if(store.has('primarySpellcheckerChoice') && store.has('secondarySpellcheckerChoice')) {
+                $('#primarySpellcheckerMode option[value="' + primarySpellcheckerChoice + '"]').prop('selected', true);
+                populateSecondarySpellcheckerList();
+                $('#secondarySpellcheckerMode option[value="' + secondarySpellcheckerChoice + '"]').prop('selected', true);
+            }
+            else {
+                populateSecondarySpellcheckerList();
+            }
+            if(store.has('spellcheckerInput')) {
+                $('#spellcheckerInput').text(store.get('spellcheckerInput'));
+                $('#instantChecking').prop('checked', store.get('instantChecking', true));
+            }
+        }
+
+        if(getURLParam('choice')) {
+            choice = getURLParam('choice').split('-');
+            $('#primarySpellcheckerMode option[value="' + choice[0] + '"]').prop('selected', true);
+            populateSecondarySpellcheckerList();
+            if(choice.length === 2) {
+                $('#secondarySpellcheckerMode option[value="' + choice.join('-') + '"]').prop('selected', true);
+            }
+        }
+    }
     else if(mode === 'localization') {
         if(store.able()) {
             setLocale(store.get('locale', ''));
@@ -289,5 +329,6 @@ function restoreChoices(mode /*: string */) {
 /*:: import {iso639Codes, iso639CodesInverse, locale, setLocale} from "./localization.js" */
 /*:: import {populateSecondaryGeneratorList} from "./generator.js" */
 /*:: import {populateSecondaryAnalyzerList} from "./analyzer.js" */
+/*:: import {populateSecondarySpellcheckerList} from "./spellchecker.js" */
 /*:: import {getURLParam, isSubset} from "./util.js" */
 /*:: import {Store} from "./store.js" */