Skip to content

Commit 37d0916

Browse files
committed
updates
1 parent b70139d commit 37d0916

File tree

67 files changed

+9654
-1259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+9654
-1259
lines changed

CanvasNative.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = "CanvasNative"
44

5-
s.version = "1.0.0-alpha.3"
5+
s.version = "1.0.0-alpha.11"
66

77
s.summary = "A Canvas library"
88

@@ -18,11 +18,11 @@ Pod::Spec.new do |s|
1818
s.source = { :git => "https://github.com/nativescript/canvas.git", :tag => "#{s.version}" }
1919

2020
s.pod_target_xcconfig = {
21-
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/CanvasNative/Dist"',
21+
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/dist"',
2222
'ENABLE_BITCODE' => 'YES',
2323
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '"arm64"',
2424
}
2525
s.swift_versions = ['4.0','4.2', '5.0']
26-
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework'
27-
s.preserve_paths = 'packages/canvas/src-native/canvas-ios/CanvasNative/Dist/CanvasNative.xcframework'
26+
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'
27+
s.preserve_paths = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'
2828
end

apps/demo/src/app.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
require('@nativescript/canvas-polyfill');
2-
import { init } from '@nativescript/canvas';
3-
init();
42
import { Application } from '@nativescript/core';
53
Application.run({ moduleName: 'app-root' });

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@angular/platform-browser": "^12.0.0",
3232
"@angular/platform-browser-dynamic": "^12.0.0",
3333
"@angular/router": "^12.0.0",
34-
"@nativescript-community/gesturehandler": "^0.1.45",
3534
"@nativescript/angular": "^12.0.0",
3635
"@nativescript/core": "~8.1.0",
3736
"@nativescript/plugin-tools": "2.1.0",

packages/canvas-polyfill/index.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,6 @@ if (!((global as any).TextEncoder instanceof TextEncoder)) {
8080
});
8181
}
8282

83-
if (!((global as any).ImageBitmap instanceof ImageBitmap)) {
84-
Object.defineProperty(global, 'ImageBitmap', {
85-
value: ImageBitmap,
86-
configurable: true,
87-
writable: true,
88-
});
89-
}
90-
9183
if (!((global as any).URL instanceof URL)) {
9284
Object.defineProperty(global, 'URL', {
9385
value: URL,

packages/canvas-polyfill/window.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { HTMLCanvasElement } from './DOM/HTMLCanvasElement';
55
import { HTMLVideoElement } from './DOM/HTMLVideoElement';
66
import { XMLDocument } from './DOM/XMLDocument';
77
import { Device, fromObject, View } from '@nativescript/core';
8-
import { CanvasRenderingContext2D, WebGLRenderingContext, WebGL2RenderingContext, ImageData } from '@nativescript/canvas';
8+
import { CanvasRenderingContext2D, WebGLRenderingContext, WebGL2RenderingContext, ImageData, ImageBitmap } from '@nativescript/canvas';
99

1010
(global as any).CANVAS_RENDERER = 'true';
1111
(global as any).WEBGL_RENDERER = 'true';
@@ -17,7 +17,7 @@ import { CanvasRenderingContext2D, WebGLRenderingContext, WebGL2RenderingContext
1717
(global as any).window.self = (global as any).self = (global as any).self || window;
1818
(global as any).window.HTMLImageElement = (global as any).HTMLImageElement = (global as any).HTMLImageElement || HTMLImageElement;
1919
(global as any).window.Image = (global as any).Image = (global as any).Image || HTMLImageElement;
20-
(global as any).window.ImageBitmap = (global as any).ImageBitmap = (global as any).ImageBitmap || HTMLImageElement;
20+
(global as any).window.ImageBitmap = (global as any).ImageBitmap = (global as any).ImageBitmap || ImageBitmap;
2121
(global as any).window.HTMLVideoElement = (global as any).HTMLVideoElement = (global as any).HTMLVideoElement || HTMLVideoElement;
2222
(global as any).window.Video = (global as any).Video = (global as any).Video || HTMLVideoElement;
2323
(global as any).window.HTMLCanvasElement = (global as any).HTMLCanvasElement = (global as any).HTMLCanvasElement || HTMLCanvasElement;

0 commit comments

Comments
 (0)