From 9ee8e5c0c1b43d6f425a8ce3a38019c6871b7f87 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 21 Sep 2014 14:06:50 +0200 Subject: [PATCH] Improved modal dialog. --- .../_application_controller.js.coffee | 45 +++++++------- .../_application_controller_generic.js.coffee | 31 ++++++---- .../app/controllers/_channel/email.js.coffee | 59 ++++++++++++------- .../controllers/agent_ticket_merge.js.coffee | 4 +- .../app/controllers/layout_ref.js.coffee | 13 +++- .../app/controllers/ticket_customer.js.coffee | 15 +++-- .../app/controllers/ticket_overview.js.coffee | 3 +- .../app/controllers/user_zoom.js.coffee | 9 --- .../app/controllers/widget/link.js.coffee | 4 +- .../widget/online_notification.js.coffee | 1 - .../app/lib/app_post/browser.coffee | 1 + ...user_organization_autocompletion.js.coffee | 5 +- .../app/lib/app_post/websocket.js.coffee | 3 +- .../app/views/generic/history.jst.eco | 22 ++----- .../javascripts/app/views/user_zoom.jst.eco | 29 +++++---- .../app/views/user_zoom/actions.jst.eco | 6 +- 16 files changed, 135 insertions(+), 115 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 51ba540c4..d80a9ec9c 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -438,14 +438,6 @@ class App.ControllerContent extends App.Controller @navShow() class App.ControllerModal extends App.Controller - className: 'modal fade' - - events: - 'submit form': 'onSubmit' - 'click .js-submit': 'onSubmit' - 'click .js-cancel': 'hide' - 'click .js-close': 'hide' - constructor: (options = {}) -> defaults = backdrop: true @@ -460,38 +452,47 @@ class App.ControllerModal extends App.Controller super(options) - @show() + if @shown + @show() - show: (content) -> - console.log('M', @message) + show: -> + console.log('M', @message, @el.length) if @button is true @button = 'Submit' - @html App.view('modal')( + + @modalElement = $( '
' ) + @modalElement.append $( App.view('modal')( head: @head message: @message detail: @detail close: @close cancel: @cancel button: @button - ) - if content - @el.find('.modal-body').html content - @el.modal( + ) ) + if @el && !@message && !@detail + @modalElement.find('.modal-body').html @el + + @modalElement.find('form').on('submit', (e) => @onSubmit(e) ) + @modalElement.find('.js-submit').on('click', (e) => @onSubmit(e) ) + @modalElement.find('.js-cancel').on('click', (e) => @hide(e) ) + @modalElement.find('.js-close').on('click', (e) => @hide(e) ) + + @modalElement.modal( keyboard: @keyboard show: true backdrop: @backdrop - ) - - @el.bind('hidden.bs.modal', => + ).on('show.bs.modal', => + @onShow() + ).on('hidden.bs.modal', => @onHide() # remove modal from dom - $('.modal').remove(); - ) + $('.modal').remove() + ).find('.js-close').bind('submit', (e) => @hide(e) ) hide: (e) -> if e e.preventDefault() - @el.modal('hide') + @modalElement.modal('hide') onShow: -> console.log('no nothing') diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee index a0d4ac586..fed8e74cc 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee @@ -7,14 +7,14 @@ class App.ControllerGenericNew extends App.ControllerModal @button = true controller = new App.ControllerForm( - el: @el.find('#object_new') model: App[ @genericObject ] params: @item screen: @screen || 'edit' autofocus: true ) + @el = controller.form - @show(controller.form) + @show() onSubmit: (e) -> e.preventDefault() @@ -57,14 +57,14 @@ class App.ControllerGenericEdit extends App.ControllerModal @button = true controller = new App.ControllerForm( - el: @el.find('#object_new') model: App[ @genericObject ] params: @item screen: @screen || 'edit' autofocus: true ) + @el = controller.form - @show(controller.form) + @show() onSubmit: (e) -> e.preventDefault() @@ -192,7 +192,7 @@ class App.ControllerGenericDestroyConfirm extends App.ControllerModal @cancel = true @button = 'Yes' @message = 'Sure to delete this object?' - @show(@message) + @show() onSubmit: (e) -> e.preventDefault() @@ -354,13 +354,10 @@ class App.ControllerNavSidbar extends App.ControllerContent ) class App.GenericHistory extends App.ControllerModal - events: - 'click [data-type=sortorder]': 'sortorder', - 'click .cancel': 'modalHide', - 'click .close': 'modalHide', - constructor: -> super + @head = 'History' + @close = true render: ( items, orderClass = '' ) -> @@ -392,14 +389,22 @@ class App.GenericHistory extends App.ControllerModal @historyListCache ) + @el.find('a[data-type="sortorder"]').bind( + 'click', + (e) => + e.preventDefault() + @sortorder(e) + ) + if !@isShown + @isShown = true + @show() - @hide() - + onShow: => # enable user popups @userPopups() # show frontend times - @delay( @frontendTimeUpdate, 300, 'ui-time-update' ) + @delay( @frontendTimeUpdate, 100, 'ui-time-update' ) sortorder: (e) -> e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/_channel/email.js.coffee b/app/assets/javascripts/app/controllers/_channel/email.js.coffee index b11c2b73b..6c6a0cb80 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.js.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.js.coffee @@ -73,6 +73,12 @@ class App.ChannelEmailFilter extends App.Controller class App.ChannelEmailFilterEdit extends App.ControllerModal constructor: -> super + + @head = 'Postmaster Filter' + @button = true + @close = true + @cancel = true + if @object @form = new App.ControllerForm( model: App.PostmasterFilter, @@ -84,11 +90,9 @@ class App.ChannelEmailFilterEdit extends App.ControllerModal model: App.PostmasterFilter, autofocus: true, ) - @head = 'Postmaster Filter' - @button = true - @close = true - @cancel = true - @show( @form.form ) + + @el = @form.form + @show() onSubmit: (e) => e.preventDefault() @@ -158,6 +162,12 @@ class App.ChannelEmailAddress extends App.Controller class App.ChannelEmailAddressEdit extends App.ControllerModal constructor: -> super + + @head = 'Email-Address' + @button = true + @close = true + @cancel = true + if @object @form = new App.ControllerForm( model: App.EmailAddress @@ -169,11 +179,10 @@ class App.ChannelEmailAddressEdit extends App.ControllerModal model: App.EmailAddress, autofocus: true, ) - @head = 'Email-Address' - @button = true - @close = true - @cancel = true - @show( @form.form ) + + @el = @form.form + + @show() onSubmit: (e) => e.preventDefault() @@ -239,6 +248,12 @@ class App.ChannelEmailSignature extends App.Controller class App.ChannelEmailSignatureEdit extends App.ControllerModal constructor: -> super + + @head = 'Signature' + @button = true + @close = true + @cancel = true + if @object @form = new App.ControllerForm( model: App.Signature @@ -250,11 +265,10 @@ class App.ChannelEmailSignatureEdit extends App.ControllerModal model: App.Signature autofocus: true ) - @head = 'Signature' - @button = true - @close = true - @cancel = true - @show( @form.form ) + + @el = @form.form + + @show() onSubmit: (e) => e.preventDefault() @@ -321,6 +335,12 @@ class App.ChannelEmailInbound extends App.Controller class App.ChannelEmailInboundEdit extends App.ControllerModal constructor: -> super + + @head = 'Email Channel' + @button = true + @close = true + @cancel = true + if @object @form = new App.ControllerForm( model: App.Channel @@ -332,11 +352,10 @@ class App.ChannelEmailInboundEdit extends App.ControllerModal model: App.Channel autofocus: true ) - @head = 'Email Channel' - @button = true - @close = true - @cancel = true - @show( @form.form ) + + @el = @form.form + + @show() onSubmit: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee index 7fac9ca3b..09d4e9038 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee @@ -63,9 +63,9 @@ class App.TicketMerge extends App.ControllerModal $(e.target).parents().find('[name="master_ticket_number"]').val( ticket.number ) ) - @hide() + @show() - submit: (e) => + onSubmit: (e) => e.preventDefault() # disable form diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index d5f91dfae..0c2d98bf3 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -126,12 +126,16 @@ class ModalForm extends App.ControllerModal @cancel = true @button = true + @render() + + render: -> controller = new App.ControllerForm( model: App.User autofocus: true ) + @el = controller.form - @show(controller.form) + @show() onHide: => window.history.back() @@ -149,9 +153,12 @@ class ModalText extends App.ControllerModal super @head = '123 some title' - form = App.view('layout_ref/content')() + @render() - @show(form) + render: -> + @html App.view('layout_ref/content')() + + @show() onHide: => window.history.back() diff --git a/app/assets/javascripts/app/controllers/ticket_customer.js.coffee b/app/assets/javascripts/app/controllers/ticket_customer.js.coffee index 34fbded2e..80b5bbc4d 100644 --- a/app/assets/javascripts/app/controllers/ticket_customer.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_customer.js.coffee @@ -1,6 +1,12 @@ class App.TicketCustomer extends App.ControllerModal constructor: -> super + + @head = 'Change Customer' + @close = true + @cancel = true + @button = true + configure_attributes = [ { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organisation/Company', minLengt: 2, disableCreateUser: true }, ] @@ -10,11 +16,10 @@ class App.TicketCustomer extends App.ControllerModal configure_attributes: configure_attributes, autofocus: true ) - @head = 'Change Customer' - @close = true - @cancel = true - @button = true - @show( controller.form ) + + @el = controller.form + + @show() onSubmit: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee index 981c3d2ef..151791c70 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee @@ -621,7 +621,8 @@ class App.OverviewSettings extends App.ControllerModal model: { configure_attributes: @configure_attributes_article } autofocus: false ) - @show( controller.form ) + @el = controller.form + @show() onSubmit: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/user_zoom.js.coffee b/app/assets/javascripts/app/controllers/user_zoom.js.coffee index cbb133974..166e2072f 100644 --- a/app/assets/javascripts/app/controllers/user_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/user_zoom.js.coffee @@ -221,7 +221,6 @@ class Sidebar extends App.Controller class ActionRow extends App.Controller events: 'click [data-type=history]': 'history_dialog' - 'click [data-type=merge]': 'merge_dialog' constructor: -> super @@ -234,14 +233,6 @@ class ActionRow extends App.Controller e.preventDefault() new App.UserHistory( user_id: @user.id ) - merge_dialog: (e) -> - e.preventDefault() - new App.TicketMerge( ticket: @ticket, task_key: @ui.task_key ) - - customer_dialog: (e) -> - e.preventDefault() - new App.TicketCustomer( ticket: @ticket, ui: @ui ) - class Router extends App.ControllerPermanent constructor: (params) -> diff --git a/app/assets/javascripts/app/controllers/widget/link.js.coffee b/app/assets/javascripts/app/controllers/widget/link.js.coffee index 19cc99634..645cd27ac 100644 --- a/app/assets/javascripts/app/controllers/widget/link.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/link.js.coffee @@ -87,12 +87,12 @@ class App.LinkAdd extends App.ControllerModal @button = true @cancel = true - form = App.view('link/add')( + @html App.view('link/add')( link_object: @link_object, link_object_id: @link_object_id, object: @object, ) - @show( form ) + @show() onSubmit: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee index f280e11e7..2a94d8cfd 100644 --- a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee @@ -36,7 +36,6 @@ class App.OnlineNotificationWidget extends App.Controller return false counterUpdate: (count) => - console.log('counter update', count) if !count @el.find('.activity-counter').remove() return diff --git a/app/assets/javascripts/app/lib/app_post/browser.coffee b/app/assets/javascripts/app/lib/app_post/browser.coffee index ac2b64b12..fcb4cfac2 100644 --- a/app/assets/javascripts/app/lib/app_post/browser.coffee +++ b/app/assets/javascripts/app/lib/app_post/browser.coffee @@ -47,6 +47,7 @@ class App.Browser close: false backdrop: false keyboard: false + shown: true ) @searchString: (data) -> diff --git a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee index 9bf26fc6f..3f4399578 100644 --- a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee @@ -208,13 +208,14 @@ class UserNew extends App.ControllerModal @button = true controller = new App.ControllerForm( - el: @el.find('#form-user') model: App.User screen: 'edit' autofocus: true ) - @show( controller.form ) + @el = controller.form + + @show() onSubmit: (e) -> diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee index 27a3da00b..07e2d80da 100644 --- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee @@ -239,10 +239,11 @@ class _webSocketSingleton extends App.Controller # show reconnect message @error = new App.ControllerModal( head: 'Lost network connection!' - message: 'Lost network connection to system, trying to reconnect...' + message: 'Trying to reconnect...' backdrop: false keyboard: false close: false + shown: true ) if !@tryToConnect App.Delay.set message, 7000, 'websocket-no-connection-try-reconnect-message', 'ws' diff --git a/app/assets/javascripts/app/views/generic/history.jst.eco b/app/assets/javascripts/app/views/generic/history.jst.eco index ab8ee2064..e0985bff9 100644 --- a/app/assets/javascripts/app/views/generic/history.jst.eco +++ b/app/assets/javascripts/app/views/generic/history.jst.eco @@ -1,13 +1,7 @@ -
-
-
-
-
-
-

<%- @T( 'History' ) %>

- <%- @T( 'Change order' ) %> -
-
+
+<%- @T( 'Change order' ) %> + +
<% open = false %> <% for item in @items: %> @@ -27,7 +21,7 @@ <% if ( item['type'] is 'notification' || item['type'] is 'email' ): %> <%- @T( item['type'] ) %> <% if item['value_from']: %> - "<%= item['value_from'] %>" <%- @T( 'sent to' ) %> + "<%= item['value_from'] %>" <%- @T( 'sent to' ) %> <% end %> <% if item['value_to']: %> "<%= item['value_to'] %>" @@ -52,10 +46,4 @@ <% if open: %> <% end %> - -
- -
-
-
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/user_zoom.jst.eco b/app/assets/javascripts/app/views/user_zoom.jst.eco index f9903a4cb..fe4cc7253 100644 --- a/app/assets/javascripts/app/views/user_zoom.jst.eco +++ b/app/assets/javascripts/app/views/user_zoom.jst.eco @@ -1,16 +1,19 @@ -
-
-
-

<%- @T( @head ) %>

+
+
+
+
+
+

<%- @T( @head ) %>

+
+ +
+ +
-
- +
-
- -
- - \ No newline at end of file +
+
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/user_zoom/actions.jst.eco b/app/assets/javascripts/app/views/user_zoom/actions.jst.eco index f16073833..6b6fc5b79 100644 --- a/app/assets/javascripts/app/views/user_zoom/actions.jst.eco +++ b/app/assets/javascripts/app/views/user_zoom/actions.jst.eco @@ -1,8 +1,6 @@ -
- +
+
\ No newline at end of file