LSNBLDR-774; handle multiple file in upload (sakaiproject#3872)

jbbadano · Feb 7, 2017 · cf0a430 · cf0a430
1 parent 0630728
commit cf0a430
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/lessonbuilder/tool/src/webapp/js/show-page.js b/lessonbuilder/tool/src/webapp/js/show-page.js
@@ -3005,9 +3005,9 @@ $(function() {
 		} else if ($('#mm-file-input-itemname').size() === 0) {
 		    var nameInput = $('.mm-file-input-names').first();
 		    nameInput.attr('id', 'mm-file-input-itemname');
-		    nameInput.after('<label></label>');
-		    nameInput.next().text($('#mm-name').prev().text());
-		    nameInput.next().attr('for','mm-file-input-itemname');
+		    nameInput.before('<label></label>');
+		    nameInput.prev().text($('#mm-name').prev().text());
+		    nameInput.prev().attr('for','mm-file-input-itemname');
 		}
 	    }
 	}
@@ -3027,15 +3027,21 @@ $(function() {
 		var newStuff = '<span class="mm-file-input-name"></span> <span title="' + msg('simplepage.remove_from_uploads') + '"><span class="mm-file-input-delete fa fa-times"></span></span>';
 		// only do this if we're doing names
 		if (doingNames) {
-		    newStuff = newStuff + '<input class="mm-file-input-names" type="text" size="30" maxlength="255"/>';
+		    for (i = 0; i < lastInput[0].files.length; i++) {
+			newStuff = newStuff + '<input class="mm-file-input-names" type="text" size="30" maxlength="255"/>';
+		    }
 		}
 		// now need annotation on the next input, so remove the old
 		$('.add-another-file').hide();
 		$('.add-file-div').removeClass('add-another-file-div');
 		$('.add-another-file').last().show().parent().addClass('add-another-file-div');
 		lastInput.after(newStuff);
 		lastInput.parent().addClass('mm-file-group');
-		lastInput.next().text(lastInput[0].files[0].name);
+		var names = "";
+		for (i = 0; i < lastInput[0].files.length; i++) {
+		    names = names + ", " + lastInput[0].files[i].name;
+		}
+		lastInput.next().text(names.substring(2));
 		// arm the delete
 		lastInput.next().next().on('click', mmFileInputDelete);
 		// and hide the actual button
@@ -3051,16 +3057,19 @@ $(function() {
 			firsttime = true;
 		    }
 		    $('#mm-name-section').hide();
-		    var nameInput = lastInput.next().next().next();
+		    var nameInput = lastInput.parent().find('.mm-file-input-names');
 		    nameInput.addClass('mm-file-input-itemname');
 		    nameInput.attr('title', msg('simplepage.title_for_upload'));
+		    // rest is just for the first. nameInput can be more than one if user selected multiple files
+		    // only put the label on the first
+		    nameInput = nameInput.first();
 		    nameInput.val(itemName);
 		    if (firsttime) {
 			// add a label for the name field. I think it's too much to do it for all of them
 			nameInput.attr('id', 'mm-file-input-itemname');
-			nameInput.after('<label></label>');
-			nameInput.next().text($('#mm-name').prev().text());
-			nameInput.next().attr('for','mm-file-input-itemname');
+			nameInput.before('<label></label>');
+			nameInput.prev().text($('#mm-name').prev().text());
+			nameInput.prev().attr('for','mm-file-input-itemname');
 		    }
 		    nameInput.show();
 		}