EXT-8401 FIXED Added new text prevalidation callback to allow ascii characters and new line in text editor.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/786/. --HG-- branch : product-enginemaster
parent
eb61c0a25c
commit
054e31512d
|
|
@ -50,6 +50,7 @@ namespace LLTextValidate
|
|||
declare("alpha_num_space", validateAlphaNumSpace);
|
||||
declare("ascii_printable_no_pipe", validateASCIIPrintableNoPipe);
|
||||
declare("ascii_printable_no_space", validateASCIIPrintableNoSpace);
|
||||
declare("ascii_with_newline", validateASCIIWithNewLine);
|
||||
}
|
||||
|
||||
// Limits what characters can be used to [1234567890.-] with [-] only valid in the first position.
|
||||
|
|
@ -299,4 +300,21 @@ namespace LLTextValidate
|
|||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
// Used for multiline text stored on the server.
|
||||
// Example is landmark description in Places SP.
|
||||
bool validateASCIIWithNewLine(const LLWString &str)
|
||||
{
|
||||
bool rv = TRUE;
|
||||
S32 len = str.length();
|
||||
while(len--)
|
||||
{
|
||||
if (str[len] < 0x20 && str[len] != 0xA || str[len] > 0x7f)
|
||||
{
|
||||
rv = FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ namespace LLTextValidate
|
|||
bool validateASCIIPrintableNoPipe(const LLWString &str);
|
||||
bool validateASCIIPrintableNoSpace(const LLWString &str);
|
||||
bool validateASCII(const LLWString &str);
|
||||
bool validateASCIIWithNewLine(const LLWString &str);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@
|
|||
name="notes_editor"
|
||||
read_only="true"
|
||||
text_readonly_color="white"
|
||||
text_type="ascii"
|
||||
text_type="ascii_with_newline"
|
||||
top_pad="5"
|
||||
width="290"
|
||||
wrap="true" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue