github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-04-08 15:50:19 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Use GroupBadge component since we already have that

Browse Source
This commit is contained in:
Franz Liedke 2016-03-29 22:39:26 +09:00
parent edc15d3163
commit f6e2a7a7e5
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
framework/core/js/admin/dist/app.js vendored
View File

@ -18257,15 +18257,15 @@ System.register('flarum/components/EditCustomCssModal', ['flarum/components/Moda
});; });;
'use strict'; 'use strict';
System.register('flarum/components/EditGroupModal', ['flarum/components/Modal', 'flarum/components/Button', 'flarum/components/Badge', 'flarum/models/Group'], function (_export, _context) { System.register('flarum/components/EditGroupModal', ['flarum/components/Modal', 'flarum/components/Button', 'flarum/components/GroupBadge', 'flarum/models/Group'], function (_export, _context) {
var Modal, Button, Badge, Group, EditGroupModal; var Modal, Button, GroupBadge, Group, EditGroupModal;
return { return {
setters: [function (_flarumComponentsModal) { setters: [function (_flarumComponentsModal) {
Modal = _flarumComponentsModal.default; Modal = _flarumComponentsModal.default;
}, function (_flarumComponentsButton) { }, function (_flarumComponentsButton) {
Button = _flarumComponentsButton.default; Button = _flarumComponentsButton.default;
}, function (_flarumComponentsBadge) { }, function (_flarumComponentsGroupBadge) {
Badge = _flarumComponentsBadge.default; GroupBadge = _flarumComponentsGroupBadge.default;
}, function (_flarumModelsGroup) { }, function (_flarumModelsGroup) {
Group = _flarumModelsGroup.default; Group = _flarumModelsGroup.default;
}], }],
@ -18296,9 +18296,10 @@ System.register('flarum/components/EditGroupModal', ['flarum/components/Modal',
}, { }, {
key: 'title', key: 'title',
value: function title() { value: function title() {
return [this.color() || this.icon() ? Badge.component({ return [this.color() || this.icon() ? GroupBadge.component({
icon: this.icon(), group: this.group,
style: { backgroundColor: this.color() } className: 'Group-icon',
label: null
}) : '', ' ', this.namePlural() || app.translator.trans('core.admin.edit_group.title')]; }) : '', ' ', this.namePlural() || app.translator.trans('core.admin.edit_group.title')];
} }
}, { }, {

9
framework/core/js/admin/src/components/EditGroupModal.js
View File

@ -1,6 +1,6 @@
import Modal from 'flarum/components/Modal'; import Modal from 'flarum/components/Modal';
import Button from 'flarum/components/Button'; import Button from 'flarum/components/Button';
import Badge from 'flarum/components/Badge'; import GroupBadge from 'flarum/components/GroupBadge';
import Group from 'flarum/models/Group'; import Group from 'flarum/models/Group';
/** /**
@ -23,9 +23,10 @@ export default class EditGroupModal extends Modal {
title() { title() {
return [ return [
this.color() || this.icon() ? Badge.component({ this.color() || this.icon() ? GroupBadge.component({
icon: this.icon(), group: this.group,
style: {backgroundColor: this.color()} className: 'Group-icon',
label: null
}) : '', }) : '',
' ', ' ',
this.namePlural() || app.translator.trans('core.admin.edit_group.title') this.namePlural() || app.translator.trans('core.admin.edit_group.title')