upgrade dependencies; fixed pixi.js v5 issues

davidfig · Feb 25, 2019 · db9ace0 · db9ace0
1 parent d44ceab
commit db9ace0
Show file tree

Hide file tree

Showing 14 changed files with 47,464 additions and 4,622 deletions.
diff --git a/bundle/scrollbox.js b/bundle/scrollbox.js
diff --git a/bundle/scrollbox.min.js b/bundle/scrollbox.min.js
diff --git a/dist/scrollbox.js b/dist/scrollbox.js
diff --git a/docs/code.js b/docs/code.js
@@ -1,4 +1,4 @@
-window.PIXI = require('pixi.js')
+const PIXI = require('pixi.js')
 const FPS = require('yy-fps')
 const Random = require('yy-random')
 

diff --git a/docs/index.js b/docs/index.js
@@ -1469,7 +1469,7 @@ module.exports = {
 };
 
 },{}],8:[function(require,module,exports){
-window.PIXI = require('pixi.js')
+const PIXI = require('pixi.js')
 const FPS = require('yy-fps')
 const Random = require('yy-random')
 
@@ -38823,7 +38823,7 @@ function getLeftmost(start) {
     var p = start,
         leftmost = start;
     do {
-        if (p.x < leftmost.x) leftmost = p;
+        if (p.x < leftmost.x || (p.x === leftmost.x && p.y < leftmost.y)) leftmost = p;
         p = p.next;
     } while (p !== start);
 
@@ -62640,14 +62640,6 @@ var Ease = {
     load: require('./load')
 };
 
-if (PIXI) {
-    if (PIXI.extras) {
-        PIXI.extras.Ease = Ease;
-    } else {
-        PIXI.extras = { Ease: Ease };
-    }
-}
-
 module.exports = Ease;
 
 },{"./angle":238,"./face":239,"./list":241,"./load":242,"./movie":243,"./shake":244,"./target":245,"./tint":246,"./to":247,"./wait":248}],241:[function(require,module,exports){
@@ -62661,6 +62653,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
+var PIXI = require('pixi.js');
 var Events = require('eventemitter3');
 
 var Angle = require('./angle');
@@ -63030,7 +63023,7 @@ var Ease = function (_Events) {
 
 module.exports = Ease;
 
-},{"./angle":238,"./face":239,"./load":242,"./movie":243,"./shake":244,"./target":245,"./tint":246,"./to":247,"./wait":248,"eventemitter3":249}],242:[function(require,module,exports){
+},{"./angle":238,"./face":239,"./load":242,"./movie":243,"./shake":244,"./target":245,"./tint":246,"./to":247,"./wait":248,"eventemitter3":249,"pixi.js":264}],242:[function(require,module,exports){
 'use strict';
 
 var wait = require('./wait');
@@ -66030,6 +66023,8 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
+var PIXI = require('pixi.js');
+
 var utils = require('./utils');
 var Drag = require('./drag');
 var Pinch = require('./pinch');
@@ -67715,7 +67710,7 @@ if (typeof PIXI !== 'undefined') {
 
 module.exports = Viewport;
 
-},{"./bounce":250,"./clamp":252,"./clamp-zoom":251,"./decelerate":253,"./drag":254,"./follow":255,"./mouse-edges":256,"./pinch":257,"./snap":260,"./snap-zoom":259,"./utils":261,"./wheel":263}],263:[function(require,module,exports){
+},{"./bounce":250,"./clamp":252,"./clamp-zoom":251,"./decelerate":253,"./drag":254,"./follow":255,"./mouse-edges":256,"./pinch":257,"./snap":260,"./snap-zoom":259,"./utils":261,"./wheel":263,"pixi.js":264}],263:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -67802,13 +67797,9 @@ module.exports = function (_Plugin) {
             }
 
             var point = this.parent.getPointerPosition(e);
-            var sign = void 0;
-            if (this.reverse) {
-                sign = e.deltaY > 0 ? 1 : -1;
-            } else {
-                sign = e.deltaY < 0 ? 1 : -1;
-            }
-            var change = 1 + this.percent * sign;
+            var sign = this.reverse ? -1 : 1;
+            var step = sign * -e.deltaY * (e.deltaMode ? 120 : 1) / 500;
+            var change = Math.pow(2, (1 + this.percent) * step);
             if (this.smooth) {
                 var original = {
                     x: this.smoothing ? this.smoothing.x * (this.smooth - this.smoothingCount) : 0,
@@ -74864,6 +74855,7 @@ module.exports = function (options, defaults)
     return options
 }
 },{}],287:[function(require,module,exports){
+const PIXI = require('pixi.js')
 const Viewport = require('pixi-viewport')
 const Ease = require('pixi-ease')
 
@@ -75447,4 +75439,4 @@ if (PIXI && PIXI.extras)
 }
 
 module.exports = Scrollbox
-},{"./defaults":286,"./defaults.json":285,"pixi-ease":240,"pixi-viewport":262}]},{},[8]);
+},{"./defaults":286,"./defaults.json":285,"pixi-ease":240,"pixi-viewport":262,"pixi.js":264}]},{},[8]);
diff --git a/docs/jsdoc/EE-.html b/docs/jsdoc/EE-.html
@@ -398,7 +398,7 @@ <h4 class="name" id="EE">
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:42 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

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.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:42 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/Events-.html b/docs/jsdoc/Events-.html
@@ -275,7 +275,7 @@ <h4 class="name" id="Events">
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:42 GMT+0800 (GMT+08:00)
             </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#line12">scrollbox.js:12</a>
+            <a href="src_scrollbox.js.html#line13">scrollbox.js:13</a>
         </div>
 
     </div>
