From 1efc1836ada9b8e760d4701e69a2497abd32e2d0 Mon Sep 17 00:00:00 2001 From: Anthony Dickinson Date: Tue, 17 Apr 2018 00:15:40 +0200 Subject: [PATCH 1/3] Enable enum attribute to be selected --- src/DropdownDivConverter/DropdownDivConverter.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DropdownDivConverter/DropdownDivConverter.xml b/src/DropdownDivConverter/DropdownDivConverter.xml index 42a8ba2..2328781 100644 --- a/src/DropdownDivConverter/DropdownDivConverter.xml +++ b/src/DropdownDivConverter/DropdownDivConverter.xml @@ -72,6 +72,7 @@ The attribute that sets the label on the dropdown button. If used, the static value on the general tab will be overridden. + From 52f2c0a29b3e0da4c28c4156f15b7b311a25f99f Mon Sep 17 00:00:00 2001 From: Anthony Dickinson Date: Tue, 17 Apr 2018 00:16:22 +0200 Subject: [PATCH 2/3] Use enum caption when enum is used --- src/DropdownDivConverter/widget/DropdownDivConverter.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/DropdownDivConverter/widget/DropdownDivConverter.js b/src/DropdownDivConverter/widget/DropdownDivConverter.js index ac477ff..0df0f3a 100644 --- a/src/DropdownDivConverter/widget/DropdownDivConverter.js +++ b/src/DropdownDivConverter/widget/DropdownDivConverter.js @@ -275,7 +275,11 @@ define([ _updateButtonTitle: function() { this._buttonLabel = this.buttonTitle; if (this._dynamicLabel) { - this._buttonLabel = this._contextObj.get(this.dynamicButtonTitleAttribute); + if (this._contextObj.isEnum(this.dynamicButtonTitleAttribute) && ) { + this._buttonLabel = this._contextObj.getEnumCaption(this.dynamicButtonTitleAttribute, this._contextObj.get(this.dynamicButtonTitleAttribute)); + } else { + this._buttonLabel = this._contextObj.get(this.dynamicButtonTitleAttribute); + } } }, From ae149a8a20aa90d3382c903d3693e38f5afcafd1 Mon Sep 17 00:00:00 2001 From: Anthony Dickinson Date: Tue, 17 Apr 2018 00:18:08 +0200 Subject: [PATCH 3/3] Typo --- src/DropdownDivConverter/widget/DropdownDivConverter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DropdownDivConverter/widget/DropdownDivConverter.js b/src/DropdownDivConverter/widget/DropdownDivConverter.js index 0df0f3a..fbb554e 100644 --- a/src/DropdownDivConverter/widget/DropdownDivConverter.js +++ b/src/DropdownDivConverter/widget/DropdownDivConverter.js @@ -275,7 +275,7 @@ define([ _updateButtonTitle: function() { this._buttonLabel = this.buttonTitle; if (this._dynamicLabel) { - if (this._contextObj.isEnum(this.dynamicButtonTitleAttribute) && ) { + if (this._contextObj.isEnum(this.dynamicButtonTitleAttribute)) { this._buttonLabel = this._contextObj.getEnumCaption(this.dynamicButtonTitleAttribute, this._contextObj.get(this.dynamicButtonTitleAttribute)); } else { this._buttonLabel = this._contextObj.get(this.dynamicButtonTitleAttribute);