mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 03:52:14 +00:00
merge
This commit is contained in:
commit
e10c65dff7
2 changed files with 4 additions and 10 deletions
|
|
@ -83,13 +83,8 @@ loadJavaScripts = (model) ->
|
|||
###
|
||||
setupSortable = (model) ->
|
||||
unless (model.get('_view.mobileDevice') == true) #don't do sortable on mobile
|
||||
# Make the lists draggable using jQuery UI
|
||||
# Note, have to setup helper function here and call it for each type later
|
||||
# due to variable binding of "type"
|
||||
setupSortable = (type) ->
|
||||
for key, value of type
|
||||
parsedType = value
|
||||
$("ul.#{parsedType}s").sortable
|
||||
_.each ['habit', 'daily', 'todo', 'reward'], (type) ->
|
||||
$("ul.#{type}s").sortable
|
||||
dropOnEmpty: false
|
||||
cursor: "move"
|
||||
items: "li"
|
||||
|
|
@ -106,7 +101,6 @@ setupSortable = (model) ->
|
|||
# Also, note that refList index arguments can either be an index
|
||||
# or the item's id property
|
||||
model.at("_#{type}List").pass(ignore: domId).move {id}, to
|
||||
_.each ['habit', 'daily', 'todo', 'reward'], (type) -> setupSortable(type)
|
||||
|
||||
setupTooltips = (model) ->
|
||||
$('[rel=tooltip]').tooltip()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<alerts:>
|
||||
{#if _flash.error}
|
||||
<ul class="alert alert-error">
|
||||
<ul class="unstyled alert alert-error">
|
||||
{#each _flash.error as :error}<li>{:error}</li>{/}
|
||||
</ul>
|
||||
{/}
|
||||
Loading…
Reference in a new issue