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

closes #175

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-08-15 17:03:43 -04:00
parent f83be710a0
commit ff805a704d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,10 +53,10 @@ define(['taskbar'], function(taskbar) {
function initializeFileReader() {
jQuery.event.props.push( "dataTransfer" );
console.log(config);
if(window.FileReader) {
var drop = $('.post-window .imagedrop');
var textarea = $('.post-window textarea');
var drop = $('.post-window .imagedrop'),
textarea = $('.post-window textarea');
textarea.on('dragenter', function() {
@@ -76,7 +76,7 @@ define(['taskbar'], function(taskbar) {
drop.on('dragover', cancel);
drop.on('dragenter', cancel);
drop.on('drop', function(e) {
e.preventDefault();
var uuid = drop.parents('[data-uuid]').attr('data-uuid'),
@@ -90,7 +90,6 @@ define(['taskbar'], function(taskbar) {
return false;
});
}
}
@@ -124,7 +123,8 @@ define(['taskbar'], function(taskbar) {
document.body.insertBefore(composer.postContainer, taskbar);
initializeFileReader();
if(config.imgurClientIDSet)
initializeFileReader();
socket.on('api:composer.push', function(threadData) {
if (!threadData.error) {

7
src/routes/api.js
View File

@@ -16,18 +16,21 @@ var user = require('./../user.js'),
});
app.get('/api/config', function(req, res, next) {
meta.config.getFields(['postDelay', 'minimumTitleLength', 'minimumPostLength'], function(err, metaConfig) {
meta.config.getFields(['postDelay', 'minimumTitleLength', 'minimumPostLength', 'imgurClientID'], function(err, metaConfig) {
if(err) return next();
var clientConfig = require('../../public/config.json');
for (var attrname in metaConfig) {
clientConfig[attrname] = metaConfig[attrname];
}
clientConfig['imgurClientIDSet'] = clientConfig['imgurClientID'] !== '';
delete clientConfig['imgurClientID'];
res.json(200, clientConfig);
})
});
app.get('/api/home', function(req, res) {
var uid = (req.user) ? req.user.uid : 0;
categories.getAllCategories(function(data) {