closes #4, closes #7

This commit is contained in:
barisusakli 2015-10-15 11:36:08 -04:00
parent d3e6caaeae
commit a86b167a46
2 changed files with 109 additions and 15 deletions

86
.jshintrc Normal file
View file

@ -0,0 +1,86 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details

"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 4, // {int} Number of spaces to use for indentation
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // true: Require all defined variables be used
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"trailing" : false, // true: Prohibit trailing whitespaces
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements"
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jquery" : true, // jQuery
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"rhino" : false, // Rhino
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules

// Custom Globals
"globals" : {} // additional predefined global variables
}

View file

@ -7,6 +7,8 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
inProgress: {}
};

var uploadingText = 'uploading 0%';

uploads.initialize = function(post_uuid) {

initializeDragAndDrop(post_uuid);
@ -14,6 +16,9 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)

addChangeHandlers(post_uuid);
addTopicThumbHandlers(post_uuid);
translator.translate('[[modules:composer.uploading, ' + 0 + '%]]', function(translated) {
uploadingText = translated;
});
};

function addChangeHandlers(post_uuid) {
@ -21,7 +26,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)

postContainer.find('#files').on('change', function(e) {
var files = (e.target || {}).files || ($(this).val() ? [{name: $(this).val(), type: utils.fileMimeType($(this).val())}] : null);
if(files) {
if (files) {
uploadContentFiles({files: files, post_uuid: post_uuid, route: '/api/post/upload'});
}
});
@ -90,7 +95,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
function initializeDragAndDrop(post_uuid) {

function onDragEnter() {
if(draggingDocument) {
if (draggingDocument) {
return;
}
drop.css('top', postContainer.find('.write-preview-container').position().top + 'px');
@ -109,7 +114,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
var files = e.files || (e.dataTransfer || {}).files || (e.target.value ? [e.target.value] : []),
fd;

if(files.length) {
if (files.length) {
if (window.FormData) {
fd = new FormData();
for (var i = 0; i < files.length; ++i) {
@ -207,7 +212,6 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
function uploadContentFiles(params) {
var files = params.files,
post_uuid = params.post_uuid,
formData = params.formData,
postContainer = $('#cmp-uuid-' + post_uuid),
textarea = postContainer.find('textarea'),
text = textarea.val(),
@ -215,15 +219,18 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)

uploadForm.attr('action', config.relative_path + params.route);

for(var i = 0; i < files.length; ++i) {
var filenameMapping = [];

for (var i = 0; i < files.length; ++i) {
filenameMapping.push(i + '_' + Date.now() + '_' + files[i].name);
var isImage = files[i].type.match(/image./);

text = insertText(text, textarea.getCursorPosition(), (isImage ? '!' : '') + '[' + files[i].name + '](uploading...) ');

if(files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
if (files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
uploadForm[0].reset();
return app.alertError('[[error:file-too-big, ' + config.maximumFileSize + ']]');
}

text = insertText(text, textarea.getCursorPosition(), (isImage ? '!' : '') + '[' + filenameMapping[i] + '](' + uploadingText + ') ');
}

textarea.val(text);
@ -244,14 +251,16 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
},
resetForm: true,
clearForm: true,
formData: formData,
formData: params.formData,

error: onUploadError,

uploadProgress: function(event, position, total, percent) {
for(var i=0; i < files.length; ++i) {
updateTextArea(files[i].name, 'uploading ' + percent + '%');
}
translator.translate('[[modules:composer.uploading, ' + percent + '%]]', function(translated) {
for (var i=0; i < files.length; ++i) {
updateTextArea(filenameMapping[i], translated);
}
});
},

success: function(uploads) {
@ -259,7 +268,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)

if(uploads && uploads.length) {
for(var i=0; i<uploads.length; ++i) {
updateTextArea(uploads[i].name, uploads[i].url);
updateTextArea(filenameMapping[i], uploads[i].url);
}
}
preview.render(postContainer);
@ -280,7 +289,6 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)

function uploadTopicThumb(params) {
var post_uuid = params.post_uuid,
formData = params.formData,
postContainer = $('#cmp-uuid-' + post_uuid),
spinner = postContainer.find('.topic-thumb-spinner'),
thumbForm = postContainer.find('#thumbForm');
@ -297,7 +305,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf)
headers: {
'x-csrf-token': csrf.get()
},
formData: formData,
formData: params.formData,
error: onUploadError,
success: function(uploads) {
uploads = maybeParse(uploads);