diff --git a/config.xml b/config.xml
index 50eb26ba..1c551f19 100644
--- a/config.xml
+++ b/config.xml
@@ -328,21 +328,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/www/js/views/DocumentViews.js b/www/js/views/DocumentViews.js
index 115b62fd..aa12a6b3 100644
--- a/www/js/views/DocumentViews.js
+++ b/www/js/views/DocumentViews.js
@@ -3863,6 +3863,7 @@ define(function (require) {
} else if (fileName.toLowerCase().indexOf(".aic") > 0) {
// project settings file reader is held in ProjectViews - call it
result = ProjectViews.importSettingsFile({model: proj});
+ return result; // in this case, we've already notified the user in ProjectViews::importFail();
} else {
if (isClipboard === true) {
// this came from the clipboard -- we'll need to do some tests to try to identify the content type.
@@ -6273,7 +6274,7 @@ define(function (require) {
// 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) {
+ chooser.getFile('*/*', function (file) {
console.log(file ? file.name : 'canceled');
if (file) {
isClipboard = false;
diff --git a/www/js/views/ProjectViews.js b/www/js/views/ProjectViews.js
index 4b7849c1..759265d1 100644
--- a/www/js/views/ProjectViews.js
+++ b/www/js/views/ProjectViews.js
@@ -189,6 +189,11 @@ define(function (require) {
};
// split out the .aic file into an array (one entry per line of the file)
lines = evt.target.result.split("\n");
+ // first off, a couple of sanity checks:
+ // 1. Is this .aic file an Adapt It project file?
+ // 2. Is this for a file we've already configured or imported (i.e., do the source and target languages
+ // match a project in our project list)?
+
// We've successfully opened an Adapt It project file (.aic) -
// populate our AIM model object with values
// from the .aic file
@@ -297,8 +302,10 @@ define(function (require) {
if (result === false) {
importFail(new Error(errMsg));
+ return false;
} else {
importSuccess();
+ return true;
}
};
diff --git a/www/res/icon/firefoxos/icon-60.png b/www/res/icon/firefoxos/icon-60.png
deleted file mode 100644
index 817ca019..00000000
Binary files a/www/res/icon/firefoxos/icon-60.png and /dev/null differ