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

closes #1719

Browse Source
This commit is contained in:
barisusakli
2014-06-24 15:49:55 -04:00
parent c7897250bd
commit c3e4d11f69
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en_GB/topic.json
View File

@@ -89,9 +89,6 @@
"fork_success": "Succesfully forked topic!", "fork_success": "Succesfully forked topic!",
"composer.title_placeholder": "Enter your topic title here...", "composer.title_placeholder": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.help": "Help",
"composer.discard": "Discard", "composer.discard": "Discard",
"composer.submit": "Submit", "composer.submit": "Submit",
"composer.replying_to": "Replying to %1", "composer.replying_to": "Replying to %1",
@@ -104,7 +101,6 @@
"composer.thumb_file_label": "Or upload a file", "composer.thumb_file_label": "Or upload a file",
"composer.thumb_remove": "Clear fields", "composer.thumb_remove": "Clear fields",
"composer.drag_and_drop_images": "Drag and Drop Images Here", "composer.drag_and_drop_images": "Drag and Drop Images Here",
"composer.upload_instructions": "Upload images by dragging & dropping them.",
"more_users_and_guests": "%1 more user(s) and %2 guest(s)", "more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)", "more_users": "%1 more user(s)",

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

@@ -277,12 +277,7 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
handleResize(postContainer); handleResize(postContainer);
socket.emit('modules.composer.renderHelp', function(err, html) { handleHelp(postContainer);
if (!err && html && html.length > 0) {
postContainer.find('.help').html(html);
postContainer.find('[data-pane=".tab-help"]').parent().removeClass('hidden');
}
});
$(window).trigger('action:composer.loaded', { $(window).trigger('action:composer.loaded', {
post_uuid: post_uuid post_uuid: post_uuid
@@ -294,6 +289,18 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
}); });
} }
function handleHelp(postContainer) {
var helpBtn = postContainer.find('.help');
socket.emit('modules.composer.renderHelp', function(err, html) {
if (!err && html && html.length > 0) {
helpBtn.removeClass('hidden');
helpBtn.on('click', function() {
bootbox.alert(html);
});
}
});
}
function updateTitle(postData, postContainer) { function updateTitle(postData, postContainer) {
var titleEl = postContainer.find('.title'); var titleEl = postContainer.find('.title');
@@ -402,9 +409,6 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
} }
if(config.hasImageUploadPlugin) { if(config.hasImageUploadPlugin) {
if(env === 'md' || env === 'lg') {
postContainer.find('.upload-instructions').removeClass('hide');
}
postContainer.find('.img-upload-btn').removeClass('hide'); postContainer.find('.img-upload-btn').removeClass('hide');
postContainer.find('#files.lt-ie9').removeClass('hide'); postContainer.find('#files.lt-ie9').removeClass('hide');
} }
@@ -430,12 +434,10 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
var h1 = postContainer.find('.title').outerHeight(true); var h1 = postContainer.find('.title').outerHeight(true);
var h2 = postContainer.find('.tags-container').outerHeight(true); var h2 = postContainer.find('.tags-container').outerHeight(true);
var h3 = postContainer.find('.formatting-bar').outerHeight(true); var h3 = postContainer.find('.formatting-bar').outerHeight(true);
var h4 = postContainer.find('.nav-tabs').outerHeight(true); var h4 = postContainer.find('.topic-thumb-container').outerHeight(true);
var h5 = postContainer.find('.instructions').outerHeight(true); var h5 = $('.taskbar').height();
var h6 = postContainer.find('.topic-thumb-container').outerHeight(true); var total = h1 + h2 + h3 + h4 + h5;
var h7 = $('.taskbar').height(); postContainer.find('.write-preview-container').css('height', postContainer.height() - total);
var total = h1 + h2 + h3 + h4 + h5 + h6 + h7;
postContainer.find('.tab-content').css('height', postContainer.height() - total);
} }
function focusElements(post_uuid) { function focusElements(post_uuid) {