Merge branch 'cas_with_app_copy' into python_console

This commit is contained in:
Romain Goyet
2017-11-21 18:44:38 +01:00
273 changed files with 10671 additions and 4643 deletions

View File

@@ -79,11 +79,10 @@ bool TextFieldDelegateApp::textFieldShouldFinishEditing(TextField * textField, I
bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (textField->textFieldShouldFinishEditing(event) && textField->isEditing()) {
Expression * exp = Expression::parse(textField->text());
bool invalidText = (exp == nullptr || !exp->hasValidNumberOfArguments());
if (exp != nullptr) {
delete exp;
}
if (invalidText) {
if (exp == nullptr) {
textField->app()->displayWarning(I18n::Message::SyntaxError);
return true;
}