Browse Source

fixed code style

mightyplow 8 years ago
parent
commit
cc995f4a4a
8 changed files with 46 additions and 48 deletions
  1. 2 2
      jslib.js
  2. 6 6
      lib/array.js
  3. 11 11
      lib/file.js
  4. 14 16
      lib/function.js
  5. 5 5
      lib/html.js
  6. 4 4
      lib/object.js
  7. 2 2
      lib/string.js
  8. 2 2
      lib/stylesheet.js

+ 2 - 2
jslib.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 module.exports = {
     array: require('./lib/array'),
@@ -8,4 +8,4 @@ module.exports = {
     object: require('./lib/object'),
     string: require('./lib/string'),
     stylesheet: require('./lib/stylesheet')
-}
+};

+ 6 - 6
lib/array.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 module.exports = {
     toArray: arraylike => Array.prototype.slice.call(arraylike || []),
@@ -6,12 +6,12 @@ module.exports = {
     flatten: function flatten (ar) {
         return ar.reduce((acc, item) => {
             if (Array.isArray(item)) {
-                acc.push.apply(acc, flatten(item))
+                acc.push.apply(acc, flatten(item));
             } else {
-                acc.push(item)
+                acc.push(item);
             }
 
-            return acc
-        }, [])
+            return acc;
+        }, []);
     }
-}
+};

+ 11 - 11
lib/file.js

@@ -1,29 +1,29 @@
-'use strict'
+'use strict';
 
-const fs = require('fs')
+const fs = require('fs');
 
 module.exports = {
     readFile: filename => {
         return new Promise((resolve, reject) => {
             fs.readFile(filename, (err, data) => {
                 if (err) {
-                    reject(err)
+                    reject(err);
                 } else {
-                    resolve(data)
+                    resolve(data);
                 }
-            })
-        })
+            });
+        });
     },
 
     writeFile: (filename, data) => {
         return new Promise((resolve, reject) => {
             fs.writeFile(filename, data, err => {
                 if (err) {
-                    reject(err)
+                    reject(err);
                 } else {
-                    resolve()
+                    resolve();
                 }
-            })
-        })
+            });
+        });
     }
-}
+};

+ 14 - 16
lib/function.js

@@ -1,28 +1,26 @@
-'use strict'
+'use strict';
 
-const toArray = require('./array').toArray
+const toArray = require('./array').toArray;
 
-const argsToArray = fn => {
-    return function () {
-        return fn(toArray(arguments))
-    }
-}
+const argsToArray = fn => () => fn(toArray(arguments));
 
 const curry = fn => {
     return function curried () {
         const that = this,
-            args = Array.prototype.slice.call(arguments)
+            args = Array.prototype.slice.call(arguments);
 
         if (args.length < fn.length) {
-            return curried.bind.apply(partial, [that].concat(args))
+            return curried.bind.apply(curried, [that].concat(args));
         } else {
-            return fn.apply(that, args)
+            return fn.apply(that, args);
         }
-    }
-}
+    };
+};
+
+const combine = argsToArray(fns => fns.reverse().reduce((fnc, fn) => val => fnc(fn(val))));
 
 module.exports = {
-    argsAsArray: argsToArray,
-    combine: argsToArray(fns => fns.reverse().reduce((fnc, fn) => val => fnc(fn(val)))),
-    curry: curry
-}
+    argsToArray,
+    combine,
+    curry
+};

+ 5 - 5
lib/html.js

@@ -1,11 +1,11 @@
-'use strict'
+'use strict';
 
 module.exports = {
-    createLinkTag: (filename, selector) => {
-        if (selector) {
-            return `<link rel="stylesheet" type="text/css" href="${filename}" media="${selector}" />`
+    createLinkTag: (filename, mediaQuery) => {
+        if (mediaQuery) {
+            return `<link rel="stylesheet" type="text/css" href="${filename}" media="${mediaQuery}" />`;
         }
 
-        return `<link rel="stylesheet" type="text/css" href="${filename}" />`
+        return `<link rel="stylesheet" type="text/css" href="${filename}" />`;
     }
 }

+ 4 - 4
lib/object.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 module.exports = {
     prop: prop => obj => obj[prop],
@@ -6,8 +6,8 @@ module.exports = {
     defaults: (obj, values) => {
         Object.keys(values).forEach(key => {
             if (!obj.hasOwnProperty(key)) {
-                obj[key] = values[key]
+                obj[key] = values[key];
             }
-        })
+        });
     }
-}
+};

+ 2 - 2
lib/string.js

@@ -1,6 +1,6 @@
-'use strict'
+'use strict';
 
 module.exports = {
     append: (str, append) => str + append,
     toBool: val => val === 'true'
-}
+};

+ 2 - 2
lib/stylesheet.js

@@ -10,6 +10,6 @@ module.exports = {
             stylesheet: {
                 rules: rules
             }
-        }
+        };
     }
-}
+};