Added now @delay(), added error screen of ajaxError events.
This commit is contained in:
parent
db9e98f025
commit
6dccef5659
3 changed files with 42 additions and 12 deletions
|
@ -148,18 +148,43 @@ class App.Controller extends Spine.Controller
|
|||
)
|
||||
@interval( update, 30000, 'frontendTimeUpdate' )
|
||||
|
||||
|
||||
clearDelay: (delay_id) =>
|
||||
# check global var
|
||||
if !@_delayID
|
||||
@_delayID = {}
|
||||
|
||||
clearTimeout( @_delayID[delay_id] ) if @_delayID[delay_id]
|
||||
|
||||
delay: (callback, timeout, delay_id) =>
|
||||
|
||||
# check global var
|
||||
if !@_delayID
|
||||
@_delayID = {}
|
||||
|
||||
# clear auto save
|
||||
@clearDelay( @_delayID[delay_id] )
|
||||
|
||||
# request new data
|
||||
call = =>
|
||||
callback()
|
||||
if delay_id
|
||||
@_delayID[delay_id] = setTimeout( call, timeout )
|
||||
else
|
||||
setTimeout( call, timeout )
|
||||
|
||||
clearInterval: (interval_id) =>
|
||||
# check global var
|
||||
if !@intervalID
|
||||
@intervalID = {}
|
||||
if !@_intervalID
|
||||
@_intervalID = {}
|
||||
|
||||
clearInterval( @intervalID[interval_id] ) if @intervalID[interval_id]
|
||||
clearInterval( @_intervalID[interval_id] ) if @_intervalID[interval_id]
|
||||
|
||||
interval: (callback, interval, interval_id) =>
|
||||
|
||||
# check global var
|
||||
if !@intervalID
|
||||
@intervalID = {}
|
||||
if !@_intervalID
|
||||
@_intervalID = {}
|
||||
|
||||
callback()
|
||||
|
||||
|
@ -167,10 +192,10 @@ class App.Controller extends Spine.Controller
|
|||
every = (ms, cb) -> setInterval cb, ms
|
||||
|
||||
# clear auto save
|
||||
clearInterval( @intervalID[interval_id] ) if @intervalID[interval_id]
|
||||
@clearInterval( @_intervalID[interval_id] )
|
||||
|
||||
# request new data
|
||||
@intervalID[interval_id] = every interval, () =>
|
||||
@_intervalID[interval_id] = every interval, () =>
|
||||
callback()
|
||||
|
||||
userPopups: (position = 'right') ->
|
||||
|
@ -328,6 +353,8 @@ class App.ErrorModal extends App.ControllerModal
|
|||
render: ->
|
||||
@html App.view('error')(
|
||||
message: @message
|
||||
detail: @detail
|
||||
close: @close
|
||||
)
|
||||
@modalShow(
|
||||
backdrop: false,
|
||||
|
|
|
@ -276,7 +276,7 @@ class App.ControllerForm extends App.Controller
|
|||
else if attribute.tag is 'autocompletion'
|
||||
item = $( App.view('generic/autocompletion')( attribute: attribute ) )
|
||||
|
||||
a = ->
|
||||
a = =>
|
||||
@local_attribute = '#' + attribute.id
|
||||
@local_attribute_full = '#' + attribute.id + '_autocompletion'
|
||||
@callback = attribute.callback
|
||||
|
@ -312,7 +312,7 @@ class App.ControllerForm extends App.Controller
|
|||
@log 'selected', event, ui
|
||||
b(event, ui.item.id)
|
||||
)
|
||||
@delay(a, 600)
|
||||
@delay( a, 600 )
|
||||
|
||||
# input
|
||||
else
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
<div class="modal-header">
|
||||
<!--
|
||||
<% if @close: %>
|
||||
<a href="#" class="close">×</a>
|
||||
-->
|
||||
<% end %>
|
||||
<h3><%- @T( 'Error' ) %></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form class="form-horizontal">
|
||||
<p><%= @message %>
|
||||
<p><%= @message %></p>
|
||||
<% if @detail: %>
|
||||
<pre><%= @detail %></p>
|
||||
<% end %>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
Loading…
Reference in a new issue