Browse Source

No more standard exceptions

Kevin van Zonneveld 9 years ago
parent
commit
322c90ccf8

+ 0 - 4
.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}}]
   }
 }

+ 1 - 1
src/core/Core.js

@@ -86,7 +86,7 @@ export default class Core {
   */
   run () {
     console.log({
-      class : 'Core',
+      class: 'Core',
       method: 'run'
     })
 

+ 2 - 2
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, ' ')
   }

+ 4 - 4
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'
   }

+ 4 - 4
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} файлов'

+ 4 - 4
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
     })
 

+ 1 - 1
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 `<li data-type="${icon}" data-name="${file.name}">
-        <span>${icon} : </span>
+        <span>${icon}: </span>
         <span> ${file.name}</span>
       </li>`
     })

+ 3 - 3
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)
       })

+ 1 - 1
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 `<li data-type="${icon}" data-name="${file.name}"><span>${icon} : </span><span> ${file.name}</span></li>`
+      return `<li data-type="${icon}" data-name="${file.name}"><span>${icon}: </span><span> ${file.name}</span></li>`
     })
 
     // appends the list items to the target

+ 2 - 2
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
     })
 

+ 2 - 2
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
     })
 

+ 3 - 3
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) {

+ 5 - 5
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')

+ 7 - 7
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) {

+ 1 - 1
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

+ 6 - 6
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'
 }