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.

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

Make iText fires object:modified on text change on exit editing #2927

Merged
merged 10 commits into from
May 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/mixins/itext_behavior.mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@
this._updateTextarea();
this._saveEditingProps();
this._setEditingProps();
this._textBeforeEdit = this.text;

this._tick();
this.fire('editing:entered');
Expand Down Expand Up @@ -494,7 +495,7 @@
* @chainable
*/
exitEditing: function() {

var isTextChanged = (this._textBeforeEdit !== this.text);
this.selected = false;
this.isEditing = false;
this.selectable = true;
Expand All @@ -508,7 +509,11 @@
this._currentCursorOpacity = 0;

this.fire('editing:exited');
this.canvas && this.canvas.fire('text:editing:exited', { target: this });
isTextChanged && this.fire('modified');
if (this.canvas) {
this.canvas.fire('text:editing:exited', { target: this });
isTextChanged && this.canvas.fire('object:modified', { target: this });
}

return this;
},
Expand Down
111 changes: 111 additions & 0 deletions test/unit/itext.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,87 @@
ok(!iText.isEditing);
});

test('event firing', function() {
var iText = new fabric.IText('test'),
enter = 0, exit = 0, modify = 0;

function countEnter() {
enter++;
}

function countExit() {
exit++;
}

function countModify() {
modify++;
}

iText.on('editing:entered', countEnter);
iText.on('editing:exited', countExit);
iText.on('modified', countModify);

equal(typeof iText.enterEditing, 'function');
equal(typeof iText.exitEditing, 'function');

iText.enterEditing();
equal(enter, 1);
equal(exit, 0);
equal(modify, 0);

iText.exitEditing();
equal(enter, 1);
equal(exit, 1);
equal(modify, 0);

iText.enterEditing();
equal(enter, 2);
equal(exit, 1);
equal(modify, 0);

iText.text = 'Test+';
iText.exitEditing();
equal(enter, 2);
equal(exit, 2);
equal(modify, 1);
});

test('insertChar and changed', function() {
var iText = new fabric.IText('test'), changed = 0;

function textChanged () {
changed++;
}
equal(typeof iText.insertChar, 'function');
iText.on('changed', textChanged);
equal(changed, 0);
iText.insertChar('foo_');
equal(iText.text, 'foo_test');
equal(changed, 1, 'event will fire once');
});

test('insertChar with style', function() {
var iText = new fabric.IText('test'),
style = {fontSize: 4};

equal(typeof iText.insertChar, 'function');
iText.insertChar('f', false, style);
equal(iText.text, 'ftest');
deepEqual(iText.styles[0][0], style);
});

test('insertChar with selectionStart with style', function() {
var iText = new fabric.IText('test'),
style = {fontSize: 4};
equal(typeof iText.insertChar, 'function');
iText.selectionStart = 2;
iText.selectionEnd = 2;
iText.insertChar('f', false, style);
equal(iText.text, 'tefst');
deepEqual(iText.styles[0][2], style);
});


test('insertChars', function() {
var iText = new fabric.IText('test');

Expand All @@ -263,6 +344,36 @@
equal(iText.text, 't_foo_t');
});

test('insertChars changed', function() {
var iText = new fabric.IText('test'), changed = 0;
function textChanged () {
changed++;
}
equal(typeof iText.insertChars, 'function');
iText.on('changed', textChanged);
equal(changed, 0);
iText.insertChars('foo_');
equal(changed, 1, 'insertChars fires the event once if there is no style');
equal(iText.text, 'foo_test');
});

test('insertChars changed with copied style', function() {
var iText = new fabric.IText('test'), changed = 0,
style = {0: {fontSize: 20}, 1: {fontSize: 22}};
function textChanged () {
changed++;
}
fabric.copiedTextStyle = style;
equal(typeof iText.insertChars, 'function');
iText.on('changed', textChanged);
equal(changed, 0);
iText.insertChars('foo_', true);
equal(changed, 1, 'insertChars fires once even if style is used');
equal(iText.text, 'foo_test');
deepEqual(iText.styles[0][0], style[0], 'style should be copied');
});


test('insertNewline', function() {
var iText = new fabric.IText('test');

Expand Down