Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package org.eclipse.kura.web.client.ui.network;

import org.eclipse.kura.web.client.messages.Messages;
import org.eclipse.kura.web.client.ui.NewPasswordInput;
import org.eclipse.kura.web.client.util.HelpButton;
import org.eclipse.kura.web.shared.model.Gwt8021xConfig;
import org.eclipse.kura.web.shared.model.Gwt8021xEap;
Expand All @@ -25,6 +24,7 @@
import org.gwtbootstrap3.client.ui.Form;
import org.gwtbootstrap3.client.ui.FormGroup;
import org.gwtbootstrap3.client.ui.FormLabel;
import org.gwtbootstrap3.client.ui.Input;
import org.gwtbootstrap3.client.ui.ListBox;
import org.gwtbootstrap3.client.ui.PanelHeader;
import org.gwtbootstrap3.client.ui.TextBox;
Expand Down Expand Up @@ -96,7 +96,7 @@ interface Tab8021xUiUiBinder extends UiBinder<Widget, Tab8021xUi> {
TextBox username;

@UiField
NewPasswordInput password;
Input password;

@UiField
TextBox keystorePid;
Expand Down Expand Up @@ -267,7 +267,7 @@ private void initPasswordTextBox() {
});

this.password.addBlurHandler(e -> this.password.validate());
this.password.setAllowBlank(false);
this.password.setAllowBlank(true);
Comment thread
MMaiero marked this conversation as resolved.
this.password.addMouseOutHandler(event -> resetHelpText());

this.password.addChangeHandler(event -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
<util:HelpButton ui:field="helpPassword"/>
<b:HelpBlock color="red"
ui:field="helpblockPassword" />
<kura:NewPasswordInput type="PASSWORD" b:id="password"
ui:field="password" allowPlaceholder="true"/>
<b:Input type="PASSWORD" b:id="password"
ui:field="password" />
</b:FormGroup>

<b:FormGroup ui:field="identityKeystorePid">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1300,11 +1300,9 @@ private void setPasswordValidation() {
this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements);
this.password
.addValidator(GwtValidators.regex(REGEX_PASS_WEP, MSGS.netWifiWirelessInvalidWEPPassword()));
} else if (this.security != null && this.security.getSelectedItemText().equals(WIFI_SECURITY_NONE_MESSAGE)) {
this.password.setValidators();
} else {
passwordStrengthRequirements.allowAnyPassword();
this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements);
// Clears all validators when password is not required
Comment thread
MMaiero marked this conversation as resolved.
this.password.setValidators();
}
});

Expand Down