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.

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(compose): Add plain text signatures when replying to HTML email #1569

Merged
Merged
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
3 changes: 2 additions & 1 deletion src/app/compose/compose.component.ts
Original file line number Diff line number Diff line change
@@ -136,7 +136,8 @@ export class ComposeComponent implements AfterViewInit, OnDestroy, OnInit {
if ( !this.has_pasted_signature && from.signature ) {
this.has_pasted_signature = true;
this.signature = from.signature;
if ( from.is_signature_html ) {
// Sig is HTML, or Reply/Fwd Draft is HTML (contains .html)
if ( from.is_signature_html || this.model.useHTML) {
this.model.useHTML = true;
this.model.html = this.signature.concat('\n\n', this.model.html || this.model.msg_body);
} else {

Unchanged files with check annotations Beta

</p>
</table>
<div *ngIf="receipt.status == 1 && receipt.method === 'offline'">

Check warning on line 57 in src/app/account-app/account-receipt.component.html

GitHub Actions / Run lint tests

Expected `===` but received `==`
<h3>
Please follow the instructions for your selected payment method below.
</h3>
close_to_quota = [];
close_percentage = 90;
ngOnInit() {

Check warning on line 244 in src/app/account-app/account-renewals.component.ts

GitHub Actions / Run lint tests

Lifecycle interface 'OnInit' should be implemented for method 'ngOnInit'. (https://angular.io/styleguide#style-09-01)
this.close_to_quota = this.check_close_quota();
}
<ng-container matColumnDef="expansionIndicator">
<th mat-header-cell *matHeaderCellDef> </th>
<td mat-cell *matCellDef="let t">
<mat-icon *ngIf="t == expandedTransaction; else notExpanded" svgIcon="chevron-down"></mat-icon>

Check warning on line 43 in src/app/account-app/account-transactions.component.html

GitHub Actions / Run lint tests

Expected `===` but received `==`
<ng-template #notExpanded>
<mat-icon svgIcon="chevron-right"></mat-icon>
</ng-template>
</ng-container>
<ng-container matColumnDef="expandedDetails">
<td mat-cell *matCellDef="let t" [attr.colspan]="displayedColumns.length">
<div class="expandedDetails" [@detailExpand]="t == expandedTransaction ? 'expanded' : 'collapsed'">

Check warning on line 59 in src/app/account-app/account-transactions.component.html

GitHub Actions / Run lint tests

Expected `===` but received `==`
<!-- yo dawg, I heard you like tables -->
<table class="detailsTable">
<tr>
`],
template: `
<ng-container><span #ref><ng-content select="[custom_template]"></ng-content></span></ng-container>
<ng-container *ngIf="ref.childNodes.length == 0">

Check warning on line 37 in src/app/account-app/runbox-timer.ts

GitHub Actions / Run lint tests

Expected `===` but received `==`
<span class="timeunit years" *ngIf="runningDuration.years() > 0">{{runningDuration.years()}} years,</span>
<span class="timeunit months" *ngIf="runningDuration.months() > 0"> {{runningDuration.months()}} months,</span>
<span class="timeunit days" *ngIf="runningDuration.days() > 0"> {{runningDuration.days()}} days,</span>
constructor(public app: RMM) {}
async ngOnInit() {

Check warning on line 46 in src/app/account-details/account-settings.component.ts

GitHub Actions / Run lint tests

Lifecycle interface 'OnInit' should be implemented for method 'ngOnInit'. (https://angular.io/styleguide#style-09-01)
this.app.account_settings.load().subscribe((settings) => {
Object.keys(settings.result).forEach((key) =>
this.settingsArray.push({
this.loadTimezones();
}
ngOnInit() {

Check warning on line 71 in src/app/account-details/personal-details.component.ts

GitHub Actions / Run lint tests

Lifecycle interface 'OnInit' should be implemented for method 'ngOnInit'. (https://angular.io/styleguide#style-09-01)
if (!this.rmm.account_security.user_password) {
this.show_modal_password();
}
constructor(public app: RMM) {
}
ngOnInit() {

Check warning on line 44 in src/app/account-details/storage-data.component.ts

GitHub Actions / Run lint tests

Lifecycle interface 'OnInit' should be implemented for method 'ngOnInit'. (https://angular.io/styleguide#style-09-01)
this.app.account_storage.getUsage().subscribe(dataUsage => {
const usageArray = [];
Object.keys(dataUsage.result).forEach(key => usageArray.push(
this.rmm.me.load();
}
ngOnInit() {

Check warning on line 41 in src/app/account-security/sessions.component.ts

GitHub Actions / Run lint tests

Lifecycle interface 'OnInit' should be implemented for method 'ngOnInit'. (https://angular.io/styleguide#style-09-01)
this.rmm.account_security.session.list();
}
}
<mat-list-item *ngFor="let fce of folderListEntries" (click)="moveMessages(fce.folderId)"
[style.paddingLeft.px]="fce.folderLevel*10"
>
<mat-icon *ngIf="fce.folderType=='inbox'" mat-list-icon class="folderIconStandard" svgIcon="inbox-arrow-down"></mat-icon>

Check warning on line 33 in src/app/actions/movemessage.action.ts

GitHub Actions / Run lint tests

Expected `===` but received `==`
<mat-icon *ngIf="fce.folderType=='sent'" mat-list-icon class="folderIconStandard" svgIcon="send"></mat-icon>
<mat-icon *ngIf="fce.folderType=='spam'" mat-list-icon class="folderIconStandard" svgIcon="cancel"></mat-icon>
<mat-icon *ngIf="fce.folderType=='templates'" mat-list-icon class="folderIconStandard" svgIcon="file-document"></mat-icon>