diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 3aa8ba5f68..5ff3091bb4 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -67,7 +67,8 @@ return false; }); - moveThreadModal.on('shown', function() { + moveThreadModal.on('shown.bs.modal', function() { + var loadingEl = document.getElementById('categories-loading'); if (loadingEl) { socket.once('api:categories.get', function(data) { @@ -383,7 +384,7 @@ this.innerHTML = data.content; $(this).fadeIn(250); }); - + if(data.uploadedImages && data.uploadedImages.length) { $('#images_'+data.pid).html(''); for(var i=0; i< data.uploadedImages.length; ++i) { @@ -393,7 +394,7 @@ } else { $('#images_'+data.pid).html(''); } - + console.log('time to recreate images', data); }); diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 27aabcd57d..7a3aa20b8e 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -170,23 +170,28 @@ </div> </div> -<div id="move_thread_modal" class="modal hide fade"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h3>Move Thread</h3> - </div> - <div class="modal-body"> - <p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p> - <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 id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h3>Move Thread</h3> + </div> + <div class="modal-body"> + <p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p> + <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 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> <input type="hidden" template-variable="expose_tools" value="{expose_tools}" />