mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix "SyntaxError: unterminated string literal" on first run

Browse source 
This could happen when migrating prefs from Firefox when the prefs.js
file included a corrupted line.
This commit is contained in:
Dan Stillman 2017-09-14 18:48:00 -04:00
parent 103c16a563
commit 9395af86f7
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
chrome/content/zotero/xpcom/dataDirectory.js
View file

@ -244,12 +244,25 @@ Zotero.DataDirectory = {
"}"
, sandbox);
// remove comments
var prefsJs = yield Zotero.File.getContentsAsync(prefsFile);
prefsJs = prefsJs.replace(/^#[^\r\n]*$/mg, "");
(yield Zotero.File.getContentsAsync(prefsFile))
.split(/\n/)
.filter((line) => {
// Strip comments
return !line.startsWith('#')
// Only process lines in our pref branch
&& line.includes(ZOTERO_CONFIG.PREF_BRANCH);
})
// Process each line individually
.forEach((line) => {
try {
Zotero.debug("Processing " + line);
Components.utils.evalInSandbox(line, sandbox);
}
catch (e) {
Zotero.logError("Error processing prefs line: " + line);
}
});
// evaluate
Components.utils.evalInSandbox(prefsJs, sandbox);
var prefs = sandbox.prefs;
// Check for data dir pref