Skip to content

Commit

Permalink
Fix link bugs. Fix the appearance time of dialog bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
daixiaoluck committed Apr 18, 2018
1 parent bf3a3a6 commit e9a2739
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
14 changes: 8 additions & 6 deletions static/js/upload_file.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
function segmentation_modal(){
$('#uploaded_modal').modal({
backdrop:'static'
})
function web_socket_process(){
let websocket = io.connect()
let $segmentation_progress = $('#segmentation_progress')
websocket.on('push_from_server',data=>{
Expand Down Expand Up @@ -47,13 +44,18 @@ let uploader = new plupload.Uploader({
uploader.start()
},

UploadFile:function(uploader,file){
$('#uploaded_modal').modal({
backdrop:'static'
})
},

UploadProgress: function(up, file){
// console.log('The percentage information: ', file.percent)
$uploading_progress.width(`${file.percent}%`)
},

UploadComplete: function(up, files){
segmentation_modal()
web_socket_process()
},

Error: function(up, err) {
Expand Down
1 change: 0 additions & 1 deletion views/upload_file.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ <h5 class="modal-title" id="file_name"></h5>

<p id="my_video_link" class="text-right d-none">
<span>The file has been uploaded. Enjoy your movie meme:</span>
<!--<a href="/home/my_video">Your Video Meme</a>-->
<a href="/home/vid_listing" style="color: white; font-weight:bold;">Your Video Meme</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/vid_listing.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<a class="nav-link" href="/home/upload_video">Upload Video</a>
</li>
<li class="nav-item ml-auto">
<a class="nav-link" href="/home/my_video">My Video</a>
<a class="nav-link" href="/home/vid_listing">My Video</a>
</li>
<li class="nav-item ml-auto">
<a class="nav-link" href="/home/profile">Profile</a>
Expand Down

0 comments on commit e9a2739

Please sign in to comment.