From 68f5cc61a9808f4cb093228edd1b9eecc5d005b2 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sun, 17 Nov 2019 16:40:00 +0100
Subject: [PATCH] Update href trait value. Closes #2411

---
 src/i18n/locale/en.js                     |  2 +-
 src/i18n/locale/it.js                     |  2 +-
 src/trait_manager/config/config.js        |  2 +-
 src/trait_manager/model/Trait.js          | 11 +++++++++--
 src/trait_manager/view/TraitSelectView.js |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/i18n/locale/en.js b/src/i18n/locale/en.js
index 158a0cdd6..d06c799f2 100644
--- a/src/i18n/locale/en.js
+++ b/src/i18n/locale/en.js
@@ -108,7 +108,7 @@ export default {
       // In a trait like select, these are used to translate option names
       options: {
         target: {
-          '': 'This window',
+          false: 'This window',
           _blank: 'New window'
         }
       }
diff --git a/src/i18n/locale/it.js b/src/i18n/locale/it.js
index 56b717141..be107df61 100644
--- a/src/i18n/locale/it.js
+++ b/src/i18n/locale/it.js
@@ -94,7 +94,7 @@ export default {
       },
       options: {
         target: {
-          '': 'Questa finestra',
+          false: 'Questa finestra',
           _blank: 'Nuova finestra'
         }
       }
diff --git a/src/trait_manager/config/config.js b/src/trait_manager/config/config.js
index a77c6438b..62409ca00 100644
--- a/src/trait_manager/config/config.js
+++ b/src/trait_manager/config/config.js
@@ -6,5 +6,5 @@ export default {
   appendTo: '',
 
   // Default options for the target input
-  optionsTarget: [{ value: '' }, { value: '_blank' }]
+  optionsTarget: [{ value: false }, { value: '_blank' }]
 };
diff --git a/src/trait_manager/model/Trait.js b/src/trait_manager/model/Trait.js
index 85368d003..dba3b2352 100644
--- a/src/trait_manager/model/Trait.js
+++ b/src/trait_manager/model/Trait.js
@@ -64,12 +64,19 @@ export default Backbone.Model.extend({
     const target = this.target;
     const name = this.get('name');
     if (isUndefined(value)) return;
+    let valueToSet = value;
+
+    if (value === 'false') {
+      valueToSet = false;
+    } else if (value === 'true') {
+      valueToSet = true;
+    }
 
     if (this.get('changeProp')) {
-      target.set(name, value, opts);
+      target.set(name, valueToSet, opts);
     } else {
       const attrs = { ...target.get('attributes') };
-      attrs[name] = value;
+      attrs[name] = valueToSet;
       target.set('attributes', attrs, opts);
     }
   },
diff --git a/src/trait_manager/view/TraitSelectView.js b/src/trait_manager/view/TraitSelectView.js
index c91d5b428..745d8e6ec 100644
--- a/src/trait_manager/view/TraitSelectView.js
+++ b/src/trait_manager/view/TraitSelectView.js
@@ -54,7 +54,7 @@ export default TraitView.extend({
 
       input += '</select>';
       this.$input = $(input);
-      let val = model.getTargetValue() || model.get('value');
+      const val = model.getTargetValue();
       !isUndefined(val) && this.$input.val(val);
     }