Differential D21710 Diff 59780 src/activities/gletters/gletters.js

Changeset View

Standalone View

View Options

src/activities/gletters/gletters.js

Context not available.
76 76​
77 // register the voices for the locale 77​ // register the voices for the locale
78 GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(GCompris.ApplicationInfo.getVoicesLocale(items.locale))); 78​ GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(GCompris.ApplicationInfo.getVoicesLocale(items.locale)));
79 79​ if(items.levels == undefined)
scagarwalUnsubmitted
Done

undefined should not be used. better use !items.levels

scagarwal: `undefined` should not be used. better use `!items.levels`
80 items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath( 80​ items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
81 items.ourActivity.dataSetUrl + "default-"+locale+".json")); 81​ items.ourActivity.dataSetUrl + "default-"+locale+".json"));
82​ else
83​ items.wordlist.loadFromJSON(items.levels);
82 // If wordlist is empty, we try to load from short locale and if not present again, we switch to default one 84​ // If wordlist is empty, we try to load from short locale and if not present again, we switch to default one
83 var localeUnderscoreIndex = locale.indexOf('_') 85​ var localeUnderscoreIndex = locale.indexOf('_')
84 // probably exist a better way to see if the list is empty 86​ // probably exist a better way to see if the list is empty
Context not available.
93 } 95​ }
94 // If not found, we will use the default file 96​ // If not found, we will use the default file
95 items.wordlist.useDefault = true 97​ items.wordlist.useDefault = true
96 items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath( 98​ if(items.levels == undefined)
scagarwalUnsubmitted
Done

undefined should not be used. better use !items.levels

scagarwal: `undefined` should not be used. better use `!items.levels`
97 items.ourActivity.dataSetUrl + "default-"+localeShort+".json")); 99​ items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
100​ items.ourActivity.dataSetUrl + "default-"+localeShort+".json"));
101​ else
102​ items.wordlist.loadFromJSON(items.levels);
98 // We remove the using of default file for next time we enter this function 103​ // We remove the using of default file for next time we enter this function
99 items.wordlist.useDefault = false 104​ items.wordlist.useDefault = false
100 } 105​ }
Context not available.