Changed scale
This commit is contained in:
parent
1c70433b86
commit
f70968fe01
60
dist/iwmlib.js
vendored
60
dist/iwmlib.js
vendored
@ -614,19 +614,6 @@
|
|||||||
|
|
||||||
static toLine(event) {
|
static toLine(event) {
|
||||||
return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}`
|
return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}`
|
||||||
let result = event.type;
|
|
||||||
let selector = this.selector(event.target);
|
|
||||||
result += ' selector: ' + selector;
|
|
||||||
if (event.target != document.querySelector(selector)) console.log('Cannot resolve', selector);
|
|
||||||
let keys = ['layerX', 'layerY', 'pageX', 'pageY', 'clientX', 'clientY'];
|
|
||||||
for (let key of keys) {
|
|
||||||
try {
|
|
||||||
result += ' ' + key + ':' + event[key];
|
|
||||||
} catch (e) {
|
|
||||||
console.log('Invalid key: ' + key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static compareExtractedWithSimulated() {
|
static compareExtractedWithSimulated() {
|
||||||
@ -2646,25 +2633,6 @@
|
|||||||
result[id] = this.getPosition(event);
|
result[id] = this.getPosition(event);
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
// case 'TouchEvent':
|
|
||||||
// // Needs to be observed: Perhaps changedTouches are all we need. If so
|
|
||||||
// // we can remove the touchEventKey default parameter
|
|
||||||
// if (touchEventKey == 'all') {
|
|
||||||
// for(let t of event.targetTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// for(let t of event.changedTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// else {
|
|
||||||
// for(let t of event.changedTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// break
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@ -5759,8 +5727,6 @@
|
|||||||
let bottom = parseFloat(this.element.style.bottom);
|
let bottom = parseFloat(this.element.style.bottom);
|
||||||
this.element.style.bottom = bottom - delta.y + 'px';
|
this.element.style.bottom = bottom - delta.y + 'px';
|
||||||
break
|
break
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
//console.log("onResize", this.onResize)
|
//console.log("onResize", this.onResize)
|
||||||
if (this.onResize) {
|
if (this.onResize) {
|
||||||
@ -6183,8 +6149,6 @@
|
|||||||
x = bbRight;
|
x = bbRight;
|
||||||
if (!this.useEventPosWithBoundingBox) y = (bbTop + bbBottom) / 2;
|
if (!this.useEventPosWithBoundingBox) y = (bbTop + bbBottom) / 2;
|
||||||
break
|
break
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6240,8 +6204,6 @@
|
|||||||
x += this.notchSize * 2;
|
x += this.notchSize * 2;
|
||||||
x += this.posOffset;
|
x += this.posOffset;
|
||||||
break
|
break
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
this.placeOrigin(x, y);
|
this.placeOrigin(x, y);
|
||||||
}
|
}
|
||||||
@ -7989,6 +7951,9 @@
|
|||||||
* @class Highlight
|
* @class Highlight
|
||||||
* @extends {Object}
|
* @extends {Object}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const SCALE = 1.5;
|
||||||
|
|
||||||
class Highlight extends Object {
|
class Highlight extends Object {
|
||||||
static disableAnimations() {
|
static disableAnimations() {
|
||||||
_HighlightEnabled = false;
|
_HighlightEnabled = false;
|
||||||
@ -8037,12 +8002,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static expand(obj, { scale = 2, duration = 3, stroke = 2, onComplete = null } = {}) {
|
static expand(obj, { scale = SCALE, duration = 3, stroke = 2, onComplete = null } = {}) {
|
||||||
if (obj == null) return
|
if (obj == null) return
|
||||||
//console.log("expand")
|
//console.log("expand")
|
||||||
obj.classList.add('zooming');
|
obj.classList.add('zooming');
|
||||||
TweenLite.to(obj, duration, {
|
TweenLite.to(obj, duration, {
|
||||||
scale: scale,
|
scale,
|
||||||
onUpdate: () => {
|
onUpdate: () => {
|
||||||
let scale = obj._gsTransform.scaleX;
|
let scale = obj._gsTransform.scaleX;
|
||||||
obj.setAttribute('stroke-width', stroke / scale);
|
obj.setAttribute('stroke-width', stroke / scale);
|
||||||
@ -8142,7 +8107,7 @@
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
static openHighlight(target, { animation = 0.5, scale = 2, onExpanded = null } = {}) {
|
static openHighlight(target, { animation = 0.5, scale = SCALE, onExpanded = null } = {}) {
|
||||||
if (Highlight._isExpanded(target)) {
|
if (Highlight._isExpanded(target)) {
|
||||||
console.log('Target is already expanded!');
|
console.log('Target is already expanded!');
|
||||||
return
|
return
|
||||||
@ -8343,9 +8308,6 @@
|
|||||||
|
|
||||||
Highlight.expandedClass = 'expanded';
|
Highlight.expandedClass = 'expanded';
|
||||||
|
|
||||||
// TODO: @ue Is this constant necessary?
|
|
||||||
const enableNearestNeighborTaps = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A class that collects static methods to maintain the states and parts of
|
* A class that collects static methods to maintain the states and parts of
|
||||||
* EyeVisit like cards.
|
* EyeVisit like cards.
|
||||||
@ -9774,16 +9736,6 @@
|
|||||||
article.appendChild(iconClone);
|
article.appendChild(iconClone);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enableNearestNeighborTaps) {
|
|
||||||
//look for nearby popups on tap
|
|
||||||
InteractionMapper.on('tap', indexbox, () => {
|
|
||||||
// console.log('Tap handler called', editable)
|
|
||||||
if (!editable) {
|
|
||||||
this.findNearbyPopups(event, card);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const eventElements = [indexbox, iconClone, clone];
|
const eventElements = [indexbox, iconClone, clone];
|
||||||
|
|
||||||
// Use the 'tap' event for closing.
|
// Use the 'tap' event for closing.
|
||||||
|
32
dist/iwmlib.pixi.js
vendored
32
dist/iwmlib.pixi.js
vendored
@ -1335,19 +1335,6 @@
|
|||||||
|
|
||||||
static toLine(event) {
|
static toLine(event) {
|
||||||
return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}`
|
return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}`
|
||||||
let result = event.type;
|
|
||||||
let selector = this.selector(event.target);
|
|
||||||
result += ' selector: ' + selector;
|
|
||||||
if (event.target != document.querySelector(selector)) console.log('Cannot resolve', selector);
|
|
||||||
let keys = ['layerX', 'layerY', 'pageX', 'pageY', 'clientX', 'clientY'];
|
|
||||||
for (let key of keys) {
|
|
||||||
try {
|
|
||||||
result += ' ' + key + ':' + event[key];
|
|
||||||
} catch (e) {
|
|
||||||
console.log('Invalid key: ' + key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static compareExtractedWithSimulated() {
|
static compareExtractedWithSimulated() {
|
||||||
@ -6187,25 +6174,6 @@
|
|||||||
result[id] = this.getPosition(event);
|
result[id] = this.getPosition(event);
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
// case 'TouchEvent':
|
|
||||||
// // Needs to be observed: Perhaps changedTouches are all we need. If so
|
|
||||||
// // we can remove the touchEventKey default parameter
|
|
||||||
// if (touchEventKey == 'all') {
|
|
||||||
// for(let t of event.targetTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// for(let t of event.changedTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// else {
|
|
||||||
// for(let t of event.changedTouches) {
|
|
||||||
// result[t.identifier.toString()] = this.getPosition(t)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// break
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,9 @@ function round(value) {
|
|||||||
* @class Highlight
|
* @class Highlight
|
||||||
* @extends {Object}
|
* @extends {Object}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const SCALE = 1.5
|
||||||
|
|
||||||
export default class Highlight extends Object {
|
export default class Highlight extends Object {
|
||||||
static disableAnimations() {
|
static disableAnimations() {
|
||||||
_HighlightEnabled = false
|
_HighlightEnabled = false
|
||||||
@ -75,12 +78,12 @@ export default class Highlight extends Object {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static expand(obj, { scale = 2, duration = 3, stroke = 2, onComplete = null } = {}) {
|
static expand(obj, { scale = SCALE, duration = 3, stroke = 2, onComplete = null } = {}) {
|
||||||
if (obj == null) return
|
if (obj == null) return
|
||||||
//console.log("expand")
|
//console.log("expand")
|
||||||
obj.classList.add('zooming')
|
obj.classList.add('zooming')
|
||||||
TweenLite.to(obj, duration, {
|
TweenLite.to(obj, duration, {
|
||||||
scale: scale,
|
scale,
|
||||||
onUpdate: () => {
|
onUpdate: () => {
|
||||||
let scale = obj._gsTransform.scaleX
|
let scale = obj._gsTransform.scaleX
|
||||||
obj.setAttribute('stroke-width', stroke / scale)
|
obj.setAttribute('stroke-width', stroke / scale)
|
||||||
@ -180,7 +183,7 @@ export default class Highlight extends Object {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
static openHighlight(target, { animation = 0.5, scale = 2, onExpanded = null } = {}) {
|
static openHighlight(target, { animation = 0.5, scale = SCALE, onExpanded = null } = {}) {
|
||||||
if (Highlight._isExpanded(target)) {
|
if (Highlight._isExpanded(target)) {
|
||||||
console.log('Target is already expanded!')
|
console.log('Target is already expanded!')
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user