From b6dd55b8bf09dac30d61a7f26496ce87abbb284f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 30 Sep 2015 15:55:26 +0200 Subject: [PATCH] Added loader icon. --- .../_ui_element/ticket_selector.coffee | 23 +++++++++++-------- .../app/views/generic/ticket_selector.jst.eco | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee index f2fb9c889..4ebe3f993 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee @@ -130,20 +130,21 @@ class App.UiElement.ticket_selector elementLast.after(elementClone) item.find('.js-filterElement').first().remove() + triggerSearch = -> + item.find('.js-previewCounterContainer').addClass('hide') + item.find('.js-previewLoader').removeClass('hide') + App.Delay.set( + search, + 600, + 'preview', + ) + # bind for preview item.on('change', 'select.form-control', (e) -> - App.Delay.set( - search, - 600, - 'preview', - ) + triggerSearch() ) item.on('change keyup', 'input.form-control', (e) -> - App.Delay.set( - search, - 600, - 'preview', - ) + triggerSearch() ) item @@ -160,6 +161,8 @@ class App.UiElement.ticket_selector processData: true, success: (data, status, xhr) => App.Collection.loadAssets( data.assets ) + item.find('.js-previewCounterContainer').removeClass('hide') + item.find('.js-previewLoader').addClass('hide') @ticketTable(data.ticket_ids, data.ticket_count, item) ) diff --git a/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco b/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco index 378aa73d2..9eb78f394 100644 --- a/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco +++ b/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco @@ -25,6 +25,6 @@
-

<%- @T('Preview') %> ? <%- @T('matches') %>

+

<%- @T('Preview') %> ? <%- @T('matches') %>

\ No newline at end of file