Skip to content

Commit 1259773

Browse files
ShaMan123ShaMan123
committed
fix(tests): toLocalPoint, group.subTargetCheck 
1 parent 77caa46 commit 1259773

File tree

3 files changed

+64
-50
lines changed

3 files changed

+64
-50
lines changed

‎test/unit/canvas.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@
826826
QUnit.test('findTarget with subTargetCheck', function(assert) {
827827
var rect = makeRect({ left: 0, top: 0 }),
828828
rect2 = makeRect({ left: 30, top: 30}), target,
829-
group = new fabric.Group([rect, rect2]);
829+
group = new fabric.Group([rect, rect2], { subTargetCheck: false });
830830

831831
canvas.add(group);
832832
target = canvas.findTarget({

‎test/unit/itext_click_behaviour.js‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,20 +167,34 @@
167167
iText.selected = true;
168168
iText.__lastSelected = true;
169169
iText.mouseUpHandler({ e: {} });
170-
assert.equal(iText.isEditing, false, 'iText did not enter editing');
170+
assert.equal(iText.isEditing, false, 'iText should not enter editing');
171171
iText.exitEditing();
172172
});
173-
QUnit.test('_mouseUpHandler on a selected text in a group DOES NOT enter edit', function(assert) {
173+
QUnit.test('_mouseUpHandler on a selected text in a group does NOT enter editing', function(assert) {
174174
var iText = new fabric.IText('test');
175175
iText.initDelayedCursor = function() {};
176176
iText.renderCursorOrSelection = function() {};
177177
assert.equal(iText.isEditing, false, 'iText not editing');
178-
iText.canvas = canvas;
178+
var group = new fabric.Group([iText], { subTargetCheck: false });
179+
canvas.add(group);
179180
iText.selected = true;
180181
iText.__lastSelected = true;
181-
iText.group = true;
182-
iText.mouseUpHandler({ e: {} });
183-
assert.equal(iText.isEditing, false, 'iText did not entered editing');
182+
canvas.__onMouseUp({ clientX: 1, clientY: 1 });
183+
assert.equal(canvas._target, group, 'group should be found as target');
184+
assert.equal(iText.isEditing, false, 'iText should not enter editing');
185+
iText.exitEditing();
186+
});
187+
QUnit.test('_mouseUpHandler on a text in a group does enter editing', function (assert) {
188+
var iText = new fabric.IText('test');
189+
iText.initDelayedCursor = function () { };
190+
iText.renderCursorOrSelection = function () { };
191+
assert.equal(iText.isEditing, false, 'iText not editing');
192+
var group = new fabric.Group([iText], { subTargetCheck: true });
193+
canvas.add(group);
194+
iText.selected = true;
195+
iText.__lastSelected = true;
196+
canvas.__onMouseUp({ clientX: 1, clientY: 1 });
197+
assert.equal(iText.isEditing, true, 'iText should enter editing');
184198
iText.exitEditing();
185199
});
186200
QUnit.test('_mouseUpHandler on a corner of selected text DOES NOT enter edit', function(assert) {
@@ -193,7 +207,7 @@
193207
iText.__lastSelected = true;
194208
iText.__corner = 'mt';
195209
iText.mouseUpHandler({ e: {} });
196-
assert.equal(iText.isEditing, false, 'iText did not entered editing');
210+
assert.equal(iText.isEditing, false, 'iText should not enter editing');
197211
iText.exitEditing();
198212
canvas.renderAll();
199213
});

‎test/unit/object_origin.js‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -161,39 +161,39 @@
161161
});
162162

163163

164-
QUnit.test('toLocalPoint', function(assert) {
164+
QUnit.test('normalizePoint', function(assert) {
165165
var rect = new fabric.Rect(rectOptions),
166166
p,
167167
point = new fabric.Point(15, 20);
168168

169-
p = rect.toLocalPoint(point, 'center', 'center');
169+
p = rect.normalizePoint(point, 'center', 'center');
170170
assert.deepEqual(p, new fabric.Point(-42, -67));
171171

172-
p = rect.toLocalPoint(point, 'center', 'top');
172+
p = rect.normalizePoint(point, 'center', 'top');
173173
assert.deepEqual(p, new fabric.Point(-42, -25));
174174

175-
p = rect.toLocalPoint(point, 'center', 'bottom');
175+
p = rect.normalizePoint(point, 'center', 'bottom');
176176
assert.deepEqual(p, new fabric.Point(-42, -109));
177177

178-
p = rect.toLocalPoint(point, 'left', 'center');
178+
p = rect.normalizePoint(point, 'left', 'center');
179179
assert.deepEqual(p, new fabric.Point(-20, -67));
180180

181-
p = rect.toLocalPoint(point, 'left', 'top');
181+
p = rect.normalizePoint(point, 'left', 'top');
182182
assert.deepEqual(p, new fabric.Point(-20, -25));
183183

184-
p = rect.toLocalPoint(point, 'left', 'bottom');
184+
p = rect.normalizePoint(point, 'left', 'bottom');
185185
assert.deepEqual(p, new fabric.Point(-20, -109));
186186

187-
p = rect.toLocalPoint(point, 'right', 'center');
187+
p = rect.normalizePoint(point, 'right', 'center');
188188
assert.deepEqual(p, new fabric.Point(-64, -67));
189189

190-
p = rect.toLocalPoint(point, 'right', 'top');
190+
p = rect.normalizePoint(point, 'right', 'top');
191191
assert.deepEqual(p, new fabric.Point(-64, -25));
192192

193-
p = rect.toLocalPoint(point, 'right', 'bottom');
193+
p = rect.normalizePoint(point, 'right', 'bottom');
194194
assert.deepEqual(p, new fabric.Point(-64, -109));
195195

196-
p = rect.toLocalPoint(point);
196+
p = rect.normalizePoint(point);
197197
assert.deepEqual(p, new fabric.Point(-20, -25));
198198
});
199199

@@ -203,34 +203,34 @@
203203
point = new fabric.Point(15, 20);
204204
rect.angle = 35;
205205

206-
p = rect.toLocalPoint(point, 'center', 'center');
206+
p = rect.normalizePoint(point, 'center', 'center');
207207
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -51.00727238020387));
208208

209-
p = rect.toLocalPoint(point, 'center', 'top');
209+
p = rect.normalizePoint(point, 'center', 'top');
210210
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -9.007272380203872));
211211

