github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-01 14:20:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "Use GroupBadge component since we already have that"

Browse Source 
This reverts commit eb76767e70.
This commit is contained in:
Franz Liedke 2016-03-29 22:46:23 +09:00
parent eb76767e70
commit 25d18d79fb
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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