diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 8ed75ab..8fea8ba 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -45,7 +45,7 @@ * @private */ this._hookDiv = null; - if ((Device.tablet || Device.phone) && !navigator.isCocoonJS) + if (Device.tablet || Device.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 8ed75ab..8fea8ba 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -45,7 +45,7 @@ * @private */ this._hookDiv = null; - if ((Device.tablet || Device.phone) && !navigator.isCocoonJS) + if (Device.tablet || Device.phone) { this.createTouchHook(); } diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 1d51aa0..d4edba1 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -212,12 +212,6 @@ this._outerBlend = false; context.globalCompositeOperation = this.blendModes[BLEND_MODES.NORMAL]; - if (navigator.isCocoonJS && this.view.screencanvas) - { - context.fillStyle = 'black'; - context.clear(); - } - if (clear !== undefined ? clear : this.clearBeforeRender) { if (this.renderingToScreen) diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 8ed75ab..8fea8ba 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -45,7 +45,7 @@ * @private */ this._hookDiv = null; - if ((Device.tablet || Device.phone) && !navigator.isCocoonJS) + if (Device.tablet || Device.phone) { this.createTouchHook(); } diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 1d51aa0..d4edba1 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -212,12 +212,6 @@ this._outerBlend = false; context.globalCompositeOperation = this.blendModes[BLEND_MODES.NORMAL]; - if (navigator.isCocoonJS && this.view.screencanvas) - { - context.fillStyle = 'black'; - context.clear(); - } - if (clear !== undefined ? clear : this.clearBeforeRender) { if (this.renderingToScreen) diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index 4f33499..65f6cb3 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -973,7 +973,7 @@ rect = this.interactionDOMElement.getBoundingClientRect(); } - const resolutionMultiplier = navigator.isCocoonJS ? this.resolution : (1.0 / this.resolution); + const resolutionMultiplier = 1.0 / this.resolution; point.x = ((x - rect.left) * (this.interactionDOMElement.width / rect.width)) * resolutionMultiplier; point.y = ((y - rect.top) * (this.interactionDOMElement.height / rect.height)) * resolutionMultiplier; @@ -1717,15 +1717,6 @@ this.mapPositionToPoint(interactionData.global, pointerEvent.clientX, pointerEvent.clientY); - // This is the way InteractionManager processed touch events before the refactoring, so I've kept - // it here. But it doesn't make that much sense to me, since mapPositionToPoint already factors - // in this.resolution, so this just divides by this.resolution twice for touch events... - if (navigator.isCocoonJS && pointerEvent.pointerType === 'touch') - { - interactionData.global.x = interactionData.global.x / this.resolution; - interactionData.global.y = interactionData.global.y / this.resolution; - } - // Not really sure why this is happening, but it's how a previous version handled things if (pointerEvent.pointerType === 'touch') { diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 8ed75ab..8fea8ba 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -45,7 +45,7 @@ * @private */ this._hookDiv = null; - if ((Device.tablet || Device.phone) && !navigator.isCocoonJS) + if (Device.tablet || Device.phone) { this.createTouchHook(); } diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 1d51aa0..d4edba1 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -212,12 +212,6 @@ this._outerBlend = false; context.globalCompositeOperation = this.blendModes[BLEND_MODES.NORMAL]; - if (navigator.isCocoonJS && this.view.screencanvas) - { - context.fillStyle = 'black'; - context.clear(); - } - if (clear !== undefined ? clear : this.clearBeforeRender) { if (this.renderingToScreen) diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index 4f33499..65f6cb3 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -973,7 +973,7 @@ rect = this.interactionDOMElement.getBoundingClientRect(); } - const resolutionMultiplier = navigator.isCocoonJS ? this.resolution : (1.0 / this.resolution); + const resolutionMultiplier = 1.0 / this.resolution; point.x = ((x - rect.left) * (this.interactionDOMElement.width / rect.width)) * resolutionMultiplier; point.y = ((y - rect.top) * (this.interactionDOMElement.height / rect.height)) * resolutionMultiplier; @@ -1717,15 +1717,6 @@ this.mapPositionToPoint(interactionData.global, pointerEvent.clientX, pointerEvent.clientY); - // This is the way InteractionManager processed touch events before the refactoring, so I've kept - // it here. But it doesn't make that much sense to me, since mapPositionToPoint already factors - // in this.resolution, so this just divides by this.resolution twice for touch events... - if (navigator.isCocoonJS && pointerEvent.pointerType === 'touch') - { - interactionData.global.x = interactionData.global.x / this.resolution; - interactionData.global.y = interactionData.global.y / this.resolution; - } - // Not really sure why this is happening, but it's how a previous version handled things if (pointerEvent.pointerType === 'touch') { diff --git a/packages/text/src/Text.js b/packages/text/src/Text.js index 2774537..a1202b5 100644 --- a/packages/text/src/Text.js +++ b/packages/text/src/Text.js @@ -407,12 +407,6 @@ return style.fill; } - // cocoon on canvas+ cannot generate textures, so use the first colour instead - if (navigator.isCocoonJS) - { - return style.fill[0]; - } - // the gradient will be evenly spaced out according to how large the array is. // ['#FF0000', '#00FF00', '#0000FF'] would created stops at 0.25, 0.5 and 0.75 let gradient;