Fixed Merge

This commit is contained in:
Ubuntu 2019-04-20 17:57:14 -04:00
commit 609af1c391
2 changed files with 63 additions and 67 deletions

View File

@ -1,9 +1,6 @@
// Validates the data inputs on the upload form // Validates the data inputs on the upload form
function validateUpload() { function validateUpload() {
// console.log("Validated!");
// document.getElementById("upload-form").submit();
var url_bar = document.getElementById('url'); var url_bar = document.getElementById('url');
var video_title = document.getElementById('title'); var video_title = document.getElementById('title');
var username = document.getElementById('username'); var username = document.getElementById('username');
@ -103,4 +100,3 @@ function validateUpload() {
} else { } else {
alert('Please fill out the rest of the upload form.'); alert('Please fill out the rest of the upload form.');
} }
}

View File

@ -20,6 +20,7 @@
<h3>Youtube URL *</h3> <h3>Youtube URL *</h3>
<input type="text" name="url" id="url"> <input type="text" name="url" id="url">
<<<<<<< HEAD
<h3>Video Title *</h3> <h3>Video Title *</h3>
<input type="text" name="title" id="title"> <input type="text" name="title" id="title">
@ -55,7 +56,6 @@
<h3>Stage Name *</h3> <h3>Stage Name *</h3>
<input type="text" name="stage" id="stage"> <input type="text" name="stage" id="stage">
<input type="button" name="submit_button" value="Submit" onclick="validateUpload()"> <input type="button" name="submit_button" value="Submit" onclick="validateUpload()">
</form> </form>