You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/10/06 00:32:45 UTC
[24/49] git commit: CS-16452: cloudstack UI - dialog widget - call
field.selectFn regardless of value of field.isHidden.
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/20183aa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/20183aa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/20183aa5
Branch: refs/heads/maven-to-rpm
Commit: 20183aa5a48394fefae4beafff027c7b44c08de3
Parents: a15edcd
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Oct 4 16:56:36 2012 -0700
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Sat Oct 6 00:30:27 2012 +0200
----------------------------------------------------------------------
ui/scripts/ui/dialog.js | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20183aa5/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) {