Grammalecte  Check-in [8a28c07075]

Overview
Comment:[tb][bug] fix dictionary import
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | tb
Files: files | file ages | folders
SHA3-256: 8a28c07075333c85020a9c643230fffd1c3a3ad27eaf5247d4d820f937521ea4
User & Date: olr on 2018-04-06 13:25:09
Other Links: manifest | tags
Context
2018-04-06
13:49
[tb] update dictionaries options check-in: 43a35949e2 user: olr tags: tb, trunk
13:25
[tb][bug] fix dictionary import check-in: 8a28c07075 user: olr tags: tb, trunk
12:39
[build][fx] revert: build with specific permanent profile check-in: 5432f40daf user: olr tags: build, fx, trunk
Changes

Modified gc_lang/fr/tb/content/lex_editor.js from [c35df544df] to [2c8a1c05f2].

421
422
423
424
425
426
427

428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
...
448
449
450
451
452
453
454

455
456
457
458

459
460
461
462
463
464
465

    load: async function () {
        let sJSON = await oFileHandler.loadFile("fr.personal.json");
        this._load(sJSON);
    },

    _load: function (sJSON, bSave=false) {

        if (sJSON) {
            try {
                let oJSON = JSON.parse(sJSON);
                this.oIBDAWG = new IBDAWG(oJSON);    
            }
            catch (e) {
                this.setDictData(0, "#Erreur. Voir la console.");
                console.error(e);
                return;
            }
            if (bSave) {
                oFileHandler.saveFile("fr.personal.json", JSON.stringify(oJSON));
            }
            let lEntry = [];
            for (let aRes of this.oIBDAWG.select()) {
                lEntry.push(aRes);
            }        
            oLexiconTable.fill(lEntry);
            this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate);
................................................................................
        } else {
            this.setDictData(0, "[néant]");
            disableElement("export_button");
        }
    },

    import: function () {

        oFileHandler.loadAs(this._import.bind(this));
    },

    _import: function (sJSON) {

        this._load(sJSON, true);
    },

    setDictData: function (nEntries, sDate) {
        document.getElementById("dic_num_entries").value = nEntries;
        document.getElementById("dic_save_date").value = sDate;
    },







>











|







 







>




>







421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
...
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468

    load: async function () {
        let sJSON = await oFileHandler.loadFile("fr.personal.json");
        this._load(sJSON);
    },

    _load: function (sJSON, bSave=false) {
        //console.log("_load");
        if (sJSON) {
            try {
                let oJSON = JSON.parse(sJSON);
                this.oIBDAWG = new IBDAWG(oJSON);    
            }
            catch (e) {
                this.setDictData(0, "#Erreur. Voir la console.");
                console.error(e);
                return;
            }
            if (bSave) {
                oFileHandler.saveFile("fr.personal.json", sJSON);
            }
            let lEntry = [];
            for (let aRes of this.oIBDAWG.select()) {
                lEntry.push(aRes);
            }        
            oLexiconTable.fill(lEntry);
            this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate);
................................................................................
        } else {
            this.setDictData(0, "[néant]");
            disableElement("export_button");
        }
    },

    import: function () {
        //console.log("import");
        oFileHandler.loadAs(this._import.bind(this));
    },

    _import: function (sJSON) {
        //console.log("_import");
        this._load(sJSON, true);
    },

    setDictData: function (nEntries, sDate) {
        document.getElementById("dic_num_entries").value = nEntries;
        document.getElementById("dic_save_date").value = sDate;
    },