From b4416f3bc25c6e705082840ea87b293e5bbcac82 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 13 May 2015 08:35:55 -0700 Subject: [PATCH 1/2] Remove nowrap from entity tool property labels --- examples/html/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/html/style.css b/examples/html/style.css index 864ade23a4..dd2e96ab43 100644 --- a/examples/html/style.css +++ b/examples/html/style.css @@ -243,7 +243,6 @@ table#properties-list { #properties-list .label { font-weight: bold; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; From e9a2cbdc9ab696f70fbe76088818dae473d78713 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 13 May 2015 17:49:54 -0700 Subject: [PATCH 2/2] handle falsy values for valueForKeyPath --- domain-server/resources/web/js/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index f956d4a374..fe3ad40131 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -26,7 +26,7 @@ var viewHelpers = { setting_value = _(values).valueForKeyPath(keypath); - if (!setting_value) { + if (setting_value === undefined || setting_value === null) { if (_.has(setting, 'default')) { setting_value = setting.default; } else {