Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-07-18 08:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use templating for the edit/add views

Browse Source
This commit is contained in:
Travis Ralston 2017-12-22 21:52:24 -07:00
parent 0b63c8eb85
commit c95ab2bbb2
2 changed files with 32 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
web/app/configs/widget/custom/custom.widget.component.html
View File

@ -2,28 +2,34 @@
<my-spinner></my-spinner>
</div>
<ng-template #widgetParams let-widget="widget">
<label class="label-block">
Widget Name
<input type="text" class="form-control"
placeholder="{{ defaultName }}"
[(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
[disabled]="isUpdating"/>
</label>
<label class="label-block">
Widget URL
<input type="text" class="form-control"
placeholder="https://matrix.org"
[(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
[disabled]="isUpdating"/>
</label>
</ng-template>
<div *ngIf="!isLoading">
<my-ibox title="Add {{ defaultName }}" [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
<div class="my-ibox-content">
<form (submit)="addWidget()" novalidate name="addForm">
<label class="label-block">
Widget Name
<input type="text" class="form-control"
placeholder="{{ defaultName }}"
[(ngModel)]="newWidget.dimension.newName" name="widget-name-new"
[disabled]="isUpdating"/>
</label>
<label class="label-block">
Widget URL
<input type="text" class="form-control"
placeholder="https://matrix.org"
[(ngModel)]="newWidget.dimension.newUrl" name="widget-url-new"
[disabled]="isUpdating"/>
</label>
<ng-container *ngTemplateOutlet="widgetParams;context:{widget:newWidget}"></ng-container>
<button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
<i class="fa fa-plus"></i> Add Widget
</button>
<div style="margin-top: 25px">
<button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
<i class="fa fa-plus"></i> Add Widget
</button>
</div>
</form>
</div>
</my-ibox>
@ -33,31 +39,16 @@
title="{{ widget.name || widget.url || defaultName }}">
<div class="my-ibox-content">
<form (submit)="saveWidget(widget)" novalidate name="addForm">
<label class="label-block">
Widget Name
<input type="text" class="form-control"
placeholder="{{ defaultName }}"
[(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
[disabled]="isUpdating"/>
</label>
<label class="label-block">
Widget URL
<input type="text" class="form-control"
placeholder="https://matrix.org"
[(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
[disabled]="isUpdating"/>
</label>
<ng-container *ngTemplateOutlet="widgetParams;context:{widget:widget}"></ng-container>
<button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
<i class="fa fa-save"></i> Save Widget
</button>
<button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
<i class="fa fa-times"></i> Remove Widget
</button>
<button type="button" class="btn btn-sm btn-white" [disabled]="isUpdating" (click)="resetWidget(widget)"
*ngIf="hasChanges(widget)">
<i class="fa fa-undo"></i> Undo Changes
</button>
<div style="margin-top: 25px">
<button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
<i class="fa fa-save"></i> Save Widget
</button>
<button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
<i class="fa fa-times"></i> Remove Widget
</button>
</div>
</form>
</div>
</my-ibox>

17
web/app/configs/widget/widget.component.ts
View File

@ -313,21 +313,4 @@ export class NewWidgetComponent {
this.unpackWidget(widget);
this.OnWidgetPreparedForEdit.emit(widget);
}
/**
* Determines if a widget has had any changes made to it
* @param {EditableWidget} widget The widget to check
* @returns {boolean} True if the widget has been edited
*/
public hasChanges(widget: EditableWidget): boolean {
if (widget.dimension.newUrl !== this.unwrapUrl(widget.url)) return true;
if (widget.dimension.newName !== widget.name) return true;
if (widget.dimension.newTitle !== widget.data.title) return true;
const currentData = JSON.parse(JSON.stringify(widget.data || "{}"));
const newData = JSON.parse(JSON.stringify(widget.dimension.newData || "{}"));
if (currentData !== newData) return true;
return false;
}
}