typed.js 2.0.7 → 2.0.11

package/src/initializer.js

@@ -20,7 +20,7 @@ export default class Initializer {
       self.el = elementId;
     }
 
-    self.options = {...defaults, ...options};
+    self.options = { ...defaults, ...options };
 
     // attribute to type into
     self.isInput = self.el.tagName.toLowerCase() === 'input';
@@ -37,7 +37,9 @@ export default class Initializer {
     self.cursorBlinking = true;
 
     // text content of element
-    self.elContent = self.attr ? self.el.getAttribute(self.attr) : self.el.textContent;
+    self.elContent = self.attr
+      ? self.el.getAttribute(self.attr)
+      : self.el.textContent;
 
     // html or plain text
     self.contentType = self.options.contentType;
@@ -113,7 +115,7 @@ export default class Initializer {
       typewrite: true,
       curString: '',
       curStrPos: 0
-    }
+    };
 
     // When the typing is complete (when not looped)
     self.typingComplete = false;
@@ -146,11 +148,21 @@ export default class Initializer {
   }
 
   appendAnimationCss(self) {
-    if (!self.autoInsertCss) { return; }
-    if (!self.showCursor || !self.fadeOut) { return; }
+    const cssDataName = 'data-typed-js-css';
+    if (!self.autoInsertCss) {
+      return;
+    }
+    if (!self.showCursor && !self.fadeOut) {
+      return;
+    }
+    if (document.querySelector(`[${cssDataName}]`)) {
+      return;
+    }
 
     let css = document.createElement('style');
     css.type = 'text/css';
+    css.setAttribute(cssDataName, true);
+
     let innerCss = '';
     if (self.showCursor) {
       innerCss += `
@@ -184,7 +196,9 @@ export default class Initializer {
         }
       `;
     }
-    if (css.length === 0) { return; }
+    if (css.length === 0) {
+      return;
+    }
     css.innerHTML = innerCss;
     document.body.appendChild(css);
   }

package/src/typed.js

@@ -87,6 +87,7 @@ export default class Typed {
    * @private
    */
   begin() {
+    this.options.onBegin(this);
     this.typingComplete = false;
     this.shuffleStringsIfNeeded(this);
     this.insertCursor();
@@ -141,7 +142,9 @@ export default class Typed {
           this.temporaryPause = true;
           this.options.onTypingPaused(this.arrayPos, this);
           // strip out the escape character and pause value so they're not printed
-          curString = curString.substring(0, curStrPos) + curString.substring(curStrPos + skip);
+          curString =
+            curString.substring(0, curStrPos) +
+            curString.substring(curStrPos + skip);
           this.toggleBlinking(true);
         }
       }
@@ -155,7 +158,10 @@ export default class Typed {
         }
         // strip out the escape characters and append all the string in between
         const stringBeforeSkip = curString.substring(0, curStrPos);
-        const stringSkipped = curString.substring(stringBeforeSkip.length + 1, curStrPos + numChars);
+        const stringSkipped = curString.substring(
+          stringBeforeSkip.length + 1,
+          curStrPos + numChars
+        );
         const stringAfterSkip = curString.substring(curStrPos + numChars + 1);
         curString = stringBeforeSkip + stringSkipped + stringAfterSkip;
         numChars--;
@@ -167,7 +173,7 @@ export default class Typed {
         this.toggleBlinking(false);
 
         // We're done with this sentence!
-        if (curStrPos === curString.length) {
+        if (curStrPos >= curString.length) {
           this.doneTyping(curString, curStrPos);
         } else {
           this.keepTyping(curString, curStrPos, numChars);
@@ -205,7 +211,7 @@ export default class Typed {
   }
 
   /**
-   * We're done typing all strings
+   * We're done typing the current string
    * @param {string} curString the current string in the strings array
    * @param {number} curStrPos the current position in the curString
    * @private
@@ -254,7 +260,10 @@ export default class Typed {
       if (this.smartBackspace) {
         // the remaining part of the current string is equal of the same part of the new string
         let nextString = this.strings[this.arrayPos + 1];
-        if (nextString && curStringAtPosition === nextString.substr(0, curStrPos)) {
+        if (
+          nextString &&
+          curStringAtPosition === nextString.substr(0, curStrPos)
+        ) {
           this.stopNum = curStrPos;
         } else {
           this.stopNum = 0;
@@ -336,7 +345,7 @@ export default class Typed {
    * @private
    */
   humanizer(speed) {
-    return Math.round(Math.random() * speed / 2) + speed;
+    return Math.round((Math.random() * speed) / 2) + speed;
   }
 
   /**
@@ -400,7 +409,9 @@ export default class Typed {
       this.stop();
     });
     this.el.addEventListener('blur', (e) => {
-      if (this.el.value && this.el.value.length !== 0) { return; }
+      if (this.el.value && this.el.value.length !== 0) {
+        return;
+      }
       this.start();
     });
   }
@@ -415,6 +426,7 @@ export default class Typed {
     this.cursor = document.createElement('span');
     this.cursor.className = 'typed-cursor';
     this.cursor.innerHTML = this.cursorChar;
-    this.el.parentNode && this.el.parentNode.insertBefore(this.cursor, this.el.nextSibling);
+    this.el.parentNode &&
+      this.el.parentNode.insertBefore(this.cursor, this.el.nextSibling);
   }
 }

package/webpack.config.js

@@ -41,7 +41,5 @@ export default {
       }
     ]
   },
-  plugins: [
-    new webpack.BannerPlugin(banner)
-  ]
+  plugins: [new webpack.BannerPlugin(banner)]
 };