Repository: brooklyn-docs Updated Branches: refs/heads/master 6f8c37bd0 -> ffc3ee63d
Fixes handling of undefined values in templates Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c3bb5d39 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c3bb5d39 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c3bb5d39 Branch: refs/heads/master Commit: c3bb5d3923ad93a7daaab109b026000993cdc547 Parents: 6f8c37b Author: Sam Corbett <[email protected]> Authored: Wed Apr 13 12:37:43 2016 +0100 Committer: Sam Corbett <[email protected]> Committed: Wed Apr 13 12:37:43 2016 +0100 ---------------------------------------------------------------------- style/js/catalog/common.js | 14 +++++++------- website/learnmore/catalog/catalog-item.html | 13 +++++++++---- 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c3bb5d39/style/js/catalog/common.js ---------------------------------------------------------------------- diff --git a/style/js/catalog/common.js b/style/js/catalog/common.js index 4fc5248..c2a2cd3 100644 --- a/style/js/catalog/common.js +++ b/style/js/catalog/common.js @@ -74,9 +74,9 @@ var brooklyn = (function ($, _) { "<div class='card configKey'>" + "<div class='name'><%=name%></div>" + "<dl>" + - "<dt>description</dt><dd><%=(description||' ')%></dd>" + - "<dt>value type</dt><dd class='java'><%=(type||' ')%></dd>" + - "<dt>default value</dt><dd><%=(defaultValue||' ')%></dd>" + + "<dt>description</dt><dd><% if (typeof description !== 'undefined') { %><%= description %><% } else { %> <% } %></dd>" + + "<dt>value type</dt><dd class='java'><% if (typeof type !== 'undefined') { %><%= type %><% } else { %> <% } %></dd>" + + "<dt>default value</dt><dd><% if (typeof defaultValue !== 'undefined') { %><%= defaultValue %><% } else { %> <% } %></dd>" + "</dl>" + "</div>" ), @@ -84,8 +84,8 @@ var brooklyn = (function ($, _) { "<div class='card sensor'>" + "<div class='name'><%=name%></div>" + "<dl>" + - "<dt>description</dt><dd><%=(description||' ')%></dd>" + - "<dt>value type</dt><dd class='java'><%=(type||' ')%></dd>" + + "<dt>description</dt><dd><% if (typeof description !== 'undefined') { %><%= description %><% } else { %> <% } %></dd>" + + "<dt>value type</dt><dd class='java'><% if (typeof type !== 'undefined') { %><%= type %><% } else { %> <% } %></dd>" + "</dl>" + "</div>" ), @@ -93,8 +93,8 @@ var brooklyn = (function ($, _) { "<div class='card effector'>" + "<div class='name'><%=name%></div>" + "<dl>" + - "<dt>description</dt><dd><%=(description||' ')%></dd>" + - "<dt>return type</dt><dd class='java'><%=(returnType||' ')%></dd>" + + "<dt>description</dt><dd><% if (typeof description !== 'undefined') { %><%= description %><% } else { %> <% } %></dd>" + + "<dt>return type</dt><dd class='java'><% if (typeof returnType !== 'undefined') { %><%= returnType %><% } else { %> <% } %></dd>" + "</dl>" + "</div>" ) http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c3bb5d39/website/learnmore/catalog/catalog-item.html ---------------------------------------------------------------------- diff --git a/website/learnmore/catalog/catalog-item.html b/website/learnmore/catalog/catalog-item.html index f0e0108..0d9f1b5 100644 --- a/website/learnmore/catalog/catalog-item.html +++ b/website/learnmore/catalog/catalog-item.html @@ -90,15 +90,20 @@ under the License. document.title = 'Brooklyn ' + catalog_type + ' - ' + item.name; - item.config.forEach(function (element) { $("#configKeys").append(brooklyn.configKeyCard(element)); }); + item.config.forEach(function (element) { + $("#configKeys").append(brooklyn.configKeyCard(element)); + }); if(args[0] == 'entities') { $("#sensorsTab").show(); $("#effectorsTab").show(); - - item.sensors.forEach(function (element) { $("#sensors").append(brooklyn.sensorCard(element)); }); + item.sensors.forEach(function (element) { + $("#sensors").append(brooklyn.sensorCard(element)); + }); if (item.effectors != undefined) { - item.effectors.forEach(function (element) { $("#effectors").append(brooklyn.effectorCard(element)); }); + item.effectors.forEach(function (element) { + $("#effectors").append(brooklyn.effectorCard(element)); + }); } } else {
