From 0d9b99ec70877f5ad07056845164818ddcbe76d5 Mon Sep 17 00:00:00 2001
From: Giovanne Marcelo <gms15@inf.ufpr.br>
Date: Thu, 24 Mar 2016 23:22:29 -0300
Subject: [PATCH] Small Fix
---
app/assets/javascripts/application.js | 5 ++---
.../application/learning_objects.coffee.erb | 10 +++++-----
app/views/learning_objects/_bookmarks_button.html.erb | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 11c83322..951ddeb3 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 f77e8aa2..b5515d9a 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 47f6c27f..54910ad1 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 %>
--
GitLab