suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TextEncoder is no longer required for OS.File.writeAtomic()

Browse Source
This commit is contained in:
Dan Stillman 2015-05-31 23:01:34 -04:00
parent 4fd65fec4c
commit 55d27273fb
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome/content/zotero/xpcom/file.js
View File

@ -340,29 +340,20 @@ Zotero.File = new function(){
path = path.path; path = path.path;
} }
if (typeof data == 'string' && (!charset || charset.toLowerCase() == 'utf-8')) { if (typeof data == 'string') {
let encoder = new TextEncoder();
let array = encoder.encode(data);
return Zotero.Promise.resolve(OS.File.writeAtomic( return Zotero.Promise.resolve(OS.File.writeAtomic(
path, path,
array, data,
{ {
tmpPath: OS.Path.join( tmpPath: OS.Path.join(
Zotero.getTempDirectory().path, Zotero.getTempDirectory().path,
OS.Path.basename(path) + ".tmp" OS.Path.basename(path) + ".tmp"
) ),
encoding: charset ? charset.toLowerCase() : 'utf-8'
} }
)); ));
} }
// Convert text data to stream
if(!(data instanceof Components.interfaces.nsIInputStream)) {
var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
converter.charset = charset ? Zotero.CharacterSets.getName(charset) : "UTF-8";
data = converter.convertToInputStream(data);
}
var deferred = Zotero.Promise.defer(); var deferred = Zotero.Promise.defer();
var os = FileUtils.openSafeFileOutputStream(new FileUtils.File(path)); var os = FileUtils.openSafeFileOutputStream(new FileUtils.File(path));
NetUtil.asyncCopy(data, os, function(inputStream, status) { NetUtil.asyncCopy(data, os, function(inputStream, status) {