From f0e9c8bfbae047ccfb1912e289d5720481c6454b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 28 Aug 2019 07:44:35 -0400
Subject: [PATCH] Fx60: Fix Scaffold

Fixes #1727
---
 chrome/content/scaffold/ace/ace.html   |  9 +++
 chrome/content/scaffold/scaffold.xul   |  6 +-
 chrome/content/scaffold/translators.js | 82 ++++++++++++--------------
 3 files changed, 50 insertions(+), 47 deletions(-)
 create mode 100644 chrome/content/scaffold/ace/ace.html
diff --git a/chrome/content/scaffold/ace/ace.html b/chrome/content/scaffold/ace/ace.html
new file mode 100644
index 0000000000..cbd0cc36a6
--- /dev/null
+++ b/chrome/content/scaffold/ace/ace.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<script type="text/javascript" src="chrome://scaffold/content/ace/ace.js"></script>
+		<script type="text/javascript" src="chrome://scaffold/content/ace/mode-javascript.js"></script>
+		<script type="text/javascript" src="chrome://scaffold/content/aceWrapper.js"></script>
+	</head>
+	<body id="body"></body>
+</html>
\ No newline at end of file
diff --git a/chrome/content/scaffold/scaffold.xul b/chrome/content/scaffold/scaffold.xul
index 77647141b9..e79ec9d023 100644
--- a/chrome/content/scaffold/scaffold.xul
+++ b/chrome/content/scaffold/scaffold.xul
@@ -190,7 +190,7 @@
 								</menupopup>
 							</toolbarbutton>
 						</hbox>
-						<iframe src="data:text/html,%3C!DOCTYPE%20html%20PUBLIC%20%22-//W3C//DTD%20XHTML%201.1//EN%22%20%22http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd%22%3E%3Chtml%20xmlns=%22http://www.w3.org/1999/xhtml%22%3E%3Chead%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/ace.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/mode-javascript.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/aceWrapper.js%22%3E%3C/script%3E%3C/head%3E%3Cbody%20id=%22body%22%3E%3C/body%3E%3C/html%3E" id="editor-code" flex="1"/>
+						<iframe src="chrome://scaffold/content/ace/ace.html" id="editor-code" flex="1"/>
 						<hbox id="editor-external-box" align="center">
 							<checkbox id="checkbox-editor-external"/>
 							<label class="label-metadata" value="&scaffold.editor.external.label;" control="checkbox-editor-external"/>
@@ -198,10 +198,10 @@
 						</vbox>
 					</tabpanel>
 					<tabpanel flex="1" id="tabpanel-import">
-						<iframe src="data:text/html,%3C!DOCTYPE%20html%20PUBLIC%20%22-//W3C//DTD%20XHTML%201.1//EN%22%20%22http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd%22%3E%3Chtml%20xmlns=%22http://www.w3.org/1999/xhtml%22%3E%3Chead%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/ace.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/mode-javascript.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/aceWrapper.js%22%3E%3C/script%3E%3C/head%3E%3Cbody%20id=%22body%22%3E%3C/body%3E%3C/html%3E" id="editor-import" flex="1"/>
+						<iframe src="chrome://scaffold/content/ace/ace.html" id="editor-import" flex="1"/>
 					</tabpanel>
 					<tabpanel flex="1" id="tabpanel-tests">
-						<iframe src="data:text/html,%3C!DOCTYPE%20html%20PUBLIC%20%22-//W3C//DTD%20XHTML%201.1//EN%22%20%22http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd%22%3E%3Chtml%20xmlns=%22http://www.w3.org/1999/xhtml%22%3E%3Chead%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/ace.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/ace/mode-javascript.js%22%3E%3C/script%3E%3Cscript%20type=%22text/javascript%22%20src=%22chrome://scaffold/content/aceWrapper.js%22%3E%3C/script%3E%3C/head%3E%3Cbody%20id=%22body%22%3E%3C/body%3E%3C/html%3E" id="editor-tests" flex="1"/>
+						<iframe src="chrome://scaffold/content/ace/ace.html" id="editor-tests" flex="1"/>
 					</tabpanel>
 					<tabpanel flex="1" id="tabpanel-testing">
 						<vbox flex="1"><hbox><description>&scaffold.testing.description;</description></hbox>
diff --git a/chrome/content/scaffold/translators.js b/chrome/content/scaffold/translators.js
index b9a991beab..606e6579e1 100644
--- a/chrome/content/scaffold/translators.js
+++ b/chrome/content/scaffold/translators.js
@@ -22,52 +22,46 @@ var Scaffold_Translators = {
 		var dir = this.getDirectory();
 		var numLoaded = 0;
 		var deletedTranslators = new Set(this._translatorFiles.keys());
-		await Zotero.File.iterateDirectory(dir, function* (iterator) {
-			while (true) {
-				let entries = yield iterator.nextBatch(50);
-				if (!entries.length) break;
-				for (let entry of entries) {
-					if (entry.isDir || entry.name.startsWith('.') || !entry.name.endsWith('.js')) {
-						continue;
-					}
-					
-					deletedTranslators.delete(entry.name);
-					
-					try {
-						let fmtime;
-						if ('winLastWriteDate' in entry) {
-							fmtime = entry.winLastWriteDate.getTime();
-						}
-						else {
-							fmtime = (yield OS.File.stat(entry.path)).lastModificationDate.getTime();
-						}
-						let translatorID = this._translatorFiles.get(entry.name);
-						let loadFile = true;
-						// If translator is already loaded, see if mtime has changed
-						if (translatorID) {
-							let mtime = this._translators.get(translatorID).mtime;
-							if (mtime == fmtime) {
-								loadFile = false;
-							}
-						}
-						if (loadFile) {
-							let translator = yield Zotero.Translators.loadFromFile(entry.path);
-							this._translators.set(
-								translator.translatorID,
-								{
-									translator,
-									filename: entry.name,
-									mtime: fmtime,
-								}
-							);
-							this._translatorFiles.set(entry.name, translator.translatorID);
-							numLoaded++;
-						}
-					}
-					catch (e) {
-						Zotero.logError(e);
+		await Zotero.File.iterateDirectory(dir, async function (entry) {
+			if (entry.isDir || entry.name.startsWith('.') || !entry.name.endsWith('.js')) {
+				return;
+			}
+			
+			deletedTranslators.delete(entry.name);
+			
+			try {
+				let fmtime;
+				if ('winLastWriteDate' in entry) {
+					fmtime = entry.winLastWriteDate.getTime();
+				}
+				else {
+					fmtime = (await OS.File.stat(entry.path)).lastModificationDate.getTime();
+				}
+				let translatorID = this._translatorFiles.get(entry.name);
+				let loadFile = true;
+				// If translator is already loaded, see if mtime has changed
+				if (translatorID) {
+					let mtime = this._translators.get(translatorID).mtime;
+					if (mtime == fmtime) {
+						loadFile = false;
 					}
 				}
+				if (loadFile) {
+					let translator = await Zotero.Translators.loadFromFile(entry.path);
+					this._translators.set(
+						translator.translatorID,
+						{
+							translator,
+							filename: entry.name,
+							mtime: fmtime,
+						}
+					);
+					this._translatorFiles.set(entry.name, translator.translatorID);
+					numLoaded++;
+				}
+			}
+			catch (e) {
+				Zotero.logError(e);
 			}
 		}.bind(this));
 		
