Skip to content

Commit 7f3b247

Browse files
mattboldtmattboldt
committed
Fixes #526. Also fixed fadeout bug when using multiple instances
1 parent 3b71569 commit 7f3b247

15 files changed

+496
-172
lines changed

‎assets/demos.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ document.addEventListener('DOMContentLoaded', function () {
44
typeSpeed: 20,
55
backSpeed: 20,
66
startDelay: 100,
7-
loop: false,
7+
loop: true,
88
loopCount: Infinity,
99
onBegin: function (self) {
1010
prettyLog('onBegin ' + self);

‎dist/typed.cjs‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎dist/typed.cjs.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/typed.module.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/typed.module.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/typed.umd.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/typed.umd.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/file/src/html-parser.js.html‎

Lines changed: 135 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,123 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<base data-ice="baseUrl" href="../../">
6-
<title data-ice="title">src/html-parser.js | typed.js</title>
7-
<link type="text/css" rel="stylesheet" href="css/style.css">
8-
<link type="text/css" rel="stylesheet" href="css/prettify-tomorrow.css">
9-
<script src="script/prettify/prettify.js"></script>
10-
<script src="script/manual.js"></script>
11-
<meta name="description" content="A JavaScript Typing Animation Library"><meta property="twitter:card" content="summary"><meta property="twitter:title" content="typed.js"><meta property="twitter:description" content="A JavaScript Typing Animation Library"></head>
12-
<body class="layout-container" data-ice="rootContainer">
3+
<head>
4+
<meta charset="utf-8" />
5+
<base data-ice="baseUrl" href="../../" />
6+
<title data-ice="title">src/html-parser.js | typed.js</title>
7+
<link type="text/css" rel="stylesheet" href="css/style.css" />
8+
<link type="text/css" rel="stylesheet" href="css/prettify-tomorrow.css" />
9+
<script src="script/prettify/prettify.js"></script>
10+
<script src="script/manual.js"></script>
11+
<meta name="description" content="A JavaScript Typing Animation Library" />
12+
<meta property="twitter:card" content="summary" />
13+
<meta property="twitter:title" content="typed.js" />
14+
<meta
15+
property="twitter:description"
16+
content="A JavaScript Typing Animation Library"
17+
/>
18+
</head>
19+
<body class="layout-container" data-ice="rootContainer">
20+
<header>
21+
<a href="./">Home</a>
1322

14-
<header>
15-
<a href="./">Home</a>
16-
17-
<a href="identifiers.html">Reference</a>
18-
<a href="source.html">Source</a>
19-
20-
<div class="search-box">
21-
<span>
22-
<img src="./image/search.png">
23-
<span class="search-input-edge"></span><input class="search-input"><span class="search-input-edge"></span>
24-
</span>
25-
<ul class="search-result"></ul>
26-
</div>
27-
<a style="position:relative; top:3px;" href="https://github.com/mattboldt/typed.js"><img width="20px" src="./image/github.png"></a></header>
23+
<a href="identifiers.html">Reference</a>
24+
<a href="source.html">Source</a>
2825

29-
<nav class="navigation" data-ice="nav"><div>
30-
<ul>
31-
32-
<li data-ice="doc"><span data-ice="kind" class="kind-class">C</span><span data-ice="name"><span><a href="class/src/html-parser.js~HTMLParser.html">HTMLParser</a></span></span></li>
33-
<li data-ice="doc"><span data-ice="kind" class="kind-class">C</span><span data-ice="name"><span><a href="class/src/initializer.js~Initializer.html">Initializer</a></span></span></li>
34-
<li data-ice="doc"><span data-ice="kind" class="kind-class">C</span><span data-ice="name"><span><a href="class/src/typed-using-raf.js~Typed.html">Typed</a></span></span></li>
35-
<li data-ice="doc"><span data-ice="kind" class="kind-class">C</span><span data-ice="name"><span><a href="class/src/typed.js~Typed.html">Typed</a></span></span></li>
36-
<li data-ice="doc"><span data-ice="kind" class="kind-variable">V</span><span data-ice="name"><span><a href="variable/index.html#static-variable-defaults">defaults</a></span></span></li>
37-
<li data-ice="doc"><span data-ice="kind" class="kind-variable">V</span><span data-ice="name"><span><a href="variable/index.html#static-variable-htmlParser">htmlParser</a></span></span></li>
38-
<li data-ice="doc"><span data-ice="kind" class="kind-variable">V</span><span data-ice="name"><span><a href="variable/index.html#static-variable-initializer">initializer</a></span></span></li>
39-
</ul>
40-
</div>
41-
</nav>
26+
<div class="search-box">
27+
<span>
28+
<img src="./image/search.png" />
29+
<span class="search-input-edge"></span
30+
><input class="search-input" /><span class="search-input-edge"></span>
31+
</span>
32+
<ul class="search-result"></ul>
33+
</div>
34+
<a
35+
style="position: relative; top: 3px"
36+
href="https://github.com/mattboldt/typed.js"
37+
><img width="20px" src="./image/github.png"
38+
/></a>
39+
</header>
4240

43-
<div class="content" data-ice="content"><h1 data-ice="title">src/html-parser.js</h1>
44-
<pre class="source-code line-number raw-source-code"><code class="prettyprint linenums" data-ice="content">/**
41+
<nav class="navigation" data-ice="nav">
42+
<div>
43+
<ul>
44+
<li data-ice="doc">
45+
<span data-ice="kind" class="kind-class">C</span
46+
><span data-ice="name"
47+
><span
48+
><a href="class/src/html-parser.js~HTMLParser.html"
49+
>HTMLParser</a
50+
></span
51+
></span
52+
>
53+
</li>
54+
<li data-ice="doc">
55+
<span data-ice="kind" class="kind-class">C</span
56+
><span data-ice="name"
57+
><span
58+
><a href="class/src/initializer.js~Initializer.html"
59+
>Initializer</a
60+
></span
61+
></span
62+
>
63+
</li>
64+
<li data-ice="doc">
65+
<span data-ice="kind" class="kind-class">C</span
66+
><span data-ice="name"
67+
><span
68+
><a href="class/src/typed-using-raf.js~Typed.html"
69+
>Typed</a
70+
></span
71+
></span
72+
>
73+
</li>
74+
<li data-ice="doc">
75+
<span data-ice="kind" class="kind-class">C</span
76+
><span data-ice="name"
77+
><span
78+
><a href="class/src/typed.js~Typed.html">Typed</a></span
79+
></span
80+
>
81+
</li>
82+
<li data-ice="doc">
83+
<span data-ice="kind" class="kind-variable">V</span
84+
><span data-ice="name"
85+
><span
86+
><a href="variable/index.html#static-variable-defaults"
87+
>defaults</a
88+
></span
89+
></span
90+
>
91+
</li>
92+
<li data-ice="doc">
93+
<span data-ice="kind" class="kind-variable">V</span
94+
><span data-ice="name"
95+
><span
96+
><a href="variable/index.html#static-variable-htmlParser"
97+
>htmlParser</a
98+
></span
99+
></span
100+
>
101+
</li>
102+
<li data-ice="doc">
103+
<span data-ice="kind" class="kind-variable">V</span
104+
><span data-ice="name"
105+
><span
106+
><a href="variable/index.html#static-variable-initializer"
107+
>initializer</a
108+
></span
109+
></span
110+
>
111+
</li>
112+
</ul>
113+
</div>
114+
</nav>
115+
116+
<div class="content" data-ice="content">
117+
<h1 data-ice="title">src/html-parser.js</h1>
118+
<pre
119+
class="source-code line-number raw-source-code"
120+
><code class="prettyprint linenums" data-ice="content">/**
45121
* TODO: These methods can probably be combined somehow
46122
* Parse HTML tags &amp; HTML Characters
47123
*/
@@ -58,15 +134,15 @@
58134

59135
typeHtmlChars(curString, curStrPos, self) {
60136
if (self.contentType !== &apos;html&apos;) return curStrPos;
61-
const curChar = curString.substr(curStrPos).charAt(0);
137+
const curChar = curString.substring(curStrPos).charAt(0);
62138
if (curChar === &apos;&lt;&apos; || curChar === &apos;&amp;&apos;) {
63139
let endTag = &apos;&apos;;
64140
if (curChar === &apos;&lt;&apos;) {
65141
endTag = &apos;&gt;&apos;;
66142
} else {
67143
endTag = &apos;;&apos;;
68144
}
69-
while (curString.substr(curStrPos + 1).charAt(0) !== endTag) {
145+
while (curString.substring(curStrPos + 1).charAt(0) !== endTag) {
70146
curStrPos++;
71147
if (curStrPos + 1 &gt; curString.length) {
72148
break;
@@ -87,15 +163,15 @@
87163
*/
88164
backSpaceHtmlChars(curString, curStrPos, self) {
89165
if (self.contentType !== &apos;html&apos;) return curStrPos;
90-
const curChar = curString.substr(curStrPos).charAt(0);
166+
const curChar = curString.substring(curStrPos).charAt(0);
91167
if (curChar === &apos;&gt;&apos; || curChar === &apos;;&apos;) {
92168
let endTag = &apos;&apos;;
93169
if (curChar === &apos;&gt;&apos;) {
94170
endTag = &apos;&lt;&apos;;
95171
} else {
96172
endTag = &apos;&amp;&apos;;
97173
}
98-
while (curString.substr(curStrPos - 1).charAt(0) !== endTag) {
174+
while (curString.substring(curStrPos - 1).charAt(0) !== endTag) {
99175
curStrPos--;
100176
if (curStrPos &lt; 0) {
101177
break;
@@ -109,19 +185,22 @@
109185

110186
export let htmlParser = new HTMLParser();
111187
</code></pre>
188+
</div>
112189

113-
</div>
114-
115-
<footer class="footer">
116-
Generated by <a href="https://esdoc.org">ESDoc<span data-ice="esdocVersion">(1.1.0)</span><img src="./image/esdoc-logo-mini-black.png"></a>
117-
</footer>
190+
<footer class="footer">
191+
Generated by
192+
<a href="https://esdoc.org"
193+
>ESDoc<span data-ice="esdocVersion">(1.1.0)</span
194+
><img src="./image/esdoc-logo-mini-black.png"
195+
/></a>
196+
</footer>
118197

119-
<script src="script/search_index.js"></script>
120-
<script src="script/search.js"></script>
121-
<script src="script/pretty-print.js"></script>
122-
<script src="script/inherited-summary.js"></script>
123-
<script src="script/test-summary.js"></script>
124-
<script src="script/inner-link.js"></script>
125-
<script src="script/patch-for-local.js"></script>
126-
</body>
198+
<script src="script/search_index.js"></script>
199+
<script src="script/search.js"></script>
200+
<script src="script/pretty-print.js"></script>
201+
<script src="script/inherited-summary.js"></script>
202+
<script src="script/test-summary.js"></script>
203+
<script src="script/inner-link.js"></script>
204+
<script src="script/patch-for-local.js"></script>
205+
</body>
127206
</html>

0 commit comments

Comments
 (0)