212-
p = rect.toLocalPoint(point, 'center', 'bottom');
212+
p = rect.normalizePoint(point, 'center', 'bottom');
213213
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -93.00727238020387));
214214

215-
p = rect.toLocalPoint(point, 'left', 'center');
215+
p = rect.normalizePoint(point, 'left', 'center');
216216
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -51.00727238020387));
217217

218-
p = rect.toLocalPoint(point, 'left', 'top');
218+
p = rect.normalizePoint(point, 'left', 'top');
219219
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -9.007272380203872));
220220

221-
p = rect.toLocalPoint(point, 'left', 'bottom');
221+
p = rect.normalizePoint(point, 'left', 'bottom');
222222
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -93.00727238020387));
223223

224-
p = rect.toLocalPoint(point, 'right', 'center');
224+
p = rect.normalizePoint(point, 'right', 'center');
225225
assert.deepEqual(p, new fabric.Point(-74.722451794556, -51.00727238020387));
226226

227-
p = rect.toLocalPoint(point, 'right', 'top');
227+
p = rect.normalizePoint(point, 'right', 'top');
228228
assert.deepEqual(p, new fabric.Point(-74.722451794556, -9.007272380203872));
229229

230-
p = rect.toLocalPoint(point, 'right', 'bottom');
230+
p = rect.normalizePoint(point, 'right', 'bottom');
231231
assert.deepEqual(p, new fabric.Point(-74.722451794556, -93.00727238020387));
232232

233-
p = rect.toLocalPoint(point);
233+
p = rect.normalizePoint(point);
234234
assert.deepEqual(p, new fabric.Point(-58.791317146942106, -3.9842049203432026));
235235
});
236236

@@ -487,39 +487,39 @@
487487
});
488488

489489

