diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 11c83322671ce450091f92ea95d6722a7d718dc6..951ddeb3383b7b8529faf76ead79038108c3883c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,10 +25,8 @@ $(document).ready(function () { $('[data-toggle="tooltip"]').tooltip(); -}); -$(function() { - return $(document).on('ajax:success', '.bookmark-btn', function(status, data, xhr) { + $(document).on('ajax:success', '.bookmark-button', function(status, data, xhr) { if ( $(this).hasClass('btn-default') ) { $(this).removeClass('btn-default').addClass('btn-success'); $(this).data('method', 'delete'); @@ -40,6 +38,7 @@ $(function() { }); }); + $(function() { return $(document).on('ajax:success', '.like', function(status, data, xhr) { if ( $(this).hasClass('btn-default') ) { diff --git a/app/assets/javascripts/application/learning_objects.coffee.erb b/app/assets/javascripts/application/learning_objects.coffee.erb index f77e8aa2051ef476ec253007c02833ca7b7dcca4..b5515d9a8ad72dcbff6ced91213a82ee5163ec9f 100644 --- a/app/assets/javascripts/application/learning_objects.coffee.erb +++ b/app/assets/javascripts/application/learning_objects.coffee.erb @@ -14,12 +14,12 @@ bookmarks_btn = -> $(document).on 'ajax:success', '.bookmark', (status, data, xhr) -> if $('.fa-bookmark').attr('id') == 'bookmarked' $('.fa-bookmark').attr('style', '') - $('.fa-bookmark').attr('id', 'not-bookmarked').reload() - $('.fa-bookmark').parent().data('method', 'post').reload() + $('.fa-bookmark').attr('id', 'not-bookmarked') + $('.fa-bookmark').parent().data('method', 'post') else $('.fa-bookmark').attr('style', 'color:#27ae60') - $('.fa-bookmark').attr('id', 'bookmarked').reload() - $('.fa-bookmark').parent().data('method', 'delete').reload() + $('.fa-bookmark').attr('id', 'bookmarked') + $('.fa-bookmark').parent().data('method', 'delete') return -$(document).on('page:load', bookmarks_btn ) +$(document).on('pageinit',bookmarks_btn()) diff --git a/app/views/learning_objects/_bookmarks_button.html.erb b/app/views/learning_objects/_bookmarks_button.html.erb index 47f6c27f932124691f8adb72ae64514ecd9fb2fd..54910ad1269c0a536b6cd60484ebaf3369661504 100644 --- a/app/views/learning_objects/_bookmarks_button.html.erb +++ b/app/views/learning_objects/_bookmarks_button.html.erb @@ -1,9 +1,9 @@ <% unless current_user.bookmark_learning_objects.include? learning_object %> - <%= link_to bookmark_add_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark-btn btn btn-default btn-xs', title: "Adicionar aos favoritos", method: :post, remote: true do %> + <%= link_to bookmark_add_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark-button btn btn-default btn-xs', title: "Adicionar aos favoritos", method: :post, remote: true do %> <i class="fa fa-bookmark" aria-hidden="true"></i> <% end %> <% else %> - <%= link_to bookmark_remove_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark-btn btn btn-success btn-xs', title: "Remover dos favoritos",method: :delete, remote: true do %> + <%= link_to bookmark_remove_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark-button btn btn-success btn-xs', title: "Remover dos favoritos",method: :delete, remote: true do %> <i class="fa fa-bookmark" aria-hidden="true"></i> <% end %> <% end %>