@@ -2084,7 +2084,7 @@ <h4 class="name" id="activateFade">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line420">scrollbox.js:420</a>
+            <a href="src_scrollbox.js.html#line421">scrollbox.js:421</a>
         </div>
 
     </div>
@@ -2160,7 +2160,7 @@ <h4 class="name" id="ensureVisible">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line571">scrollbox.js:571</a>
+            <a href="src_scrollbox.js.html#line572">scrollbox.js:572</a>
         </div>
 
     </div>
@@ -2350,7 +2350,7 @@ <h4 class="name" id="resize">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line548">scrollbox.js:548</a>
+            <a href="src_scrollbox.js.html#line549">scrollbox.js:549</a>
         </div>
 
     </div>
@@ -2613,7 +2613,7 @@ <h4 class="name" id="update">
 
 
         <div class="tag-source">
-            <a href="src_scrollbox.js.html#line396">scrollbox.js:396</a>
+            <a href="src_scrollbox.js.html#line397">scrollbox.js:397</a>
         </div>
 
     </div>
@@ -2691,7 +2691,7 @@ <h4 class="name" id="update">
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:42 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/index.html b/docs/jsdoc/index.html
@@ -212,7 +212,7 @@ <h2>license</h2><p>MIT License<br>(c) 2018 <a target="_blank" href="https://yope
 
         <footer class="content-size">
             <div class="footer">
-                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a target="_blank" href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:42 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/node_modules_eventemitter3_index.js.html b/docs/jsdoc/node_modules_eventemitter3_index.js.html
@@ -481,7 +481,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.5.5</a> on Sat Feb 23 2019 10:53:57 GMT+0800 (GMT+08:00)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:31 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

diff --git a/docs/jsdoc/src_scrollbox.js.html b/docs/jsdoc/src_scrollbox.js.html
@@ -157,7 +157,8 @@ <h2>src/scrollbox.js</h2>
             </div>
         </header>
         <article>
-            <pre id="source-code" class="prettyprint source "><code>const Viewport = require('pixi-viewport')
+            <pre id="source-code" class="prettyprint source "><code>const PIXI = require('pixi.js')
+const Viewport = require('pixi-viewport')
 const Ease = require('pixi-ease')
 
 const defaults = require('./defaults')
@@ -752,7 +753,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.5.5</a> on Sat Feb 23 2019 10:54:06 GMT+0800 (GMT+08:00)
+                Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Feb 25 2019 09:55:41 GMT+0800 (GMT+08:00)
             </div>
         </footer>
     </div>

diff --git a/src/scrollbox.js b/src/scrollbox.js
@@ -1,3 +1,4 @@
+const PIXI = require('pixi.js')
 const Viewport = require('pixi-viewport')
 const Ease = require('pixi-ease')
 

diff --git a/yarn.lock b/yarn.lock
@@ -840,9 +840,9 @@ debug@^2.6.8:
     ms "2.0.0"
 
 earcut@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.4.tgz#6b161f89bfe4bb08576b9e8af165e1477d6a1c02"
-  integrity sha512-ttRjmPD5oaTtXOoxhFp9aZvMB14kBjapYaiBuzBB1elOgSLU9P2Ev86G2OClBg+uspUXERsIzXKpUWweH2K4Xg==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.5.tgz#829280a9a3a0f5fee0529f0a47c3e4eff09b21e4"
+  integrity sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA==
 
 electron-to-chromium@^1.3.47:
   version "1.3.88"
@@ -955,20 +955,20 @@ penner@^0.1.3:
   resolved "https://registry.yarnpkg.com/penner/-/penner-0.1.3.tgz#0b8b482d4e9b39af2f3d7c37592229b8acc29705"
   integrity sha1-C4tILU6bOa8vPXw3WSIpuKzClwU=
 
-pixi-ease@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pixi-ease/-/pixi-ease-1.2.1.tgz#8f5d4fb36a49978a121e86235361656af2bfa053"
-  integrity sha512-4RPYSHsaIkGvnMlElKIytI4l9xahn9mURAn+7fIb9iWOM0lEBkk4F49KAcv0ap8W2+M2S0/3zlZgJkPqY8sNvA==
+pixi-ease@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/pixi-ease/-/pixi-ease-1.3.0.tgz#2d58087d7a9d9f5bed7004e1e713839649a74abc"
+  integrity sha512-c2stiNINlF3/hYISJfg2sn/mjOlmcl096FtO3IA7u9iVCIVtRNthy/HAD8wr3EY7930bdLqexaFNR7o8n7d3cQ==
   dependencies:
     eventemitter3 "^3.1.0"
     penner "^0.1.3"
     yy-angle "^1.3.1"
     yy-color "^1.1.1"
 
-pixi-viewport@^3.18.3:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/pixi-viewport/-/pixi-viewport-3.18.3.tgz#20a470ccf36c1cba4ab5b7d1f0f95be126983e65"
-  integrity sha512-VNNenqkPznaZn4Jrt4eP6Z2l55hLldysLvwx+XsYIKB9kJUJNrW+Tzg5JJT+ERTQ7k3KT9YkNa1K/yNnDVVy9Q==
+pixi-viewport@^3.20.0:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/pixi-viewport/-/pixi-viewport-3.20.0.tgz#b541a7a71b3569aa51e385c9baad1f5104870bbd"
+  integrity sha512-AhLimZ2QqvKvwUjtnUCvt9tQ/GXtihjq7tCYEJo3qPmIYg7/35yLjq2wnXI48EtvVK2q1xuIkm3gsBaP0xvQ2Q==
   dependencies:
     eventemitter3 "^3.1.0"
     penner "^0.1.3"