Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #792, fixes multiple composers

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-17 19:42:20 -05:00
parent dc27638ca8
commit 0db6423c26
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/src/modules/composer.js
View File

@@ -286,11 +286,14 @@ define(['taskbar'], function(taskbar) {
postContainer.find('.nav-tabs a').click(function (e) { postContainer.find('.nav-tabs a').click(function (e) {
e.preventDefault(); e.preventDefault();
$(this).tab('show'); $(this).tab('show');
var selector = $(this).attr('data-pane');
postContainer.find('.tab-content div').removeClass('active');
postContainer.find(selector).addClass('active');
return false; return false;
}); });
postContainer.find('.nav-tabs a').on('shown.bs.tab', function (e) { postContainer.find('.nav-tabs a').on('shown.bs.tab', function (e) {
if($(e.target).attr('href') === '#preview') { if($(e.target).attr('data-pane') === '.tab-preview') {
socket.emit('modules.composer.renderPreview', bodyEl.val(), function(err, preview) { socket.emit('modules.composer.renderPreview', bodyEl.val(), function(err, preview) {
postContainer.find('.preview').html(preview); postContainer.find('.preview').html(preview);
}); });
@@ -412,7 +415,9 @@ define(['taskbar'], function(taskbar) {
postContainer.find('.file-upload-btn').removeClass('hide'); postContainer.find('.file-upload-btn').removeClass('hide');
} }
postContainer.css('visibility', 'visible'); postContainer.css('visibility', 'visible')
.css('z-index', 1);
composer.focusElements(post_uuid); composer.focusElements(post_uuid);
} }

8
public/templates/composer.tpl
View File

@@ -24,15 +24,15 @@
</div> </div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#write" data-toggle="tab">Write</a></li> <li class="active"><a data-pane=".tab-write" data-toggle="tab">Write</a></li>
<li><a href="#preview" data-toggle="tab">Preview</a></li> <li><a data-pane=".tab-preview" data-toggle="tab">Preview</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="write"> <div class="tab-pane active tab-write">
<textarea class="write" tabIndex="2"></textarea> <textarea class="write" tabIndex="2"></textarea>
</div> </div>
<div class="tab-pane" id="preview"> <div class="tab-pane tab-preview">
<div class="preview well"></div> <div class="preview well"></div>
</div> </div>
</div> </div>