harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make dropItem more universal and move delete up in the dropdown menu

Browse Source
This commit is contained in:
Mario Vavti 2015-04-12 14:30:33 +02:00
parent 962fdf08c0
commit 70b109702e
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/attach.php
View File

@ -832,7 +832,7 @@ function attach_delete($channel_id, $resource) {
intval($channel_id) intval($channel_id)
); );
file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $no_activity=false); file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $notify=0);
} }
/** /**

5
view/js/main.js
View File

@ -819,13 +819,12 @@ function doprofilelike(ident, verb) {
} }
function dropItem(ident) { function dropItem(url, object) {
var object = '#thread-wrapper-' + ident;
var confirm = confirmDelete(); var confirm = confirmDelete();
if(confirm) { if(confirm) {
$('body').css('cursor', 'wait'); $('body').css('cursor', 'wait');
$(object).fadeTo('fast', 0.33, function () { $(object).fadeTo('fast', 0.33, function () {
$.get('item/drop/' + ident).done(function() { $.get(url).done(function() {
$(object).remove(); $(object).remove();
$('body').css('cursor', 'auto'); $('body').css('cursor', 'auto');
}); });

7
view/tpl/conv_item.tpl
View File

@ -117,14 +117,13 @@
{{if $item.star}} {{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}} {{/if}}
{{if $item.drop.dropping}}
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}} {{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{$item.item_photo_menu}} {{$item.item_photo_menu}}
{{/if}} {{/if}}
{{if $item.drop.dropping}}
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem({{$item.id}}); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
</ul> </ul>
</div> </div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>

8
view/tpl/conv_list.tpl
View File

@ -118,14 +118,14 @@
{{if $item.star}} {{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}} {{/if}}
{{if $item.drop.dropping}}
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}} {{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{$item.item_photo_menu}} {{$item.item_photo_menu}}
{{/if}} {{/if}}
{{if $item.drop.dropping}}
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem({{$item.id}}); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
</ul> </ul>
</div> </div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>