IWMBrowser/iwmlib
IWMBrowser
/
iwmlib
4
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Fixed conflict.

This commit is contained in:
Sebastian Kupke 2019-08-08 13:47:00 +02:00
parent 97d33cf177 7e7b37f524
commit f5cf8115af
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/iwmlib.pixi.js vendored
View File

@ -3453,7 +3453,6 @@
// stack!
const distanceToTop = this.container.y;
const distanceToBottom = this.opts.maxHeight - this.container.y - this.__initHeight;
if (distanceToTop > 0) {
throwProps.y.end = 0;
} else if (distanceToBottom > 0) {
@ -12337,6 +12336,8 @@
}
}
/* global ThrowPropsPlugin */
class Ticks {
get reservedPrefixes() {
return ['decade', 'year', 'month', 'day', 'hour', 'minute', 'second']
@ -12995,9 +12996,9 @@
this.killTweens();
this.deltas = [];
this.validScroll();
if (typeof ThrowPropsPlugin != 'undefined') {
ThrowPropsPlugin.track(this, 'delta');
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// ThrowPropsPlugin.track(this, 'delta')
// }
}
onMove(event, interaction) {
@ -13017,11 +13018,11 @@
}
onEnd(event, interaction) {
if (typeof ThrowPropsPlugin != 'undefined') {
let vel = ThrowPropsPlugin.getVelocity(this, 'delta');
ThrowPropsPlugin.untrack(this);
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// let vel = ThrowPropsPlugin.getVelocity(this, 'delta')
// ThrowPropsPlugin.untrack(this)
// }
this.killTweens();
this.redraw();
let delta = 0;
@ -13034,7 +13035,7 @@
this.autoScroll = true;
let anchor = interaction.current.mean();
this.keepInBounds(delta, anchor);
console.log("onEnd", delta);
for (let key of interaction.ended.keys()) {
if (interaction.isDoubleTap(key)) {
this.onDoubleTap(event, interaction, key);

2
lib/pixi/buttongroup.js
View File

@ -514,7 +514,7 @@ export default class ButtonGroup extends PIXI.Container {
// stack!
const distanceToTop = this.container.y
const distanceToBottom = this.opts.maxHeight - this.container.y - this.__initHeight
if (distanceToTop > 0) {
throwProps.y.end = 0
} else if (distanceToBottom > 0) {

3
lib/pixi/scatter.js
View File

@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
import Events from '../events.js'
import { AbstractScatter } from '../scatter.js'
import { Angle, Points, Polygon } from '../utils.js'
@ -333,8 +334,6 @@ export class DisplayObjectScatter extends AbstractScatter {
roundPixel(value) {
// UO: Should be obsolete because Renderer supports roundPixels by default
return value
let res = this.renderer.resolution
return Math.round(value * res) / res
}
get container() {

21
lib/pixi/timeline.js
View File

@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
import { Cycle, Colors, Dates, isEmpty } from '../utils.js'
import { Capabilities } from '../capabilities.js'
import { BitmapLabeledGraphics, FontInfo } from './labeledgraphics.js'
@ -495,6 +496,7 @@ export default class Timeline extends BitmapLabeledGraphics {
this.minZoom = 1
this.maxZoom = 12000
this.scroll = 0
this.draggable = false
this.deltas = []
this.labelDates = []
this.colorRanges = []
@ -761,9 +763,9 @@ export default class Timeline extends BitmapLabeledGraphics {
this.killTweens()
this.deltas = []
this.validScroll()
if (typeof ThrowPropsPlugin != 'undefined') {
ThrowPropsPlugin.track(this, 'delta')
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// ThrowPropsPlugin.track(this, 'delta')
// }
}
onMove(event, interaction) {
@ -772,6 +774,9 @@ export default class Timeline extends BitmapLabeledGraphics {
return
}
this.scroll += delta.x
if (this.draggable) {
this.y += delta.y
}
while (this.deltas.length > 10) {
this.deltas.pop(0)
}
@ -783,11 +788,10 @@ export default class Timeline extends BitmapLabeledGraphics {
}
onEnd(event, interaction) {
if (typeof ThrowPropsPlugin != 'undefined') {
let vel = ThrowPropsPlugin.getVelocity(this, 'delta')
ThrowPropsPlugin.untrack(this)
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// let vel = ThrowPropsPlugin.getVelocity(this, 'delta')
// ThrowPropsPlugin.untrack(this)
// }
this.killTweens()
this.redraw()
let delta = 0
@ -800,7 +804,6 @@ export default class Timeline extends BitmapLabeledGraphics {
this.autoScroll = true
let anchor = interaction.current.mean()
this.keepInBounds(delta, anchor)
for (let key of interaction.ended.keys()) {
if (interaction.isDoubleTap(key)) {
this.onDoubleTap(event, interaction, key)