diff --git a/angular.json b/angular.json index bc784ccfabb..cea5388000c 100644 --- a/angular.json +++ b/angular.json @@ -15,7 +15,7 @@ "angular", "fabric", "dom-autoscroller", - "drawing-tool", + "@wise-community/drawing-tool", "jquery", "rxjs/internal/BehaviorSubject", "canvg", diff --git a/package-lock.json b/package-lock.json index 9ab2dfcd312..ae654fd0595 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,6 +26,7 @@ "@stomp/rx-stomp": "^1.1.4", "@stomp/stompjs": "^5.4.4", "@tinymce/tinymce-angular": "^4.2.4", + "@wise-community/drawing-tool": "^2.3.0-pre.1", "@zxcvbn-ts/core": "^2.2.1", "@zxcvbn-ts/language-en": "^2.1.0", "angular-password-strength-meter": "^6.0.0", @@ -33,7 +34,6 @@ "compute-covariance": "^1.0.1", "core-js": "^3.22.0", "dom-autoscroller": "^2.3.4", - "drawing-tool": "^2.1.2", "eventemitter2": "^5.0.1", "fabric": "3.6.3", "file-saver": "^2.0.5", @@ -6099,6 +6099,26 @@ "@xtuc/long": "4.2.2" } }, + "node_modules/@wise-community/drawing-tool": { + "version": "2.3.0-pre.1", + "resolved": "https://registry.npmjs.org/@wise-community/drawing-tool/-/drawing-tool-2.3.0-pre.1.tgz", + "integrity": "sha512-hnGQX06NoKVvoNZlSAxDzfwbdkWApttvr4Yn4KGagSJCbBi0czQR2DHJ5GZbYXiOtJBYzIs5iaSpirNOg2xe7g==", + "dependencies": { + "eventemitter2": "~0.4.14", + "fabric": "3.6.3", + "hammerjs": "~2.0.4", + "query-string": "^4.3.2", + "uuid": "^8.3.2" + }, + "peerDependencies": { + "jquery": ">= 2.1.3" + } + }, + "node_modules/@wise-community/drawing-tool/node_modules/eventemitter2": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", + "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==" + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -9747,26 +9767,6 @@ "node": ">=8" } }, - "node_modules/drawing-tool": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/drawing-tool/-/drawing-tool-2.2.0.tgz", - "integrity": "sha512-ohvxdZHB899eCKSdAF4k9un9ymMDYeKvV+Sb9HTT8whcb8k7ZTwdKKPh6dNpKNTT3QUWLwEsDlLnd5tpqz85Xw==", - "dependencies": { - "eventemitter2": "~0.4.14", - "fabric": "3.6.3", - "hammerjs": "~2.0.4", - "query-string": "^4.3.2", - "uuid": "^8.3.2" - }, - "peerDependencies": { - "jquery": ">= 2.1.3" - } - }, - "node_modules/drawing-tool/node_modules/eventemitter2": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", - "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==" - }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 2287973c6a3..6f6936cad6d 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@stomp/rx-stomp": "^1.1.4", "@stomp/stompjs": "^5.4.4", "@tinymce/tinymce-angular": "^4.2.4", + "@wise-community/drawing-tool": "^2.3.0-pre.1", "@zxcvbn-ts/core": "^2.2.1", "@zxcvbn-ts/language-en": "^2.1.0", "angular-password-strength-meter": "^6.0.0", @@ -34,7 +35,6 @@ "compute-covariance": "^1.0.1", "core-js": "^3.22.0", "dom-autoscroller": "^2.3.4", - "drawing-tool": "^2.1.2", "eventemitter2": "^5.0.1", "fabric": "3.6.3", "file-saver": "^2.0.5", diff --git a/src/assets/wise5/components/draw/drawService.ts b/src/assets/wise5/components/draw/drawService.ts index 270221be4d6..534e2222063 100644 --- a/src/assets/wise5/components/draw/drawService.ts +++ b/src/assets/wise5/components/draw/drawService.ts @@ -5,7 +5,7 @@ import * as fabric from 'fabric'; window['fabric'] = fabric.fabric; import * as EventEmitter2 from 'eventemitter2'; window['EventEmitter2'] = EventEmitter2; -import DrawingTool from 'drawing-tool/dist/drawing-tool'; +import DrawingTool from '@wise-community/drawing-tool/dist/drawing-tool'; import { ComponentService } from '../componentService'; import { StudentAssetService } from '../../services/studentAssetService'; import { Injectable } from '@angular/core';