update dependencies and lint fixes

vueup · Aug 29, 2018 · c87c749 · c87c749
1 parent a5894ab
commit c87c749
Show file tree

Hide file tree

Showing 14 changed files with 1,667 additions and 3,862 deletions.
diff --git a/blots/inline.js b/blots/inline.js
@@ -8,9 +8,11 @@ class Inline extends InlineBlot {
     const otherIndex = Inline.order.indexOf(other);
     if (selfIndex >= 0 || otherIndex >= 0) {
       return selfIndex - otherIndex;
-    } else if (self === other) {
+    }
+    if (self === other) {
       return 0;
-    } else if (self < other) {
+    }
+    if (self < other) {
       return -1;
     }
     return 1;

diff --git a/core/editor.js b/core/editor.js
@@ -245,7 +245,8 @@ function convertListHTML(items, lastIndent, types) {
       offset,
       length,
     )}${convertListHTML(rest, indent, types)}`;
-  } else if (indent === lastIndent) {
+  }
+  if (indent === lastIndent) {
     return `</li><li${attribute}>${convertHTML(
       child,
       offset,
@@ -259,9 +260,11 @@ function convertListHTML(items, lastIndent, types) {
 function convertHTML(blot, index, length, isRoot = false) {
   if (typeof blot.html === 'function') {
     return blot.html(index, length);
-  } else if (blot instanceof TextBlot) {
+  }
+  if (blot instanceof TextBlot) {
     return escapeText(blot.value().slice(index, index + length));
-  } else if (blot.children) {
+  }
+  if (blot.children) {
     // TODO fix API
     if (blot.statics.blotName === 'list-container') {
       const items = [];

diff --git a/core/quill.js b/core/quill.js
@@ -183,9 +183,8 @@ class Quill {
       () => {
         const range = this.getSelection(true);
         let change = new Delta();
-        if (range == null) {
-          return change;
-        } else if (this.scroll.query(name, Parchment.Scope.BLOCK)) {
+        if (range == null) return change;
+        if (this.scroll.query(name, Parchment.Scope.BLOCK)) {
           change = this.editor.formatLine(range.index, range.length, {
             [name]: value,
           });

diff --git a/core/selection.js b/core/selection.js
@@ -207,7 +207,8 @@ class Selection {
       const index = blot.offset(this.scroll);
       if (offset === 0) {
         return index;
-      } else if (blot instanceof ContainerBlot) {
+      }
+      if (blot instanceof ContainerBlot) {
         return index + blot.length();
       }
       return index + blot.index(node, offset);

diff --git a/formats/image.js b/formats/image.js
@@ -1,5 +1,5 @@
 import { EmbedBlot } from 'parchment';
-import { sanitize } from '../formats/link';
+import { sanitize } from './link';
 
 const ATTRIBUTES = ['alt', 'height', 'width'];
 

diff --git a/formats/script.js b/formats/script.js
@@ -4,7 +4,8 @@ class Script extends Inline {
   static create(value) {
     if (value === 'super') {
       return document.createElement('sup');
-    } else if (value === 'sub') {
+    }
+    if (value === 'sub') {
       return document.createElement('sub');
     }
     return super.create(value);

diff --git a/formats/video.js b/formats/video.js
@@ -1,5 +1,5 @@
 import { BlockEmbed } from '../blots/block';
-import Link from '../formats/link';
+import Link from './link';
 
 const ATTRIBUTES = ['height', 'width'];
 

diff --git a/modules/clipboard.js b/modules/clipboard.js
@@ -81,7 +81,8 @@ class Clipboard extends Module {
       return new Delta().insert(text, {
         [CodeBlock.blotName]: formats[CodeBlock.blotName],
       });
-    } else if (!html) {
+    }
+    if (!html) {
       return new Delta().insert(text || '');
     }
     const doc = new DOMParser().parseFromString(
@@ -298,7 +299,8 @@ function traverse(scroll, node, elementMatchers, textMatchers, nodeMatches) {
     return textMatchers.reduce((delta, matcher) => {
       return matcher(node, delta, scroll);
     }, new Delta());
-  } else if (node.nodeType === node.ELEMENT_NODE) {
+  }
+  if (node.nodeType === node.ELEMENT_NODE) {
     return Array.from(node.childNodes || []).reduce((delta, childNode) => {
       let childrenDelta = traverse(
         scroll,

diff --git a/modules/keyboard.js b/modules/keyboard.js
@@ -692,9 +692,11 @@ function tableSide(table, row, cell, offset) {
       return offset === 0 ? -1 : 1;
     }
     return cell.prev == null ? -1 : 1;
-  } else if (row.prev == null) {
+  }
+  if (row.prev == null) {
     return -1;
-  } else if (row.next == null) {
+  }
+  if (row.next == null) {
     return 1;
   }
   return null;

diff --git a/modules/syntax.js b/modules/syntax.js
@@ -8,7 +8,7 @@ import BreakBlot from '../blots/break';
 import CursorBlot from '../blots/cursor';
 import TextBlot, { escapeText } from '../blots/text';
 import CodeBlock, { CodeBlockContainer } from '../formats/code';
-import { traverse } from '../modules/clipboard';
+import { traverse } from './clipboard';
 
 const TokenAttributor = new ClassAttributor('code-token', 'hljs', {
   scope: Scope.INLINE,