summaryrefslogtreecommitdiffstats
path: root/install/ui
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2011-12-05 13:39:30 +0100
committerEndi S. Dewata <edewata@redhat.com>2011-12-05 16:02:11 +0000
commit1ffbec9942ad90e00e28b05296d3233f52ce2dad (patch)
treedb2226435f5a925a8073f482e626565c3d2e4375 /install/ui
parentc5ca34f41d2aede667c19d2213a5d7e79a5e301c (diff)
downloadfreeipa-1ffbec9942ad90e00e28b05296d3233f52ce2dad.tar.gz
freeipa-1ffbec9942ad90e00e28b05296d3233f52ce2dad.tar.xz
freeipa-1ffbec9942ad90e00e28b05296d3233f52ce2dad.zip
Removed usage of bitwise assignment operators in logical operations
JavaScript &= and |= are bitwise operators. They are shortened version of: foo = foo & bar foo = foo | bar In some places they were used as shortened version of logical operation and assignment. foo = foo && bar It lead to type conversion to Number which is wrong (0 !== false). This patch replaces such occurances with full version of logical operation and asignment. https://fedorahosted.org/freeipa/ticket/2040
Diffstat (limited to 'install/ui')
-rw-r--r--install/ui/details.js2
-rw-r--r--install/ui/dialog.js2
-rw-r--r--install/ui/field.js6
-rw-r--r--install/ui/ipa.js4
-rw-r--r--install/ui/widget.js2
5 files changed, 8 insertions, 8 deletions
diff --git a/install/ui/details.js b/install/ui/details.js
index 320ed9a4c..fdbf0b5ae 100644
--- a/install/ui/details.js
+++ b/install/ui/details.js
@@ -508,7 +508,7 @@ IPA.details_facet = function(spec) {
var fields = that.fields.get_fields();
for (var i=0; i<fields.length; i++) {
var field = fields[i];
- valid &= field.validate() && field.validate_required();
+ valid = field.validate() && field.validate_required() && valid;
}
return valid;
};
diff --git a/install/ui/dialog.js b/install/ui/dialog.js
index 44bd11cc1..375ab84c3 100644
--- a/install/ui/dialog.js
+++ b/install/ui/dialog.js
@@ -99,7 +99,7 @@ IPA.dialog = function(spec) {
var fields = that.fields.get_fields();
for (var i=0; i<fields.length; i++) {
var field = fields[i];
- valid &= field.validate() && field.validate_required();
+ valid = field.validate() && field.validate_required() && valid;
}
return valid;
};
diff --git a/install/ui/field.js b/install/ui/field.js
index 2cba87864..381f2360e 100644
--- a/install/ui/field.js
+++ b/install/ui/field.js
@@ -301,8 +301,8 @@ IPA.field = function(spec) {
if (!value) empty = true;
if (value instanceof Array) {
- empty |= (value.length === 0) ||
- (value.length === 1) && (value[0] === '');
+ empty = empty || value.length === 0 ||
+ (value.length === 1) && (value[0] === '');
}
if (value === '') empty = true;
@@ -480,7 +480,7 @@ IPA.multivalued_field = function(spec) {
that.test_dirty = function() {
var dirty = that.field_test_dirty();
- dirty |= that.widget.test_dirty(); //also checks order
+ dirty = dirty || that.widget.test_dirty(); //also checks order
return dirty;
};
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 08d8722ce..8a7b29f75 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -725,8 +725,8 @@ IPA.concurrent_command = function(spec) {
for(var i=0; i < that.commands.length; i++) {
var command_info = that.commands[i];
- all_completed &= command_info.completed;
- all_success &= command_info.success;
+ all_completed = all_completed && command_info.completed;
+ all_success = all_success && command_info.success;
}
if(all_completed) {
diff --git a/install/ui/widget.js b/install/ui/widget.js
index 79b035192..5b50d8f16 100644
--- a/install/ui/widget.js
+++ b/install/ui/widget.js
@@ -515,7 +515,7 @@ IPA.multivalued_text_widget = function(spec) {
var dirty = false;
for(var i=0; i < that.rows.length; i++) {
- dirty |= that.test_dirty_row(that.rows[i]);
+ dirty = dirty || that.test_dirty_row(that.rows[i]);
}
return dirty;