Updated Branches: refs/heads/master 603404c56 -> 8ea0a230e
CS-16452: cloudstack UI - dialog widget - call field.selectFn regardless of value of field.isHidden. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8ea0a230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8ea0a230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8ea0a230 Branch: refs/heads/master Commit: 8ea0a230e65915edc854abc8ef8b93db634f97cf Parents: 603404c Author: Jessica Wang <[email protected]> Authored: Thu Oct 4 16:56:36 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Oct 4 16:58:24 2012 -0700 ---------------------------------------------------------------------- ui/scripts/ui/dialog.js | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ea0a230/ui/scripts/ui/dialog.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 0aa2ac5..a685c91 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -201,8 +201,7 @@ $input = $('<select>') .attr({ name: key }) .data('dialog-select-fn', function(args) { - if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false)) - selectFn(args ? $.extend(true, {}, selectArgs, args) : selectArgs); + selectFn(args ? $.extend(true, {}, selectArgs, args) : selectArgs); }) .appendTo($value); @@ -227,19 +226,16 @@ dependsOnArgs[dependsOn] = $target.val(); - if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false)) - selectFn($.extend(selectArgs, dependsOnArgs)); + selectFn($.extend(selectArgs, dependsOnArgs)); return true; }); if (!$dependsOn.is('select')) { - if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false)) - selectFn(selectArgs); + selectFn(selectArgs); } } else { - if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false)) - selectFn(selectArgs); + selectFn(selectArgs); } } else if (field.isBoolean) { if (field.multiArray) {
