UI-1091: Don't use charges description if it's not strictly a string

2600hz · Jan 28, 2015 · 933159a · 933159a
1 parent dc30318
commit 933159a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/lib/monster.ui.js b/js/lib/monster.ui.js
@@ -302,9 +302,11 @@ define(function(require){
 
 					return renderData;
 				},
+				charges = data.hasOwnProperty('activation_charges') ? data.activation_charges : false,
+				description = typeof data.activation_charges_description === 'string' ? data.activation_charges_description : false,
 				template = $(monster.template(coreApp, 'dialog-charges', {
-						activation_charges: data.hasOwnProperty('activation_charges') ? data.activation_charges : false,
-						activation_charges_description: data.hasOwnProperty('activation_charges_description') ? data.activation_charges_description : false,
+						activation_charges: charges,
+						activation_charges_description: description,
 						charges: formatData(data)
 					}
 				)),