published 2.2.2

davidfig · Dec 1, 2020 · b7550e2 · b7550e2
1 parent 1b26c81
commit b7550e2
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 19 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/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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/Scrollbox.html b/docs/jsdoc/Scrollbox.html
@@ -184,7 +184,7 @@ <h4 class="name" id="Scrollbox">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line58">scrollbox.js:58</a>
+            <a href="src_scrollbox.js.html#line29">scrollbox.js:29</a>
         </div>
 
     </div>
@@ -2393,7 +2393,7 @@ <h4 class="name" id="ensureVisible">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line678">scrollbox.js:678</a>
+            <a href="src_scrollbox.js.html#line682">scrollbox.js:682</a>
         </div>
 
     </div>
@@ -2583,7 +2583,7 @@ <h4 class="name" id="resize">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line655">scrollbox.js:655</a>
+            <a href="src_scrollbox.js.html#line659">scrollbox.js:659</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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/index.html b/docs/jsdoc/index.html
@@ -239,7 +239,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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/src_scrollbox.js.html b/docs/jsdoc/src_scrollbox.js.html
@@ -776,14 +776,18 @@ <h2>src/scrollbox.js</h2>
             if (this.pointerDown.type === 'horizontal')
             {
                 const local = this.toLocal(e.data.global)
-                this.content.left += local.x - this.pointerDown.last.x
+                const width = this.scrollWidth + (this.isScrollbarVertical ? this.options.scrollbarSize : 0)
+                this.scrollbarLeft += local.x - this.pointerDown.last.x
+                this.content.left = this.scrollbarLeft / this.boxWidth * width
                 this.pointerDown.last = local
                 this.update()
             }
             else if (this.pointerDown.type === 'vertical')
             {
                 const local = this.toLocal(e.data.global)
-                this.content.top += local.y - this.pointerDown.last.y
+                const height = this.scrollHeight + (this.isScrollbarHorizontal ? this.options.scrollbarSize : 0)
+                this.scrollbarTop += local.y - this.pointerDown.last.y
+                this.content.top = this.scrollbarTop / this.boxHeight * height
                 this.pointerDown.last = local
                 this.update()
             }
@@ -852,7 +856,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 Wed Nov 25 2020 18:34:24 GMT+0800 (Taipei Standard Time)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Dec 01 2020 08:19:59 GMT+0800 (Taipei Standard Time)
             </div>
         </footer>
     </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pixi-scrollbox",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "a scrollbox built for pixi.js using a masked box that scrolls vertically and/or horizontally with optional scrollbars",
     "main": "dist/scrollbox.js",
     "module": "dist/scrollbox.es.js",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,6 +1,7 @@
 import peerDepsExternal from 'rollup-plugin-peer-deps-external'
 import { terser } from 'rollup-plugin-terser'
 import resolve from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
 
 export default [
 {