summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAdrian Aichner2013-10-28 19:48:12 (EDT)
committer Grant Gayed2013-11-04 15:08:39 (EST)
commit24cebaddf5c12e52cffdf32a40861c8223da03a8 (patch)
tree92aee5f4b5bc16488b1f3bcd1f502bfb1c7804c9
parentfe8e522da264184487e9e5d47a4049fef1c84e66 (diff)
downloadorg.eclipse.orion.client-24cebaddf5c12e52cffdf32a40861c8223da03a8.zip
org.eclipse.orion.client-24cebaddf5c12e52cffdf32a40861c8223da03a8.tar.gz
org.eclipse.orion.client-24cebaddf5c12e52cffdf32a40861c8223da03a8.tar.bz2
import local file... Choose File should allow picking multiple files like drop
Remove final newline introduced by me. Fix Bug420576 --Signed-off-by: Adrian Aichner <adrian.aichner@gmail.com>
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/ImportDialog.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/ImportDialog.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/ImportDialog.js
index 2100cf5..f46f195 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/ImportDialog.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/ImportDialog.js
@@ -34,7 +34,7 @@ define(['i18n!orion/widgets/nls/messages', 'orion/webui/littlelib', 'orion/webui
'</div>' + //$NON-NLS-0$
'</div>' + //$NON-NLS-0$
'</div>' + //$NON-NLS-0$
- '<div class="layoutBlock layoutRight"><input type="file" name="selectedFile" id="selectedFile" class="uploadChooser" /><span id="uploadButton" role="button" class="commandButton disabled" tabindex="0">${Upload}</span></div>' + //$NON-NLS-0$
+ '<div class="layoutBlock layoutRight"><input type="file" multiple name="selectedFile" id="selectedFile" class="uploadChooser" /><span id="uploadButton" role="button" class="commandButton disabled" tabindex="0">${Upload}</span></div>' + //$NON-NLS-0$
'</div>'; //$NON-NLS-0$
ImportDialog.prototype._init = function(options) {
@@ -106,8 +106,10 @@ define(['i18n!orion/widgets/nls/messages', 'orion/webui/littlelib', 'orion/webui
return;
}
if (this.$selectedFile.files && this.$selectedFile.files.length > 0) {
- this.uploadFile(this.$selectedFile.files[0]);
- }
+ for (var i = 0; i < this.$selectedFile.files.length; i++) {
+ this.uploadFile(this.$selectedFile.files[i]);
+ }
+ }
};