Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

6 years ago · c2a1d23e48
parent b3c341c3e0 4e5a5c4bce
commit c2a1d23e48
1 changed files with 2 additions and 4 deletions
--- a/app/views/users/picture_show.js.erb
+++ b/app/views/users/picture_show.js.erb
@ -1,5 +1,3 @@
 console.log("<%= @user_picture.present? %>")
-<% if @user_picture.present? %>
+$("#picture_display").html('<%= j (render :partial => 'games/picture_display') %>');
-  $("#picture_display").html('<%= j (render :partial => 'games/picture_display') %>');
+$("#picture_display").show();
  $("#picture_display").show();
 <% end %>