diff --git a/www/js/views/DocumentViews.js b/www/js/views/DocumentViews.js
index 5cc8beb0..f91a4988 100644
--- a/www/js/views/DocumentViews.js
+++ b/www/js/views/DocumentViews.js
@@ -19,7 +19,6 @@ define(function (require) {
i18n = require('i18n'),
tplLoadingPleaseWait = require('text!tpl/LoadingPleaseWait.html'),
tplImportDoc = require('text!tpl/CopyOrImport.html'),
- tplImportVerify = require('text!tpl/ImportVerify.html'),
tplExportDoc = require('text!tpl/Export.html'),
tplExportContent = require('text!tpl/ExportContent.html'),
tplExportFormat = require('text!tpl/ExportChooseFormat.html'),
@@ -252,13 +251,11 @@ define(function (require) {
var importSuccess = function () {
console.log("importSuccess()");
// hide unneeded UI elements
- $("#mobileSelect").html(""); // remove mobile UI (some duplicate IDs)
- $("#loading").hide();
- $("#waiting").hide();
- $("#pb-bg").hide();
- $("#browserSelect").hide(); // hide the "choose file" button (browser)
- // show the import status
- $("#browserGroup").show();
+ $("#LoadingStatus").hide();
+ // show the import status and "change the filename" UI
+ $("#grpControls").show();
+ $("#OKCancelButtons").show();
+ $("#selectControls").hide();
// Did we just import the KB?
if (isKB === true) {
// KB file -- only display success status
@@ -270,7 +267,7 @@ define(function (require) {
// not a KB file:
// for regular document files, we did our best to guess a book name --
// allow the user to change it if they want
- $("#status").html(Handlebars.compile(tplImportVerify));
+ $("#verifyNameControls").show();
$("#lblDirections").html(i18n.t("view.dscStatusImportSuccess", {document: fileName}));
$("#BookName").val(bookName);
}
@@ -294,8 +291,7 @@ define(function (require) {
$("#pb-bg").hide();
}
// display the OK button
- $("#btnOK").removeClass("hide");
- $("#btnOK").removeAttr("disabled");
+ $("#OKCancelButtons").show();
};
// callback method for when the FileReader has finished loading in the file
@@ -6227,8 +6223,8 @@ define(function (require) {
////
events: {
"change #selFile": "browserImportDocs",
- "click .topcoat-list__item": "mobileImportDocs",
- "click #btnClipboard": "onBrowserClipboard",
+ "click #btnBrowse": "onBtnBrowse",
+ "click #btnClipboard": "onBtnClipboard",
"click #btnCancel": "onCancel",
"click #OK": "onOK"
},
@@ -6252,8 +6248,8 @@ define(function (require) {
}
console.log("importfromURL: importing file: " + fileName);
// replace the selection UI with the import UI
- $("#browserGroup").hide();
- $("#mobileSelect").html(Handlebars.compile(tplLoadingPleaseWait));
+ $("#selectControls").hide();
+ $("#LoadingStatus").html(Handlebars.compile(tplLoadingPleaseWait));
// Import can take a while, and potentially hang. Provide a way to cancel the operation
$("#btnCancel").show();
$("#status").html(i18n.t("view.dscStatusReading", {document: fileName}));
@@ -6268,73 +6264,113 @@ define(function (require) {
var fileindex = 0;
var files = event.currentTarget.files;
fileCount = files.length;
- // each of the files items is a file object already; there's no need to use
- // the file plugin like we need to below. Just call importFile() directly.
- while (fileindex < fileCount) {
- fileName = files[fileindex].name;
- importFile(files[fileindex], this.model);
- fileindex++;
+ if (fileCount > 0) {
+ isClipboard = false;
+ // replace the selection UI with the import UI
+ $("#selectControls").hide();
+ $("#LoadingStatus").html(Handlebars.compile(tplLoadingPleaseWait));
+ // Import can take a while, and potentially hang. Provide a way to cancel the operation
+ $("#btnCancel").show();
+ // each of the files items is a file object already; call importFile() directly.
+ while (fileindex < fileCount) {
+ fileName = files[fileindex].name;
+ importFile(files[fileindex], this.model);
+ fileindex++;
+ }
}
},
- // Handler for when the user clicks the "clipboard text" option in the browser;
+ // User clicked on the (mobile) Select file button --
+ // call getFile() on the chooser plugin, and if we get a file back, import it
+ onBtnBrowse: function () {
+ var model = this.model;
+ chooser.getFile('text/*', function (file) {
+ console.log(file ? file.name : 'canceled');
+ if (file) {
+ isClipboard = false;
+ // replace the selection UI with the import UI
+ $("#selectControls").hide();
+ $("#LoadingStatus").html(Handlebars.compile(tplLoadingPleaseWait));
+ // Import can take a while, and potentially hang. Provide a way to cancel the operation
+ $("#btnCancel").show();
+ fileName = file.name;
+ window.resolveLocalFileSystemURL(file.uri,
+ function (entry) {
+ entry.file(
+ function (oFile) {
+ $("#status").html(i18n.t("view.dscStatusReading", {document: fileName}));
+ importFile(oFile, model);
+ },
+ function (error) {
+ console.log("FileEntry.file error: " + error.code);
+ }
+ );
+ },
+ function (error) {
+ console.log("resolveLocalFileSystemURL error: " + error.code);
+ });
+ // importFile(file, model);
+ }
+ }, function (error) {
+ // error in clipboard retrieval -- skip entry
+ // (seen this when there's data on the clipboard that isn't text/plain)
+ console.log("Error retrieving clipboard data:" + error);
+ DirsRemaining--;
+ });
+ },
+ // Handler for when the user clicks the "clipboard text" option;
// copy the clipboard contents, and if they're not empty, import the contents as a file
- onBrowserClipboard: function() {
+ onBtnClipboard: function () {
var model = this.model;
- navigator.clipboard.readText().then(
+ // Are we in the browser or on a mobile device?
+ if (device && (device.platform !== "browser")) {
+ // mobile device
+ cordova.plugins.clipboard.paste(function (text) {
+ if (text !== null && text.length > 0) {
+ // paste call returned AND there's something on the clipboard
+ console.log("Clipboard contents: " + text);
+ isClipboard = true;
+ // replace the selection UI with the import UI
+ $("#selectControls").hide();
+ $("#LoadingStatus").html(Handlebars.compile(tplLoadingPleaseWait));
+ // Import can take a while, and potentially hang. Provide a way to cancel the operation
+ $("#btnCancel").show();
+ // EDB 12/19/2023: ? not sure if still true - ios has wkwebview now? need to test
+ // EDB 5/29 HACK: clipboard text -- create a blob instead of a file and read it:
+ // Cordova-ios uses an older web view that has a buggy / outdated JS engine w.r.t the File object;
+ // it places the contents in the name attribute. The FileReader does
+ // accept a Blob (the File object derives from Blob), which is why importFile works.
+ console.log("Clipboard selected. Creating ad hoc file from text.");
+ var clipboardFile = new Blob([text], {type: "text/plain"});
+ $("#status").html(i18n.t("view.dscStatusReading", {document: i18n.t("view.lblCopyClipboardText")}));
+ fileName = i18n.t("view.lblText") + "-" + (window.Application.generateUUID());
+ importFile(clipboardFile, model);
+ } else {
+ console.log("No data to import");
+ }
+ }, function (error) {
+ // error in clipboard retrieval -- skip entry
+ // (seen this when there's data on the clipboard that isn't text/plain)
+ console.log("Error retrieving clipboard data:" + error);
+ });
+ } else {
+ // browser
+ navigator.clipboard.readText().then(
(clipText) => {
if (clipText.length > 0) {
isClipboard = true;
console.log("Non-empty clipboard selected. Creating ad hoc file from text.");
- var clipboardFile = new Blob([clipText], {type: "text/plain"});
+ // replace the selection UI with the import UI
+ $("#selectControls").hide();
+ $("#LoadingStatus").html(Handlebars.compile(tplLoadingPleaseWait));
+ // Import can take a while, and potentially hang. Provide a way to cancel the operation
+ $("#btnCancel").show();
$("#status").html(i18n.t("view.dscStatusReading", {document: i18n.t("view.lblCopyClipboardText")}));
fileName = i18n.t("view.lblText") + "-" + (window.Application.generateUUID());
importFile(clipboardFile, model);
+ } else {
+ console.log("No data to import");
}
});
- },
- // Handler for the when the user clicks a document in the list to import (mobile only) -
- // we gather the file path from the selection, then reconstitute file objects
- // from the path using the cordova-plugin-file / filesystem API.
- mobileImportDocs: function (event) {
- // replace the selection UI with the import UI
- $("#mobileSelect").html(Handlebars.compile(tplLoadingPleaseWait));
- // Import can take a while, and potentially hang. Provide a way to cancel the operation
- $("#btnCancel").show();
- // find all the selected file
- var index = $(event.currentTarget).attr('id').trim();
- var model = this.model;
- if (index === "clipboard") {
- isClipboard = true;
- // EDB 5/29 HACK: clipboard text -- create a blob instead of a file and read it:
- // Cordova-ios uses an older web view that has a buggy / outdated JS engine w.r.t the File object;
- // it places the contents in the name attribute. The FileReader does
- // accept a Blob (the File object derives from Blob), which is why importFile works.
- console.log("Clipboard selected. Creating ad hoc file from text.");
- var clipboardFile = new Blob([cbData], {type: "text/plain"});
- $("#status").html(i18n.t("view.dscStatusReading", {document: i18n.t("view.lblCopyClipboardText")}));
- fileName = i18n.t("view.lblText") + "-" + (window.Application.generateUUID());
- importFile(clipboardFile, model);
- } else {
- isClipboard = false;
- // regular file
- console.log("index: " + index + ", FileList[index]: " + fileList[index]);
- // request the persistent file system
- window.resolveLocalFileSystemURL(fileList[index],
- function (entry) {
- entry.file(
- function (file) {
- $("#status").html(i18n.t("view.dscStatusReading", {document: file.name}));
- fileName = file.name;
- importFile(file, model);
- },
- function (error) {
- console.log("FileEntry.file error: " + error.code);
- }
- );
- },
- function (error) {
- console.log("resolveLocalFileSystemURL error: " + error.code);
- });
}
},
// Handler for the Cancel button (in the loading / please wait template) --
@@ -6464,21 +6500,12 @@ define(function (require) {
window.location.replace("");
}
},
- // Show event handler (from MarionetteJS):
- // - if we're running in a mobile device, we'll use the cordova-plugin-file
- // API to search through the device directories and add any valid files
- // to a table grid
- // - If we're running in a mobile device, also test the clipboard for any text.
- // If there is any, add an option to create a new "book" from the clipboard text.
- // - If we're in a browser, just show the html to allow
- // for file selection
+ // Show event handler (from MarionetteJS)
onShow: function () {
var punctExp = "";
-// $("#selFile").attr("accept", ".xml,.usfm");
$("#title").html(i18n.t('view.lblImportDocuments'));
- $("#lblDirections").html(i18n.t('view.dscImportDocuments'));
- $(".topcoat-progress-bar").hide();
- $("#OK").attr("disabled", true);
+ $("#OKCancelButtons").hide();
+ $("#verifyNameControls").hide();
// build the regular expression to identify punctuation
// (this allows us to split out punctuation as separate tokens when importing
punctExp = "[\\s";
@@ -6510,116 +6537,12 @@ define(function (require) {
// reset the isKB flag
isKB = false;
isGlossKB = false;
-
+ // show either the browser or mobile selection buttons
if (this.isLoadingFromURL === false) {
if (device && (device.platform !== "browser")) {
- // running on device -- use cordova file plugin to select file
- $("#browserGroup").hide();
- $("#mobileSelect").html(Handlebars.compile(tplLoadingPleaseWait));
- var localURLs = [
- cordova.file.documentsDirectory,
- cordova.file.sharedDirectory,
- cordova.file.dataDirectory,
- cordova.file.syncedDataDirectory
- ];
- var DirsRemaining = localURLs.length + 1; // + clipboard text
- var index = 0;
- var i;
- var statusStr = "";
- // running on device -- check the clipboard for text
- // (note that we have to call paste to test for non-empty -- on iOS, testing for data
- // on the clipboard/pasteboard was only added in ios 10.)
- cordova.plugins.clipboard.paste(function (text) {
- DirsRemaining--; // done checking -- remove the placeholder "directory"
- console.log("Clipboard paste returned. DirsRemaining = " + DirsRemaining);
- if (text !== null && text.length > 0) {
- console.log("Clipboard contents: " + text);
- // something on the clipboard -- add an option to paste the text as a new Book
- statusStr += "
" + i18n.t('view.lblCopyClipboardText') + "
";
- index++;
- }
- cbData = text; // save, so we only call this once
- // This function can return first if there's a lot of data on the clipboard (think: xml file).
- // Check to see if we're done parsing the directory structure, and refresh the UI if so.
- if (DirsRemaining <= 0) {
- if (statusStr.length > 0) {
- // display the list of files we found
- $("#mobileSelect").html("
" + i18n.t('view.dscImportDocuments') + "
" + statusStr + "
");
- $("#tb").html(statusStr);
- } else {
- // nothing to select -- inform the user
- $("#mobileSelect").html("
" + i18n.t('view.dscNoDocumentsFound') + "
");
- }
- }
- }, function (error) {
- // error in clipboard retrieval -- skip entry
- // (seen this when there's data on the clipboard that isn't text/plain)
- console.log("Error retrieving clipboard data:" + error);
- DirsRemaining--;
- });
- var addFileEntry = function (entry) {
- console.log("addFileEntry: entry");
- var dirReader = entry.createReader();
- dirReader.readEntries(
- function (entries) {
- var fileStr = "";
- var i;
- for (i = 0; i < entries.length; i++) {
- console.log("addFileEntry: looking at:" + entries[i].fullPath);
- if (entries[i].isDirectory === true) {
- // Recursive -- call back into this subdirectory
- DirsRemaining = DirsRemaining + 1;
- console.log("addFileEntry: Directory found. New DirsRemaining = " + DirsRemaining);
- addFileEntry(entries[i]);
- } else {
- console.log(entries[i].fullPath);
- if ((entries[i].fullPath.match(/download/i)) || (entries[i].fullPath.match(/inbox/i)) || (entries[i].fullPath.match(/document/i)) || entries[i].fullPath.lastIndexOf('/') === 0) {
- // only take files from the Download or Document directories
- if ((entries[i].name.toLowerCase().indexOf(".txt") > 0) ||
- (entries[i].name.toLowerCase().indexOf(".tmx") > 0) ||
- (entries[i].name.toLowerCase().indexOf(".usx") > 0) ||
- (entries[i].name.toLowerCase().indexOf(".usfm") > 0) ||
- (entries[i].name.toLowerCase().indexOf(".sfm") > 0) ||
- (entries[i].name.toLowerCase().indexOf(".xml") > 0)) {
- fileList[index] = entries[i].toURL();
- fileStr += "
" + entries[i].fullPath + "
";
- index++;
- }
- }
- }
- }
- statusStr += fileStr;
- DirsRemaining = DirsRemaining - 1;
- console.log("addFileEntry: finished loop. DirsRemaining = " + DirsRemaining);
- if (DirsRemaining <= 0) {
- if (statusStr.length > 0) {
- // display the list of files we found
- $("#mobileSelect").html("
" + i18n.t('view.dscImportDocuments') + "
" + statusStr + "
");
- $("#tb").html(statusStr);
- } else {
- // nothing to select -- inform the user
- $("#mobileSelect").html("
";
- }
- );
- };
- var addError = function (error) {
- // log the error and continue processing
- console.log("getDirectory error: " + error.code);
- DirsRemaining--;
- };
- for (i = 0; i < localURLs.length; i++) {
- if (localURLs[i] !== null && localURLs[i].length > 0) {
- window.resolveLocalFileSystemURL(localURLs[i], addFileEntry, addError);
- } else {
- DirsRemaining--;
- }
- }
+ // running on device -- use choooser plugin to select file
+ $("#browserSelect").hide();
+ // chooser.getFile('text/*');
} else {
// running in browser -- use html to select file
$("#mobileSelect").hide();
diff --git a/www/js/views/ProjectViews.js b/www/js/views/ProjectViews.js
index 5f0ef525..b417e6e6 100644
--- a/www/js/views/ProjectViews.js
+++ b/www/js/views/ProjectViews.js
@@ -358,81 +358,17 @@ define(function (require) {
// - For browsers, uses the html element to allow the user
// to select an .aic file from the local PC.
onShow: function () {
- $("#selFile").attr("accept", ".aic");
- $("#selFile").removeAttr("multiple");
$("#title").html(i18n.t('view.lblCopyProject'));
$(".topcoat-progress-bar").hide();
$("#lblDirections").html(i18n.t('view.dscCopyProjInstructions'));
// cheater way to tell if running on mobile device
if (device && (device.platform !== "browser")) {
- // running on device -- use cordova file plugin to select file
- $("#browserGroup").hide();
- $("#mobileSelect").html(Handlebars.compile(tplLoadingPleaseWait));
- var DirsRemaining = window.Application.localURLs.length;
- var index = 0;
- var i;
- var statusStr = "";
- var addFileEntry = function (entry) {
- var dirReader = entry.createReader();
- dirReader.readEntries(
- function (entries) {
- var fileStr = "";
- var i;
- for (i = 0; i < entries.length; i++) {
- if (entries[i].isDirectory === true) {
- // Recursive -- call back into this subdirectory
- DirsRemaining++;
- addFileEntry(entries[i]);
- } else {
- if (entries[i].name.toLowerCase().indexOf(".aic") > 0) {
- fileList[index] = entries[i].toURL();
- fileStr += "
";
- }
- );
- };
- var addError = function (error) {
- // log the error and continue processing
- console.log("getDirectory error: " + error.code);
- DirsRemaining--;
- };
- for (i = 0; i < window.Application.localURLs.length; i++) {
- if (window.Application.localURLs[i] === null || window.Application.localURLs[i].length === 0) {
- DirsRemaining--;
- continue; // skip blank / non-existent paths for this platform
- }
- window.resolveLocalFileSystemURL(window.Application.localURLs[i], addFileEntry, addError);
- }
+ // running on device -- use cordova chooser plugin to select file
+ $("#browserSelect").hide();
} else {
// running in browser -- use html to select file
$("#mobileSelect").hide();
- $("#btnClipboard").hide(); // for now, no clipboard .aic import for the browser
}
- $("#OK").attr("disabled", true);
}
}),
diff --git a/www/locales/en/translation.json b/www/locales/en/translation.json
index 2ac3e387..136b805f 100644
--- a/www/locales/en/translation.json
+++ b/www/locales/en/translation.json
@@ -201,7 +201,7 @@
"dscErrCannotFindChapter": "cannot find chapter number.",
"dscErrImportFirstChapterFirst": "this is a collaboration document; please import the first chapter before importing this chapter.",
"dscNoDocumentsFound": "No available files found on device. Please copy files onto the device and try again.",
- "lblSelect": "Select Files",
+ "lblSelect": "Select File",
"ttlReset": "Reset Adapt It Mobile",
"dscReset": "WARNING: this will clear all documents and projects, as well as the Knowledge Base. Are you sure you want to reset Adapt It Mobile?",
"dscAdaptComplete": "Adaptation of __chapter__ complete.",
@@ -279,7 +279,7 @@
"lblPortion": "(portion)",
"dscBookName": "Here is a suggested book name for this document. You can keep this name, or change it to something more meaningful.",
"lblBookName": "Book Name:",
- "lblCopyClipboardText": "Clipboard text...",
+ "lblCopyClipboardText": "Import Clipboard text",
"lblText": "Text",
"lblShowPreviewBtn": "Show Preview Button",
"lblShowPreview": "Show Preview",
diff --git a/www/locales/fr/translation.json b/www/locales/fr/translation.json
index b26c44f4..012d140d 100644
--- a/www/locales/fr/translation.json
+++ b/www/locales/fr/translation.json
@@ -201,7 +201,7 @@
"dscErrCannotFindChapter": "ne peut pas trouver le numéro de chapitre.",
"dscErrImportFirstChapterFirst": "il s'agit d'un document de collaboration; importe le premier chapitre avant d'importer ce chapitre.",
"dscNoDocumentsFound": "Aucun fichier disponible trouvé sur l'appareil. Se il vous plaît copier des fichiers sur le périphérique et réessayez.",
- "lblSelect": "Sélectionnez documents",
+ "lblSelect": "Sélectionnez document",
"ttlReset": "Réinitialiser Adapt It Mobile",
"dscReset": "AVERTISSEMENT: ce qui effacera tous les documents et de projets, ainsi que la Base de Connaissances. Etes-vous sûr que vous voulez réinitialiser Adapt It Mobile?",
"dscAdaptComplete": "Traduction de __chapter__ est maintenant terminée.",
diff --git a/www/locales/pt/translation.json b/www/locales/pt/translation.json
index c362b49d..f8a43fd9 100644
--- a/www/locales/pt/translation.json
+++ b/www/locales/pt/translation.json
@@ -201,7 +201,7 @@
"dscErrCannotFindChapter": "Não é possível encontrar informações do capítulo.",
"dscErrImportFirstChapterFirst": "este é um documento de colaboração; importe o primeiro capítulo antes de importar este capítulo.",
"dscNoDocumentsFound": "Nenhum arquivo disponível encontrado no dispositivo. Copie os arquivos para o dispositivo e tente novamente.",
- "lblSelect": "Selecionar arquivos",
+ "lblSelect": "Selecionar arquivo",
"ttlReset": "Restabelecer Adapt It Mobile",
"dscReset": "AVISO: isso limpará todos os documentos e projetos, bem como a Base de Conhecimento. Você tem certeza?",
"dscAdaptComplete": "Adaptação de __chapter__ completo.",
diff --git a/www/tpl/CopyOrImport.html b/www/tpl/CopyOrImport.html
index aa309ba0..24b01dea 100644
--- a/www/tpl/CopyOrImport.html
+++ b/www/tpl/CopyOrImport.html
@@ -1,5 +1,6 @@
{{! CopyOrImport.html
- Template for rendering the Copy Project and Import Documents pages.
+ Template for rendering the Copy Project and Import Documents pages. Includes selection buttons
+ for both browser (using input type=file) and mobile (regular button w/cordova chooser plugin logic in js files)
Used by ProjectViews.js and DocumentViews.js.
}}
@@ -19,13 +20,18 @@
\ No newline at end of file
diff --git a/www/tpl/ImportVerify.html b/www/tpl/ImportVerify.html
deleted file mode 100644
index ea08d4bb..00000000
--- a/www/tpl/ImportVerify.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{{! ImportVerify.html
- For verifying / correcting the book name at the end of a document import.
- Used by DocumentViews.js.
-}}
-
-