From f6e2a7a7e567e2c859f90d5b5ab2bc83ff32be8c Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Tue, 29 Mar 2016 22:39:26 +0900
Subject: [PATCH] Use GroupBadge component since we already have that

---
 framework/core/js/admin/dist/app.js               | 15 ++++++++-------
 .../js/admin/src/components/EditGroupModal.js     |  9 +++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js
index 52315a9ff..82e4a2e9c 100644
--- a/framework/core/js/admin/dist/app.js
+++ b/framework/core/js/admin/dist/app.js
@@ -18257,15 +18257,15 @@ System.register('flarum/components/EditCustomCssModal', ['flarum/components/Moda
 });;
 'use strict';
 
-System.register('flarum/components/EditGroupModal', ['flarum/components/Modal', 'flarum/components/Button', 'flarum/components/Badge', 'flarum/models/Group'], function (_export, _context) {
-  var Modal, Button, Badge, Group, EditGroupModal;
+System.register('flarum/components/EditGroupModal', ['flarum/components/Modal', 'flarum/components/Button', 'flarum/components/GroupBadge', 'flarum/models/Group'], function (_export, _context) {
+  var Modal, Button, GroupBadge, Group, EditGroupModal;
   return {
     setters: [function (_flarumComponentsModal) {
       Modal = _flarumComponentsModal.default;
     }, function (_flarumComponentsButton) {
       Button = _flarumComponentsButton.default;
-    }, function (_flarumComponentsBadge) {
-      Badge = _flarumComponentsBadge.default;
+    }, function (_flarumComponentsGroupBadge) {
+      GroupBadge = _flarumComponentsGroupBadge.default;
     }, function (_flarumModelsGroup) {
       Group = _flarumModelsGroup.default;
     }],
@@ -18296,9 +18296,10 @@ System.register('flarum/components/EditGroupModal', ['flarum/components/Modal',
         }, {
           key: 'title',
           value: function title() {
-            return [this.color() || this.icon() ? Badge.component({
-              icon: this.icon(),
-              style: { backgroundColor: this.color() }
+            return [this.color() || this.icon() ? GroupBadge.component({
+              group: this.group,
+              className: 'Group-icon',
+              label: null
             }) : '', ' ', this.namePlural() || app.translator.trans('core.admin.edit_group.title')];
           }
         }, {
diff --git a/framework/core/js/admin/src/components/EditGroupModal.js b/framework/core/js/admin/src/components/EditGroupModal.js
index cea3bfd92..33f15daac 100644
--- a/framework/core/js/admin/src/components/EditGroupModal.js
+++ b/framework/core/js/admin/src/components/EditGroupModal.js
@@ -1,6 +1,6 @@
 import Modal from 'flarum/components/Modal';
 import Button from 'flarum/components/Button';
-import Badge from 'flarum/components/Badge';
+import GroupBadge from 'flarum/components/GroupBadge';
 import Group from 'flarum/models/Group';
 
 /**
@@ -23,9 +23,10 @@ export default class EditGroupModal extends Modal {
 
   title() {
     return [
-      this.color() || this.icon() ? Badge.component({
-        icon: this.icon(),
-        style: {backgroundColor: this.color()}
+      this.color() || this.icon() ? GroupBadge.component({
+        group: this.group,
+        className: 'Group-icon',
+        label: null
       }) : '',
       ' ',
       this.namePlural() || app.translator.trans('core.admin.edit_group.title')