opendev/gerrit
Code Issues Proposed changes

ES6ify /gr-editable-content/*

Browse Source 
Bug: Issue 6179
Change-Id: Id76f19b519e66c5936a06ad410a63c88ddd96cf5
This commit is contained in:
Kasper Nilsson
2017-05-15 16:23:50 -07:00
parent 966fdcf61f
commit 47bd458b0d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content.js
View File

@@ -53,11 +53,11 @@
_newContent: String, _newContent: String,
}, },
focusTextarea: function() { focusTextarea() {
this.$$('iron-autogrow-textarea').textarea.focus(); this.$$('iron-autogrow-textarea').textarea.focus();
}, },
_editingChanged: function(editing) { _editingChanged(editing) {
if (!editing) { return; } if (!editing) { return; }
// TODO(wyatta) switch linkify sequence, see issue 5526. // TODO(wyatta) switch linkify sequence, see issue 5526.
@@ -65,16 +65,16 @@
this.content.replace(/^R=\u200B/gm, 'R=') : this.content; this.content.replace(/^R=\u200B/gm, 'R=') : this.content;
}, },
_computeSaveDisabled: function(disabled, content, newContent) { _computeSaveDisabled(disabled, content, newContent) {
return disabled || (content === newContent); return disabled || (content === newContent);
}, },
_handleSave: function(e) { _handleSave(e) {
e.preventDefault(); e.preventDefault();
this.fire('editable-content-save', {content: this._newContent}); this.fire('editable-content-save', {content: this._newContent});
}, },
_handleCancel: function(e) { _handleCancel(e) {
e.preventDefault(); e.preventDefault();
this.editing = false; this.editing = false;
this.fire('editable-content-cancel'); this.fire('editable-content-cancel');

28
polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_test.html
View File

@@ -33,37 +33,37 @@ limitations under the License.
</test-fixture> </test-fixture>
<script> <script>
suite('gr-editable-content tests', function() { suite('gr-editable-content tests', () => {
var element; let element;
setup(function() { setup(() => {
element = fixture('basic'); element = fixture('basic');
}); });
test('save event', function(done) { test('save event', done => {
element._newContent = 'foo'; element._newContent = 'foo';
element.addEventListener('editable-content-save', function(e) { element.addEventListener('editable-content-save', e => {
assert.equal(e.detail.content, 'foo'); assert.equal(e.detail.content, 'foo');
done(); done();
}); });
MockInteractions.tap(element.$$('gr-button[primary]')); MockInteractions.tap(element.$$('gr-button[primary]'));
}); });
test('cancel event', function(done) { test('cancel event', done => {
element.addEventListener('editable-content-cancel', function() { element.addEventListener('editable-content-cancel', () => {
done(); done();
}); });
MockInteractions.tap(element.$$('gr-button:not([primary])')); MockInteractions.tap(element.$$('gr-button:not([primary])'));
}); });
test('enabling editing updates edit field contents', function() { test('enabling editing updates edit field contents', () => {
element.content = 'current content'; element.content = 'current content';
element._newContent = 'stale content'; element._newContent = 'stale content';
element.editing = true; element.editing = true;
assert.equal(element._newContent, 'current content'); assert.equal(element._newContent, 'current content');
}); });
test('disabling editing does not update edit field contents', function() { test('disabling editing does not update edit field contents', () => {
element.content = 'current content'; element.content = 'current content';
element.editing = true; element.editing = true;
element._newContent = 'stale content'; element._newContent = 'stale content';
@@ -71,24 +71,24 @@ limitations under the License.
assert.equal(element._newContent, 'stale content'); assert.equal(element._newContent, 'stale content');
}); });
test('zero width spaces are removed properly', function() { test('zero width spaces are removed properly', () => {
element.removeZeroWidthSpace = true; element.removeZeroWidthSpace = true;
element.content = 'R=\u200Btest@google.com'; element.content = 'R=\u200Btest@google.com';
element.editing = true; element.editing = true;
assert.equal(element._newContent, 'R=test@google.com'); assert.equal(element._newContent, 'R=test@google.com');
}); });
suite('editing', function() { suite('editing', () => {
setup(function() { setup(() => {
element.content = 'current content'; element.content = 'current content';
element.editing = true; element.editing = true;
}); });
test('save button is disabled initially', function() { test('save button is disabled initially', () => {
assert.isTrue(element.$$('gr-button[primary]').disabled); assert.isTrue(element.$$('gr-button[primary]').disabled);
}); });
test('save button is enabled when content changes', function() { test('save button is enabled when content changes', () => {
element._newContent = 'new content'; element._newContent = 'new content';
assert.isFalse(element.$$('gr-button[primary]').disabled); assert.isFalse(element.$$('gr-button[primary]').disabled);
}); });