Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #7174 - Unit tests related to Signaturepad failing #7247

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Fixed #7174 - Unit tests related to Signaturepad failing #7247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/question_signaturepad.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ITheme } from "./themes";
var defaultWidth = 300;
var defaultHeight = 200;

function resizeCanvas(canvas: HTMLCanvasElement) {
export function getCanvasRatio(canvas: HTMLCanvasElement): number {
var context: any = canvas.getContext("2d");
var devicePixelRatio = window.devicePixelRatio || 1;
var backingStoreRatio =
Expand All @@ -23,7 +23,12 @@ function resizeCanvas(canvas: HTMLCanvasElement) {
context.backingStorePixelRatio ||
1;

var ratio = devicePixelRatio / backingStoreRatio;
return devicePixelRatio / backingStoreRatio;
}

function resizeCanvas(canvas: HTMLCanvasElement) {
var context: any = canvas.getContext("2d");
var ratio = getCanvasRatio(canvas);

var oldWidth = canvas.width;
var oldHeight = canvas.height;
Expand Down Expand Up @@ -94,7 +99,7 @@ export class QuestionSignaturePadModel extends Question {
}
}
public themeChanged(theme: ITheme): void {
if(!!this.signaturePad) {
if (!!this.signaturePad) {
this.updateColors(this.signaturePad);
}
}
Expand Down Expand Up @@ -266,7 +271,7 @@ export class QuestionSignaturePadModel extends Question {
*
* Default value: `true`
*/
@property({ }) showPlaceholder: boolean;
@property({}) showPlaceholder: boolean;

public needShowPlaceholder(): boolean {
const showPlaceholder = this.showPlaceholder;
Expand All @@ -282,12 +287,12 @@ export class QuestionSignaturePadModel extends Question {
endLoadingFromJson(): void {
super.endLoadingFromJson();
//todo: need to remove this code
if(this.signatureWidth === 300 && !!this.width && typeof this.width === "number" && this.width) {
if (this.signatureWidth === 300 && !!this.width && typeof this.width === "number" && this.width) {
ConsoleWarnings.warn("Use signatureWidth property to set width for the signature pad");
this.signatureWidth = this.width;
this.width = undefined;
}
if(this.signatureHeight === 200 && !!this.height) {
if (this.signatureHeight === 200 && !!this.height) {
ConsoleWarnings.warn("Use signatureHeight property to set width for the signature pad");
this.signatureHeight = this.height;
this.height = undefined;
Expand All @@ -296,9 +301,9 @@ export class QuestionSignaturePadModel extends Question {
}

function correctFormatData(val: string): string {
if(!val) val = "png";
if (!val) val = "png";
val = val.replace("image/", "").replace("+xml", "");
if(val !== "jpeg" && val !== "svg") val = "png";
if (val !== "jpeg" && val !== "svg") val = "png";
return val;
}

Expand Down Expand Up @@ -327,11 +332,13 @@ Serializer.addClass(
default: true,
},
{ name: "showPlaceholder:boolean", category: "general", default: true },
{ name: "placeholder:text",
{
name: "placeholder:text",
serializationProperty: "locPlaceholder",
category: "general",
dependsOn: "showPlaceholder",
visibleIf: (obj: QuestionSignaturePadModel) => obj.showPlaceholder },
visibleIf: (obj: QuestionSignaturePadModel) => obj.showPlaceholder
},
{
name: "backgroundImage:file",
category: "general",
Expand Down
17 changes: 9 additions & 8 deletions tests/question_signaturepadtests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Serializer } from "../src/jsonobject";
import { QuestionSignaturePadModel } from "../src/question_signaturepad";
import { QuestionSignaturePadModel, getCanvasRatio } from "../src/question_signaturepad";
import { SurveyModel } from "../src/survey";

export default QUnit.module("question signaturepad");
Expand Down Expand Up @@ -104,15 +104,16 @@ QUnit.test("Check signaturepad signauteWidth/Height properties", (assert) => {
const canvas = document.createElement("canvas");
containerEl.appendChild(canvas);
const signaturepad = <QuestionSignaturePadModel>survey.getQuestionByName("q1");
const ratio = getCanvasRatio(canvas);
signaturepad.initSignaturePad(containerEl);
assert.equal(signaturepad.signatureWidth, 300);
assert.equal(signaturepad.signatureHeight, 200);
assert.equal(canvas.width, 300);
assert.equal(canvas.height, 200);
assert.equal(canvas.width, 300 * ratio);
assert.equal(canvas.height, 200 * ratio);
signaturepad.signatureWidth = 400;
signaturepad.signatureHeight = 300;
assert.equal(canvas.width, 400);
assert.equal(canvas.height, 300);
assert.equal(canvas.width, 400 * ratio);
assert.equal(canvas.height, 300 * ratio);

canvas.remove();
containerEl.remove();
Expand Down Expand Up @@ -208,7 +209,7 @@ QUnit.test("check penColor & background color from json", (assert) => {
assert.equal(signaturepadQuestion.signaturePad.penColor, "#e92525", "signaturePad.penColor init");
assert.equal(signaturepadQuestion.signaturePad.backgroundColor, "#dde6db", "signaturePad.backgroundColor init");

survey.applyTheme({ "cssVariables": { } });
survey.applyTheme({ "cssVariables": {} });
assert.equal(signaturepadQuestion.penColor, "#e92525", "penColor init");
assert.equal(signaturepadQuestion.backgroundColor, "#dde6db", "backgroundColor init");
assert.equal(signaturepadQuestion.signaturePad.penColor, "#e92525", "signaturePad.penColor init");
Expand Down Expand Up @@ -242,7 +243,7 @@ QUnit.test("check penColor & background color from theme", (assert) => {
assert.equal(signaturepadQuestion.signaturePad.penColor, "rgba(103, 58, 176, 1)", "signaturePad.penColor from theme");
assert.equal(signaturepadQuestion.signaturePad.backgroundColor, "transparent", "signaturePad.backgroundColor from theme");

survey.applyTheme({ "cssVariables": { } });
survey.applyTheme({ "cssVariables": {} });
assert.equal(signaturepadQuestion.penColor, undefined, "penColor undefined");
assert.equal(signaturepadQuestion.backgroundColor, undefined, "backgroundColor undefined");
assert.equal(signaturepadQuestion.signaturePad.penColor, "#1ab394", "signaturePad.penColor default");
Expand Down Expand Up @@ -277,7 +278,7 @@ QUnit.test("check penColor & background color if background image", (assert) =>
assert.equal(signaturepadQuestion.signaturePad.penColor, "rgba(103, 58, 176, 1)", "signaturePad.penColor from theme");
assert.equal(signaturepadQuestion.signaturePad.backgroundColor, "transparent", "signaturePad.backgroundColor from theme");

survey.applyTheme({ "cssVariables": { } });
survey.applyTheme({ "cssVariables": {} });
assert.equal(signaturepadQuestion.penColor, undefined, "penColor undefined");
assert.equal(signaturepadQuestion.backgroundColor, undefined, "backgroundColor undefined");
assert.equal(signaturepadQuestion.signaturePad.penColor, "#1ab394", "signaturePad.penColor #1ab394");
Expand Down