490-
QUnit.test('toLocalPoint with numeric origins', function(assert) {
490+
QUnit.test('normalizePoint with numeric origins', function(assert) {
491491
var rect = new fabric.Rect(rectOptions),
492492
p,
493493
point = new fabric.Point(15, 20);
494494

495-
p = rect.toLocalPoint(point, 0.5, 0.5);
495+
p = rect.normalizePoint(point, 0.5, 0.5);
496496
assert.deepEqual(p, new fabric.Point(-42, -67));
497497

498-
p = rect.toLocalPoint(point, 0.5, 0);
498+
p = rect.normalizePoint(point, 0.5, 0);
499499
assert.deepEqual(p, new fabric.Point(-42, -25));
500500

501-
p = rect.toLocalPoint(point, 0.5, 1);
501+
p = rect.normalizePoint(point, 0.5, 1);
502502
assert.deepEqual(p, new fabric.Point(-42, -109));
503503

504-
p = rect.toLocalPoint(point, 0, 0.5);
504+
p = rect.normalizePoint(point, 0, 0.5);
505505
assert.deepEqual(p, new fabric.Point(-20, -67));
506506

507-
p = rect.toLocalPoint(point, 0, 0);
507+
p = rect.normalizePoint(point, 0, 0);
508508
assert.deepEqual(p, new fabric.Point(-20, -25));
509509

510-
p = rect.toLocalPoint(point, 0, 1);
510+
p = rect.normalizePoint(point, 0, 1);
511511
assert.deepEqual(p, new fabric.Point(-20, -109));
512512

513-
p = rect.toLocalPoint(point, 1, 0.5);
513+
p = rect.normalizePoint(point, 1, 0.5);
514514
assert.deepEqual(p, new fabric.Point(-64, -67));
515515

516-
p = rect.toLocalPoint(point, 1, 0);
516+
p = rect.normalizePoint(point, 1, 0);
517517
assert.deepEqual(p, new fabric.Point(-64, -25));
518518

519-
p = rect.toLocalPoint(point, 1, 1);
519+
p = rect.normalizePoint(point, 1, 1);
520520
assert.deepEqual(p, new fabric.Point(-64, -109));
521521

522-
p = rect.toLocalPoint(point);
522+
p = rect.normalizePoint(point);
523523
assert.deepEqual(p, new fabric.Point(-20, -25));
524524
});
525525

@@ -529,34 +529,34 @@
529529
point = new fabric.Point(15, 20);
530530
rect.angle = 35;
531531

532-
p = rect.toLocalPoint(point, 0.5, 0.5);
532+
p = rect.normalizePoint(point, 0.5, 0.5);
533533
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -51.00727238020387));
534534

535-
p = rect.toLocalPoint(point, 0.5, 0);
535+
p = rect.normalizePoint(point, 0.5, 0);
536536
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -9.007272380203872));
537537

538-
p = rect.toLocalPoint(point, 0.5, 1);
538+
p = rect.normalizePoint(point, 0.5, 1);
539539
assert.deepEqual(p, new fabric.Point(-52.72245179455599, -93.00727238020387));
540540

541-
p = rect.toLocalPoint(point, 0, 0.5);
541+
p = rect.normalizePoint(point, 0, 0.5);
542542
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -51.00727238020387));
543543

544-
p = rect.toLocalPoint(point, 0, 0);
544+
p = rect.normalizePoint(point, 0, 0);
545545
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -9.007272380203872));
546546

547-
p = rect.toLocalPoint(point, 0, 1);
547+
p = rect.normalizePoint(point, 0, 1);
548548
assert.deepEqual(p, new fabric.Point(-30.722451794555987, -93.00727238020387));
549549

550-
p = rect.toLocalPoint(point, 1, 0.5);
550+
p = rect.normalizePoint(point, 1, 0.5);
551551
assert.deepEqual(p, new fabric.Point(-74.722451794556, -51.00727238020387));
552552

553-
p = rect.toLocalPoint(point, 1, 0);
553+
p = rect.normalizePoint(point, 1, 0);
554554
assert.deepEqual(p, new fabric.Point(-74.722451794556, -9.007272380203872));
555555

556-
p = rect.toLocalPoint(point, 1, 1);
556+
p = rect.normalizePoint(point, 1, 1);
557557
assert.deepEqual(p, new fabric.Point(-74.722451794556, -93.00727238020387));
558558

559-
p = rect.toLocalPoint(point);
559+
p = rect.normalizePoint(point);
560560
assert.deepEqual(p, new fabric.Point(-58.791317146942106, -3.9842049203432026));
561561
});
562562

0 commit comments

Comments
 (0)