v1.18.x
Baris Usakli
parent 2deb0e1708
commit ad5e3ebce3

@ -67,7 +67,8 @@
return false; return false;
}); });
moveThreadModal.on('shown', function() { moveThreadModal.on('shown.bs.modal', function() {
var loadingEl = document.getElementById('categories-loading'); var loadingEl = document.getElementById('categories-loading');
if (loadingEl) { if (loadingEl) {
socket.once('api:categories.get', function(data) { socket.once('api:categories.get', function(data) {
@ -383,7 +384,7 @@
this.innerHTML = data.content; this.innerHTML = data.content;
$(this).fadeIn(250); $(this).fadeIn(250);
}); });
if(data.uploadedImages && data.uploadedImages.length) { if(data.uploadedImages && data.uploadedImages.length) {
$('#images_'+data.pid).html(''); $('#images_'+data.pid).html('');
for(var i=0; i< data.uploadedImages.length; ++i) { for(var i=0; i< data.uploadedImages.length; ++i) {
@ -393,7 +394,7 @@
} else { } else {
$('#images_'+data.pid).html(''); $('#images_'+data.pid).html('');
} }
console.log('time to recreate images', data); console.log('time to recreate images', data);
}); });

@ -170,23 +170,28 @@
</div> </div>
</div> </div>
<div id="move_thread_modal" class="modal hide fade">
<div class="modal-header"> <div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <div class="modal-dialog">
<h3>Move Thread</h3> <div class="modal-content">
</div> <div class="modal-header">
<div class="modal-body"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p> <h3>Move Thread</h3>
<ul class="category-list"></ul> </div>
<div id="move-confirm" style="display: none;"> <div class="modal-body">
<hr /> <p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p>
<div class="alert">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div> <ul class="category-list"></ul>
<div id="move-confirm" style="display: none;">
<hr />
<div class="alert">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" id="move_thread_cancel">Close</a>
<button type="button" class="btn btn-primary" id="move_thread_commit" disabled>Move</a>
</div>
</div> </div>
</div> </div>
<div class="modal-footer">
<button type="button" class="btn" data-dismiss="modal" id="move_thread_cancel">Close</a>
<button type="button" class="btn btn-primary" id="move_thread_commit" disabled>Move</a>
</div>
</div> </div>
<input type="hidden" template-variable="expose_tools" value="{expose_tools}" /> <input type="hidden" template-variable="expose_tools" value="{expose_tools}" />

Loading…
Cancel
Save