From 55950f95948fdf6e37de4bff767ba2c453aa7e40 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 18 Apr 2017 19:03:32 +0200 Subject: [PATCH] Assign placeholder text on the model only when the attribute is present Signed-off-by: Nathan Sobo --- spec/text-editor-element-spec.js | 6 ++++++ src/text-editor-element.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spec/text-editor-element-spec.js b/spec/text-editor-element-spec.js index ee1ef37cd..294973c3e 100644 --- a/spec/text-editor-element-spec.js +++ b/spec/text-editor-element-spec.js @@ -24,6 +24,12 @@ describe('TextEditorElement', () => { expect(element.getModel().getPlaceholderText()).toBe('testing') }) + it("only assigns 'placeholder-text' on the model if the attribute is present", () => { + const editor = new TextEditor({placeholderText: 'placeholder'}) + editor.getElement() + expect(editor.getPlaceholderText()).toBe('placeholder') + }) + it("honors the 'gutter-hidden' attribute", () => { jasmineContent.innerHTML = '' const element = jasmineContent.firstChild diff --git a/src/text-editor-element.js b/src/text-editor-element.js index fe780f7db..9bbfe675b 100644 --- a/src/text-editor-element.js +++ b/src/text-editor-element.js @@ -87,8 +87,8 @@ class TextEditorElement extends HTMLElement { updateModelFromAttributes () { const props = { mini: this.hasAttribute('mini'), - placeholderText: this.getAttribute('placeholder-text') } + if (this.hasAttribute('placeholder-text')) props.placeholderText = this.getAttribute('placeholder-text') if (this.hasAttribute('gutter-hidden')) props.lineNumberGutterVisible = false this.getModel().update(props)