Skip to content

Commit 3f410ff

Browse files
committed
Don't show base compound action parameters on non-compound actions
1 parent eb4a6c0 commit 3f410ff

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/web/reference/js/reference.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ function populatePropertyHolderList(list, sectionKey) {
197197
sortList(list);
198198
}
199199

200-
function makePropertyHolderSelector(selector, section, details, baseProperties) {
200+
function makePropertyHolderSelector(selector, section, details, baseProperties, category, categoryProperties) {
201201
populatePropertyHolderList(selector, section);
202202
makeSelectable(selector, details, function(details, listItem) {
203-
addPropertyHolderDetails(details, listItem.data('key'), section, baseProperties);
203+
addPropertyHolderDetails(details, listItem.data('key'), section, baseProperties, category, categoryProperties);
204204
}, 1);
205205
}
206206

@@ -220,7 +220,7 @@ function sortList(ul) {
220220
$.each(listitems, function(idx, itm) { ul.append(itm); });
221221
}
222222

223-
function addPropertyHolderDetails(container, key, section, baseProperties) {
223+
function addPropertyHolderDetails(container, key, section, baseProperties, targetCategory, categoryProperties) {
224224
var propertyHolder = metadata[section][key];
225225

226226
var title = $('<div class="titleBanner"/>').text(propertyHolder.name);
@@ -275,6 +275,9 @@ function addPropertyHolderDetails(container, key, section, baseProperties) {
275275
parameterList.append(parameterItem);
276276
}
277277
baseProperties = metadata[baseProperties];
278+
if (targetCategory && propertyHolder.hasOwnProperty('category') && propertyHolder.category == targetCategory) {
279+
baseProperties = jQuery.extend({}, baseProperties, metadata[categoryProperties]);
280+
}
278281
var baseParameters = Object.keys(baseProperties);
279282
sortProperties(baseParameters);
280283
for (var i = 0; i < baseParameters.length; i++) {
@@ -379,7 +382,7 @@ function initialize() {
379382
makePropertySelector($("#effectParameterList"), "effect_parameters", $('#effectParameterDetails'));
380383

381384
makePropertyHolderSelector($("#effectList"), "effectlib_effects", $('#effectDetails'), 'effectlib_parameters');
382-
makePropertyHolderSelector($("#actionList"), "actions", $('#actionDetails'), 'action_parameters');
385+
makePropertyHolderSelector($("#actionList"), "actions", $('#actionDetails'), 'action_parameters', 'compound', 'compound_action_parameters');
383386

384387
// Kinda hacky but not sure how to work around this
385388
var currentHash = window.location.hash;

0 commit comments

Comments
 (0)