lint fix (warnings)

Author: Kirill89

build_embedded_fonts.js

@@ -89,12 +89,7 @@ function parseSvgImage(data, filename) {
     transform = path.getAttribute('transform');
   }
 
-  return {
-    height    : height,
-    width     : width,
-    d         : d,
-    transform : transform
-  };
+  return { height, width, d, transform };
 }
 
 
@@ -151,6 +146,7 @@ _.forEach(args.input_fonts, function (fontDir) {
   _.forEach(cfg.glyphs, function (glyph) {
 
     if (configServer.uids[glyph.uid]) {
+      /*eslint-disable no-console*/
       console.log('Duplicated uid "' + glyph.uid + '"in ' + fontDir);
       process.exit(1);
     }
@@ -225,8 +221,8 @@ _.forEach(configServer.uids, function (glyph) {
 });
 
 var svgOut = svgFontTemplate({
-  font : font,
-  glyphs : glyphs,
+  font,
+  glyphs,
   metadata: 'internal font for fontello.com website',
   fontHeight : font.ascent - font.descent
 });

client/fontello/app/app.js

@@ -103,9 +103,9 @@ function updateGlyphCodes() {
 }
 
 
-// Assign  actions handlers
+// Assign actions handlers
 //
-N.wire.once('navigate.done', { priority: -10 }, function () {
+N.wire.once('navigate.done', { priority: -10 }, function page_setup() {
 
   //
   // Setup autosave
@@ -141,11 +141,11 @@ N.wire.once('navigate.done', { priority: -10 }, function () {
   // Basic commands
   //
 
-  N.wire.on('cmd:reset_selected', function () {
+  N.wire.on('cmd:reset_selected', function reset_selected() {
     N.app.fontsList.unselectAll();
   });
 
-  N.wire.on('cmd:reset_all', function (src) {
+  N.wire.on('cmd:reset_all', function reset_all(src) {
 
     // is `src` set, then event was produced
     // by link click and we need confirmation
@@ -170,26 +170,26 @@ N.wire.once('navigate.done', { priority: -10 }, function () {
     N.app.fontsList.unlock();
   });
 
-  N.wire.on('cmd:toggle_hinting', function () {
+  N.wire.on('cmd:toggle_hinting', function toggle_hinting() {
     N.app.hinting(!N.app.hinting());
   });
 
-  N.wire.on('cmd:set_encoding_pua', function () {
+  N.wire.on('cmd:set_encoding_pua', function set_encoding_pua() {
     N.app.encoding('pua');
     updateGlyphCodes();
   });
 
-  N.wire.on('cmd:set_encoding_ascii', function () {
+  N.wire.on('cmd:set_encoding_ascii', function set_encoding_ascii() {
     N.app.encoding('ascii');
     updateGlyphCodes();
   });
 
-  N.wire.on('cmd:set_encoding_unicode', function () {
+  N.wire.on('cmd:set_encoding_unicode', function set_encoding_unicode() {
     N.app.encoding('unicode');
     updateGlyphCodes();
   });
 
-  N.wire.on('cmd:clear_custom_icons', function () {
+  N.wire.on('cmd:clear_custom_icons', function clear_custom_icons() {
     var custom_icons = N.app.fontsList.getFont('custom_icons');
 
     // if something selected - delete selected icons

client/fontello/app/import/_svg_image_flatten.js

@@ -150,7 +150,7 @@ function processTree(node, ignoredTags, ignoredAttrs, parentTransforms, path) {
     if (path !== '' && transformedPath !== '') {
       guaranteed = false;
     }
-    path = path + transformedPath;
+    path += transformedPath;
 
     // Check not supported attributes
     _.each(item.attributes, function (item) {
@@ -161,12 +161,7 @@ function processTree(node, ignoredTags, ignoredAttrs, parentTransforms, path) {
     });
   });
 
-  return {
-    path: path,
-    ignoredTags: ignoredTags,
-    ignoredAttrs: ignoredAttrs,
-    guaranteed: guaranteed
-  };
+  return { path, ignoredTags, ignoredAttrs, guaranteed };
 }
 
 /**
@@ -292,16 +287,16 @@ module.exports =  function convert(sourceXml) {
     y: 0,
     ignoredTags: [],
     ignoredAttrs: [],
-    error: error,
+    error,
     guaranteed: false
   };
 
   var xmlDoc = (new XMLDOMParser({
     errorHandler: {
-      error: function (err) {
+      error(err) {
         error = err;
       },
-      fatalError: function (err) {
+      fatalError(err) {
         error = err;
       }
     }

client/fontello/app/import/import.js

@@ -109,6 +109,7 @@ function import_config(str, file) {
     });
   } catch (e) {
     N.wire.emit('notify', t('err_bad_config_format', { name: file.name }));
+    /*eslint-disable no-console*/
     console.log(e);
   }
 }
@@ -205,7 +206,7 @@ function import_svg_font(data/*, file*/) {
       search:  [ glyphName ],
       svg: {
         path:  d,
-        width: width
+        width
       }
     });
   });
@@ -232,6 +233,7 @@ function import_svg_image(data, file) {
 
   if (result.error) {
     N.wire.emit('notify', t('err_invalid_format'));
+    /*eslint-disable no-console*/
     console.error(result.error);
     return;
   }
@@ -243,7 +245,7 @@ function import_svg_image(data, file) {
   var skipped = _.union(result.ignoredTags, result.ignoredAttrs);
 
   if (skipped.length > 0) {
-    N.wire.emit('notify', t('err_skiped_tags', { 'skipped' : skipped.toString() }));
+    N.wire.emit('notify', t('err_skiped_tags', { skipped: skipped.toString() }));
   } else if (!result.guaranteed) {
     N.wire.emit('notify', t('err_merge_path'));
   }
@@ -266,8 +268,8 @@ function import_svg_image(data, file) {
     charRef:  allocatedRefCode++,
     search:   [ glyphName ],
     svg: {
-      path:   d,
-      width:  width
+      path: d,
+      width
     }
   });
 }
@@ -371,7 +373,7 @@ function handleFileSelect(event) {
 ////////////////////////////////////////////////////////////////////////////////
 
 
-N.wire.once('navigate.done', function () {
+N.wire.once('navigate.done', function page_setup() {
 
   //
   // Create regular files selector
@@ -394,7 +396,7 @@ N.wire.once('navigate.done', function () {
   $input.on('change', handleFileSelect);
 
   // handle settings menu click -> open file dialog
-  N.wire.on('import.start', function () {
+  N.wire.on('import.start', function open_file_dlg() {
     $input.click();
   });
 
@@ -446,7 +448,7 @@ N.wire.once('navigate.done', function () {
 //
 // Setup import listener
 //
-N.wire.on('import.obj', function (obj) {
+N.wire.on('import.obj', function setup_import(obj) {
   N.app.fontsList.lock();
 
   import_config(JSON.stringify(obj), {});

client/fontello/app/session/session.js

@@ -145,7 +145,7 @@ N.wire.on('session_save', _.debounce(function () {
 
 
 
-N.wire.on('session_load', function () {
+N.wire.on('session_load', function session_load() {
   var session, data;
 
   if (!store.exists()) { return; }

client/fontello/blocks/codes_editor/codes_editor.js

@@ -17,7 +17,7 @@ N.wire.once('navigate.done', function () {
 
   // Remove glyph from selection
   //
-  N.wire.on('codes_edit:glyph_remove', function (data) {
+  N.wire.on('codes_edit:glyph_remove', function glyph_remove(data) {
     var $el    = data.$this;
     var id    = $el.data('id');
     var glyph = N.app.fontsList.getGlyph(id);

client/fontello/blocks/names_editor/names_editor.js

@@ -24,7 +24,7 @@ N.wire.once('navigate.done', function () {
 
   // Remove glyph from selection
   //
-  N.wire.on('names_edit:glyph_remove', function (data) {
+  N.wire.on('names_edit:glyph_remove', function glyph_remove(data) {
     var $el    = data.$this;
     var id    = $el.data('id');
     var glyph = N.app.fontsList.getGlyph(id);

client/fontello/blocks/selector/selector.js

@@ -25,10 +25,10 @@ N.wire.once('navigate.done', function () {
   $('#selector').selectable({
     filter: '.selector__glyph:visible',
     distance: 3,
-    start: function () {
+    start() {
       $('#selector').addClass('_multicursor');
     },
-    stop: function () {
+    stop() {
       var $els = $view.find('.selector__glyph.ui-selected');
 
       // prevent from double-triggering event,
@@ -65,7 +65,7 @@ N.wire.once('navigate.done', function () {
 
   // Toggle glyph state on click
   //
-  N.wire.on('selector:glyph_toggle', function (data) {
+  N.wire.on('selector:glyph_toggle', function glyph_toggle(data) {
     var id = data.$this.data('id');
     var glyph = N.app.fontsList.getGlyph(id);
 
@@ -74,7 +74,7 @@ N.wire.once('navigate.done', function () {
 
   // Toggle font collapse state on click
   //
-  N.wire.on('selector:font_collapse', function (data) {
+  N.wire.on('selector:font_collapse', function font_collapse(data) {
     var id = data.$this.data('id');
     var font = N.app.fontsList.getFont(id);
 

client/fontello/blocks/toolbar/toolbar.js

@@ -117,14 +117,14 @@ N.wire.once('navigate.done', function (data) {
   //
   // Save on button press
   //
-  N.wire.on('api.update', function () {
+  N.wire.on('api.update', function api_save() {
     return save();
   });
 
   //
   // Export on button press (save & go to pingback url)
   //
-  N.wire.on('api.export',  function () {
+  N.wire.on('api.export',  function api_export() {
     return save().then(() => {
       window.location = N.app.apiUrl();
     });
@@ -133,7 +133,7 @@ N.wire.once('navigate.done', function (data) {
   //
   // build font on button press
   //
-  N.wire.on('build_font', function () {
+  N.wire.on('build_font', function build_font() {
     // That should not happen, but check for safety
     if (!N.app.fontsList.selectedCount()) {
       return;
@@ -159,10 +159,10 @@ N.wire.once('navigate.done', function (data) {
 
       // inject download url via iframe to start download
       var id = res.id;  // generated file id
-      var url = N.router.linkTo('fontello.font.download', { id: id });
+      var url = N.router.linkTo('fontello.font.download', { id });
       $('iframe#' + id).remove();
       $('<iframe></iframe>')
-        .attr({ id: id, src: url })
+        .attr({ id, src: url })
         .css('display', 'none')
         .appendTo(window.document.body);
     });

client/fontello/layout/layout.js

@@ -4,15 +4,15 @@
 // Reassign tooltip handler
 // after every significant page render
 //
-N.wire.after('navigate.done', function () {
+N.wire.after('navigate.done', function reassign_tooltip_handler() {
   $('._tip').tooltip();
   $('._popover').popover();
 });
 
 
 // Social buttons defered load - after all
 //
-N.wire.once('navigate.done', { priority: 10 }, function () {
+N.wire.once('navigate.done', { priority: 10 }, function load_social_buttons() {
   setTimeout(function () {
     function injectScript(src, async, id) {
       var el, script;

client/fontello/models/_lib/codes_tracker.js

@@ -213,5 +213,5 @@ function observe(glyph) {
 
 module.exports = function (_N) {
   N = _N;
-  return { observe: observe };
+  return { observe };
 };

client/fontello/models/_lib/fontface.js

@@ -14,7 +14,7 @@ module.exports = function (svg, fontId) {
   var ttf = svg2ttf(svg, {}).buffer;
   var fontInfo = {
     ttfDataUri : 'data:font/truetype;base64,' + b64.fromByteArray(ttf),
-    fontId : fontId
+    fontId
   };
 
   var fontfaceTemplate =

client/fontello/models/models.js

@@ -122,10 +122,10 @@ N.wire.once('navigate.done', { priority: -100 }, function () {
     // code value as character (for code editor)
     //
     this.customChar = ko.computed({
-      read: function () {
+      read() {
         return utils.fixedFromCharCode(this.code());
       },
-      write: function (value) {
+      write(value) {
         this.code(utils.fixedCharCodeAt(value));
       },
       owner: this
@@ -134,11 +134,11 @@ N.wire.once('navigate.done', { priority: -100 }, function () {
     // code value as hex-string (for code editor)
     //
     this.customHex = ko.computed({
-      read: function () {
+      read() {
         var code = this.code().toString(16).toUpperCase();
         return '0000'.substr(0, Math.max(4 - code.length, 0)) + code;
       },
-      write: function (value) {
+      write(value) {
         // value must be HEX string - omit invalid chars
         value = 0 + value.replace(/[^0-9a-fA-F]+/g, '');
         this.code(parseInt(value, 16));

server/fontello/app.js

@@ -47,7 +47,7 @@ module.exports = function (N, apiPath) {
         if (!sl) {
           callback({
             code: N.io.REDIRECT,
-            head: { 'Location': '/' }
+            head: { Location: '/' }
           });
           return;
         }