diff --git a/.eslintrc b/.eslintrc index 3233a29f7..34ac34854 100644 --- a/.eslintrc +++ b/.eslintrc @@ -7,9 +7,5 @@ "globals": { "window": true, "hexo": true - }, - "rules": { - "key-spacing": [2, { "align": "colon" }], - "no-multi-spaces": [2, { "exceptions": { "Property": true, "VariableDeclarator": true, "ImportDeclaration": true}}] } } diff --git a/src/core/Core.js b/src/core/Core.js index 20c60f257..9f3eb2b6e 100644 --- a/src/core/Core.js +++ b/src/core/Core.js @@ -86,7 +86,7 @@ export default class Core { */ run () { console.log({ - class : 'Core', + class: 'Core', method: 'run' }) diff --git a/src/core/Utils.js b/src/core/Utils.js index cc5d01914..dfd955485 100644 --- a/src/core/Utils.js +++ b/src/core/Utils.js @@ -35,7 +35,7 @@ function toggleClass (el, className) { if (el.classList) { el.classList.toggle(className) } else { - const classes = el.className.split(' ') + const classes = el.className.split(' ') const existingIndex = classes.indexOf(className) if (existingIndex >= 0) { @@ -76,7 +76,7 @@ function removeClass (el, className) { el.classList.remove(className) } else { const patClasses = className.split(' ').join('|') - const pattern = new RegExp('(^|\\b)' + patClasses + '(\\b|$)', 'gi') + const pattern = new RegExp('(^|\\b)' + patClasses + '(\\b|$)', 'gi') el.className = el.className.replace(pattern, ' ') } diff --git a/src/locale/en_US.js b/src/locale/en_US.js index 281a1d4f9..be72cf917 100644 --- a/src/locale/en_US.js +++ b/src/locale/en_US.js @@ -1,10 +1,10 @@ const en_US = {} en_US.strings = { - chooseFile : 'Choose a file', - youHaveChosen : 'You have chosen: %{fileName}', - orDragDrop : 'or drag it here', - filesChosen : { + chooseFile: 'Choose a file', + youHaveChosen: 'You have chosen: %{fileName}', + orDragDrop: 'or drag it here', + filesChosen: { 0: '%{smart_count} file selected', 1: '%{smart_count} files selected' } diff --git a/src/locale/ru.js b/src/locale/ru.js index bfb4c6901..26c023775 100644 --- a/src/locale/ru.js +++ b/src/locale/ru.js @@ -1,10 +1,10 @@ const ru = {} ru.strings = { - chooseFile : 'Выберите файл', - youHaveChosen : 'или перенесите его сюда', - orDragDrop : 'Вы выбрали: %{file_name}', - filesChosen : { + chooseFile: 'Выберите файл', + youHaveChosen: 'или перенесите его сюда', + orDragDrop: 'Вы выбрали: %{file_name}', + filesChosen: { 0: 'Выбран %{smart_count} файл', 1: 'Выбрано %{smart_count} файла', 2: 'Выбрано %{smart_count} файлов' diff --git a/src/plugins/DragDrop.js b/src/plugins/DragDrop.js index f3cf67b8c..28e8b60b8 100644 --- a/src/plugins/DragDrop.js +++ b/src/plugins/DragDrop.js @@ -13,9 +13,9 @@ export default class DragDrop extends Plugin { // set default options const defaultOptions = { - bla : 'blabla', + bla: 'blabla', autoSubmit: true, - modal : true + modal: true } // merge default options with the ones set by user @@ -137,8 +137,8 @@ export default class DragDrop extends Plugin { run (results) { console.log({ - class : 'DragDrop', - method : 'run', + class: 'DragDrop', + method: 'run', results: results }) diff --git a/src/plugins/Dropbox.js b/src/plugins/Dropbox.js index e9aaefc1f..ad8093506 100644 --- a/src/plugins/Dropbox.js +++ b/src/plugins/Dropbox.js @@ -45,7 +45,7 @@ export default class Dropbox extends Plugin { const elems = files.map((file, i) => { const icon = (file.isFolder) ? 'folder' : 'file' return `
  • - ${icon} : + ${icon}: ${file.name}
  • ` }) diff --git a/src/plugins/Formtag.js b/src/plugins/Formtag.js index 812915ff5..73bf89b75 100644 --- a/src/plugins/Formtag.js +++ b/src/plugins/Formtag.js @@ -8,8 +8,8 @@ export default class Formtag extends Plugin { run (results) { console.log({ - class : 'Formtag', - method : 'run', + class: 'Formtag', + method: 'run', results: results }) @@ -52,7 +52,7 @@ export default class Formtag extends Plugin { self.setProgress(100) console.log({ selected: selected, - fields : fields + fields: fields }) resolve(selected) }) diff --git a/src/plugins/GoogleDrive.js b/src/plugins/GoogleDrive.js index 0ed6129e5..abe5ad3d8 100644 --- a/src/plugins/GoogleDrive.js +++ b/src/plugins/GoogleDrive.js @@ -53,7 +53,7 @@ export default class Drive extends Plugin { // for each file in the directory, create a list item element const elems = files.map((file, i) => { const icon = (file.isFolder) ? 'folder' : 'file' - return `
  • ${icon} : ${file.name}
  • ` + return `
  • ${icon}: ${file.name}
  • ` }) // appends the list items to the target diff --git a/src/plugins/Multipart.js b/src/plugins/Multipart.js index 65b520ea9..a310ee54e 100644 --- a/src/plugins/Multipart.js +++ b/src/plugins/Multipart.js @@ -14,8 +14,8 @@ export default class Multipart extends Plugin { run (results) { console.log({ - class : 'Multipart', - method : 'run', + class: 'Multipart', + method: 'run', results: results }) diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js index faf8d63a3..fedae2243 100644 --- a/src/plugins/Plugin.js +++ b/src/plugins/Plugin.js @@ -34,8 +34,8 @@ export default class Plugin { extractFiles (results) { console.log({ - class : 'Plugin', - method : 'extractFiles', + class: 'Plugin', + method: 'extractFiles', results: results }) diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js index 327c66142..a1e50a2c2 100644 --- a/src/plugins/Tus10.js +++ b/src/plugins/Tus10.js @@ -19,8 +19,8 @@ export default class Tus10 extends Plugin { */ run (results) { console.log({ - class : 'Tus10', - method : 'run', + class: 'Tus10', + method: 'run', results: results }) @@ -55,7 +55,7 @@ export default class Tus10 extends Plugin { const self = this const upload = new tus.Upload(file, { endpoint: this.opts.endpoint, - onError : function (error) { + onError: function (error) { return Promise.reject('Failed because: ' + error) }, onProgress: function (bytesUploaded, bytesTotal) { diff --git a/website/build-examples.js b/website/build-examples.js index 2cf18ac1c..b61ff9c0b 100644 --- a/website/build-examples.js +++ b/website/build-examples.js @@ -65,9 +65,9 @@ glob(srcPattern, function (err, files) { // Create a new watchify instance for each file. files.forEach(function (file) { var browseFy = browserify(file, { - cache : {}, + cache: {}, packageCache: {}, - plugin : browserifyPlugins + plugin: browserifyPlugins }) // Aliasing for using `require('uppy')`, etc. @@ -108,8 +108,8 @@ glob(srcPattern, function (err, files) { }) var exampleName = path.basename(path.dirname(file)) - var output = dstPattern.replace('**', exampleName) - var parentDir = path.dirname(output) + var output = dstPattern.replace('**', exampleName) + var parentDir = path.dirname(output) mkdirp.sync(parentDir) @@ -131,7 +131,7 @@ glob(srcPattern, function (err, files) { function onError (err) { console.error(chalk.red('✗ error:'), chalk.red(err.message)) notifier.notify({ - 'title' : 'Build failed:', + 'title': 'Build failed:', 'message': err.message }) this.emit('end') diff --git a/website/private_modules/hexo-renderer-uppyexamples/index.js b/website/private_modules/hexo-renderer-uppyexamples/index.js index 61b6e2f3e..cf2dd6bf0 100644 --- a/website/private_modules/hexo-renderer-uppyexamples/index.js +++ b/website/private_modules/hexo-renderer-uppyexamples/index.js @@ -2,11 +2,11 @@ // We fire our own build-examples.js and tell it which example to build - // that script then writes temporary js files // which we return via the callback. -var exec = require('child_process').exec -var path = require('path') -var fs = require('fs') -var uuid = require('uuid') -var webRoot = path.dirname(path.dirname(__dirname)) +var exec = require('child_process').exec +var path = require('path') +var fs = require('fs') +var uuid = require('uuid') +var webRoot = path.dirname(path.dirname(__dirname)) var browserifyScript = webRoot + '/build-examples.js' function parseExamplesBrowserify (data, options, callback) { @@ -19,9 +19,9 @@ function parseExamplesBrowserify (data, options, callback) { } // var slug = data.path.replace(/[^a-zA-Z0-9\_\.]/g, '-') - var slug = uuid.v4() + var slug = uuid.v4() var tmpFile = '/tmp/' + slug + '.js' - var cmd = 'node ' + browserifyScript + ' ' + data.path + ' ' + tmpFile + ' --colors' + var cmd = 'node ' + browserifyScript + ' ' + data.path + ' ' + tmpFile + ' --colors' // hexo.log.i('hexo-renderer-uppyexamples: change detected in examples. running: ' + cmd); exec(cmd, function (err, stdout, stderr) { if (err) { diff --git a/website/themes/uppy/source/js/common.js b/website/themes/uppy/source/js/common.js index e3aae0ca6..3f6e16d33 100644 --- a/website/themes/uppy/source/js/common.js +++ b/website/themes/uppy/source/js/common.js @@ -69,7 +69,7 @@ // init smooth scroll window.smoothScroll.init({ - speed : 400, + speed: 400, offset: window.innerWidth > 720 ? 40 : 58 diff --git a/website/update.js b/website/update.js index cad42b422..f647475f6 100644 --- a/website/update.js +++ b/website/update.js @@ -1,19 +1,19 @@ var fs = require('fs') -var path = require('path') +var path = require('path') var chalk = require('chalk') -var webRoot = __dirname +var webRoot = __dirname var uppyRoot = path.dirname(__dirname) var configPath = webRoot + '/_config.yml' -var config = fs.readFileSync(configPath, 'utf-8') -var version = require(uppyRoot + '/package.json').version +var config = fs.readFileSync(configPath, 'utf-8') +var version = require(uppyRoot + '/package.json').version // Inject current Uppy version and sizes in website's _config.yml -var sizes = {} +var sizes = {} var locations = { min: uppyRoot + '/dist/uppy.js', - gz : uppyRoot + '/dist/uppy.js', + gz: uppyRoot + '/dist/uppy.js', dev: uppyRoot + '/dist/uppy.js', css: uppyRoot + '/dist/uppy.css' }