published 2.1.2

davidfig · Nov 18, 2019 · d2345ec · d2345ec
1 parent da03a31
commit d2345ec
Show file tree

Hide file tree

Showing 14 changed files with 7,302 additions and 7,539 deletions.
diff --git a/dist/scrollbox.es.js b/dist/scrollbox.es.js
diff --git a/dist/scrollbox.es.js.map b/dist/scrollbox.es.js.map
diff --git a/dist/scrollbox.js b/dist/scrollbox.js
diff --git a/dist/scrollbox.js.map b/dist/scrollbox.js.map
diff --git a/docs/index.js b/docs/index.js
diff --git a/docs/index.js.map b/docs/index.js.map
diff --git a/docs/jsdoc/EventEmitter-.html b/docs/jsdoc/EventEmitter-.html
@@ -275,7 +275,7 @@ <h4 class="name" id="EventEmitter">
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/Scrollbox.html b/docs/jsdoc/Scrollbox.html
@@ -2317,7 +2317,7 @@ <h4 class="name" id="activateFade">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line524">scrollbox.js:524</a>
+            <a href="src_scrollbox.js.html#line527">scrollbox.js:527</a>
         </div>
 
     </div>
@@ -2393,7 +2393,7 @@ <h4 class="name" id="ensureVisible">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line669">scrollbox.js:669</a>
+            <a href="src_scrollbox.js.html#line672">scrollbox.js:672</a>
         </div>
 
     </div>
@@ -2583,7 +2583,7 @@ <h4 class="name" id="resize">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line646">scrollbox.js:646</a>
+            <a href="src_scrollbox.js.html#line649">scrollbox.js:649</a>
         </div>
 
     </div>
@@ -2846,7 +2846,7 @@ <h4 class="name" id="update">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line453">scrollbox.js:453</a>
+            <a href="src_scrollbox.js.html#line456">scrollbox.js:456</a>
         </div>
 
     </div>
@@ -2922,7 +2922,7 @@ <h4 class="name" id="updateLoop">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line478">scrollbox.js:478</a>
+            <a href="src_scrollbox.js.html#line481">scrollbox.js:481</a>
         </div>
 
     </div>
@@ -3045,7 +3045,7 @@ <h4 class="name" id="updateLoop">
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/index.html b/docs/jsdoc/index.html
@@ -236,7 +236,7 @@ <h2>license</h2>
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/node_modules_eventemitter3_index.js.html b/docs/jsdoc/node_modules_eventemitter3_index.js.html
@@ -506,7 +506,7 @@ <h2>node_modules/eventemitter3/index.js</h2>
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/node_modules_eventemitter3_umd_eventemitter3.js.html b/docs/jsdoc/node_modules_eventemitter3_umd_eventemitter3.js.html
@@ -510,7 +510,7 @@ <h2>node_modules/eventemitter3/umd/eventemitter3.js</h2>
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/src_scrollbox.js.html b/docs/jsdoc/src_scrollbox.js.html
@@ -218,6 +218,9 @@ <h2>src/scrollbox.js</h2>
     {
         super()
         this.options = Object.assign({}, scrollboxOptions, options)
+        if (options.overflow) {
+            this.options.overflowX = this.options.overflowY = options.overflow
+        }
         this.ease = typeof this.options.fadeScrollboxEase === 'function' ? this.options.fadeScrollboxEase : Penner[this.options.fadeScrollboxEase]
 
         /**
@@ -843,7 +846,7 @@ <h2>src/scrollbox.js</h2>
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Sat Sep 14 2019 07:48:20 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Tue Nov 19 2019 04:30:32 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/src/scrollbox.js b/src/scrollbox.js
@@ -59,6 +59,9 @@ export class Scrollbox extends PIXI.Container
     {
         super()
         this.options = Object.assign({}, scrollboxOptions, options)
+        if (options.overflow) {
+            this.options.overflowX = this.options.overflowY = options.overflow
+        }
         this.ease = typeof this.options.fadeScrollboxEase === 'function' ? this.options.fadeScrollboxEase : Penner[this.options.fadeScrollboxEase]
 
         /**