diff --git a/app/assets/javascripts/application/learning_objects.coffee b/app/assets/javascripts/application/learning_objects.coffee index d3d5b5e89d0bfd4e93c45d8590b6b6eec5d5aba9..88903b52b03bd531978b5ec6244f164c4f0459f5 100644 --- a/app/assets/javascripts/application/learning_objects.coffee +++ b/app/assets/javascripts/application/learning_objects.coffee @@ -1,6 +1,6 @@ $ -> $('.default_btn').toggleClass 'active_btn' - $('*[data-poload]').click -> + $(document).on 'click', '*[data-poload]', -> e = $(this) e.popover({content: "Carregando..."}).popover('show') all = undefined @@ -39,7 +39,7 @@ $ -> return $ -> - $('.add_to_collection').on 'click', (e) -> + $(document).on 'click', '.add_to_collection', (e) -> $('.add_to_collection').removeClass 'active' $('.add_to_collection').not(this).popover 'hide' return diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js index 42786f18c620b1a70002bba6b03d6255ec4852d1..a32dca97fa40c86284d7e2ac64909562df009c0d 100644 --- a/app/assets/javascripts/application/search.js +++ b/app/assets/javascripts/application/search.js @@ -45,8 +45,6 @@ var search = function() { // add tooltip $('[data-toggle="tooltip"]').tooltip(); - - searchWatchers().attachMoreResults(); }); } @@ -56,6 +54,11 @@ var search = function() { var intervalId = 0; var has_init = false; + if (!has_init) { + init(); + has_init = true; + } + function init() { // watch params to change inputs watchParams(); @@ -65,6 +68,7 @@ var search = function() { // watch inputs to change params watchSearchInput(); + watchMoreButton(); watchFilterPanel(); watchOrder(); watchFilters(); @@ -166,7 +170,7 @@ var search = function() { function watchSearchInput() { $('.search-input input').val(params.get('query')); - $('.search-input form').on('submit', function (event) { + $(document).on('submit', '.search-input form', function (event) { event.preventDefault(); params.reset(); params.add('query', $('input[name="query"]', this).val()); @@ -174,8 +178,16 @@ var search = function() { }); } + function watchMoreButton() { + $(document).on('click', '.search-more', function (event) { + event.preventDefault(); + params.add('page', params.get('page') + 1); + searchFetch(true); + }); + } + function watchFilterPanel() { - $('.filter-panel').on('beforeItemRemove', function(event) { + $(document).on('beforeItemRemove', '.filter-panel', function(event) { if (event.options === undefined) { event.options = {'ignore': false}; } @@ -188,12 +200,12 @@ var search = function() { function watchOrder() { var select = 'select[name="order"]'; - $(select).on('change', function (event) { + $(document).on('change', select, function (event) { params.add('order', this.value); searchFetch(); }); // reset - $(watch).on('reset', function (e) { + $(document).on('reset', watch, function (e) { $(select).val(""); }); } @@ -224,7 +236,7 @@ var search = function() { filtersFetchInterval(); }); // reset - $(watch).on('reset', function (e) { + $(document).on('reset', watch, function (e) { $('#filter-year input[name=singleYear]').val(""); $('#filter-year input[name=startYear]').val(""); $('#filter-year input[name=endYear]').val(""); @@ -273,7 +285,7 @@ var search = function() { } else { // watch for changes - $(input).on('click', function () { + $(document).on('click', input, function () { if (this.checked) { params.add(type, this.value); } @@ -284,7 +296,7 @@ var search = function() { filtersFetchInterval(); }); // reset - $(watch).on('reset', function (e) { + $(document).on('reset', watch, function (e) { $(input).each(function () { $(this).attr('checked', false); }); @@ -302,22 +314,6 @@ var search = function() { clearInterval(intervalId); }, 800); } - - return { - init: function() { - if (!has_init) { - init(); - has_init = true; - } - }, - attachMoreResults: function() { - $('.search-more').on('click', function (event) { - event.preventDefault(); - params.add('page', params.get('page') + 1); - searchFetch(true); - }); - } - } } //// INIT @@ -326,7 +322,7 @@ var search = function() { var fetch_init = false; // run watchers - searchWatchers().init(); + searchWatchers(); // TODO: find a way to manage all requisitions without page reload }; diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss index 38bbd922f6323895b4395884afe7f5905f939afa..3d79699dbb96f38830a595b39e87dde7a1c13e34 100644 --- a/app/assets/stylesheets/application/learning_objects.scss +++ b/app/assets/stylesheets/application/learning_objects.scss @@ -70,6 +70,11 @@ $checked_icon: 'icons/checked.png'; margin-top: 3px; overflow: hidden; text-overflow: ellipsis; + + .media-heading { + overflow: hidden; + text-overflow: ellipsis; + } } .learning-object-thumbnail {