Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix lengths #533

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix lengths #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b77eed7
fix lengths
tarmo888 Jul 26, 2020
fda9262
match profile and attestation lengths
tarmo888 Jul 26, 2020
908a6e2
Merge remote-tracking branch 'upstream/master' into text-as-long-as-data
tarmo888 Sep 19, 2020
2ebfac3
Merge remote-tracking branch 'upstream/master' into text-as-long-as-data
tarmo888 Oct 2, 2020
626edff
Merge remote-tracking branch 'upstream/master' into text-as-long-as-data
tarmo888 Oct 2, 2020
2a90944
Merge remote-tracking branch 'upstream/master' into text-as-long-as-data
tarmo888 Oct 3, 2020
279c45e
Merge remote-tracking branch 'upstream/master' into text-as-long-as-data
tarmo888 Oct 5, 2020
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
4 changes: 2 additions & 2 deletions public/views/walletHome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ <h4 class="title m0" style="padding:10px 0 0; background-color: #F1F3F5;">
</label>
<div class="input">
<textarea id="comment" ng-disabled="home.blockUx" name="comment"
ng-maxlength="500" ng-model="_comment" ng-focus="home.formFocus('msg')"
ng-maxlength="500" maxlength="500" ng-model="_comment" ng-focus="home.formFocus('msg')"
ng-blur="home.formFocus(false)"></textarea>
</div>
</div>
Expand Down Expand Up @@ -724,7 +724,7 @@ <h4 ng-if="home.aa_dry_run_error || home.aa_message_results.length || home.aa_st
<label style="float: left;">
<span translate>Text to be forever saved on the DAG:</span>
</label>
<textarea name="content" ng-model="home.content" placeholder="Text" required rows="4" ng-change="home.validateTextLength()" style="margin-bottom: 0px;/*font-family:SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace;*/" ng-trim="false"></textarea>
<textarea name="content" ng-model="home.content" placeholder="Text" required rows="10" ng-change="home.validateTextLength()" style="margin-bottom: 0px;/*font-family:SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace;*/" ng-trim="false"></textarea>
<div ng-if="sendDataForm.content.$invalid && home.content" class="text-warning size-12" translate>Too long text</div>
<div ng-if="sendDataForm.content.$valid || !home.content" class="size-12">{{home.content.length || 0}} <span translate>character(s)</span></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/walletHome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ angular.module('copayApp.controllers')

this.validateTextLength = function () {
var form = $scope.sendDataForm;
form.content.$setValidity('validLength', !(self.content && self.content.length > 140));
form.content.$setValidity('validLength', !(self.content && self.content.length > 280));
}

this.onAddressChanged = function () {
Expand Down