From 9886934ef5ce192e96c43b4bbae6c602336d31fd Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 22 Jan 2019 14:42:00 -0500 Subject: [PATCH] DEV: fix some deprecated SVG icon refs --- .../components/user-flag-percentage.js.es6 | 2 +- .../admin/helpers/disposition-icon.js.es6 | 2 +- .../templates/components/flagged-post.hbs | 2 +- .../templates/components/themes-list-item.hbs | 2 +- .../admin/templates/customize-themes-index.hbs | 2 +- .../admin/templates/users-list-show.hbs | 2 +- .../admin/templates/version-checks.hbs | 18 +++++++++--------- .../components/composer-action-title.js.es6 | 2 +- .../components/composer-editor.js.es6 | 2 +- .../discourse/components/d-editor.js.es6 | 2 +- .../discourse/initializers/enable-emoji.js.es6 | 2 +- .../discourse/lib/plugin-api.js.es6 | 12 ++++++++++-- .../javascripts/discourse/templates/about.hbs | 2 +- .../components/desktop-notification-config.hbs | 4 ++-- .../components/edit-category-settings.hbs | 2 +- .../components/user-card-contents.hbs | 4 ++-- .../discourse/templates/composer.hbs | 2 +- .../templates/preferences/account.hbs | 4 ++-- .../javascripts/discourse/templates/user.hbs | 4 ++-- .../javascripts/discourse/widgets/post.js.es6 | 4 ++-- .../admin-delete-flag-dropdown.js.es6 | 2 +- .../components/composer-actions.js.es6 | 8 ++++---- .../acceptance/group-card-mobile-test.js.es6 | 2 +- .../components/themes-list-item-test.js.es6 | 6 +----- .../components/d-editor-test.js.es6 | 2 +- test/javascripts/widgets/button-test.js.es6 | 4 ++-- 26 files changed, 52 insertions(+), 48 deletions(-) diff --git a/app/assets/javascripts/admin/components/user-flag-percentage.js.es6 b/app/assets/javascripts/admin/components/user-flag-percentage.js.es6 index 22713a1aa6a..cd6814ce799 100644 --- a/app/assets/javascripts/admin/components/user-flag-percentage.js.es6 +++ b/app/assets/javascripts/admin/components/user-flag-percentage.js.es6 @@ -30,7 +30,7 @@ export default Ember.Component.extend({ result.className = "disagreed"; result.label = `${result.disagreed}%`; } else { - result.icon = "external-link"; + result.icon = "external-link-alt"; result.className = "ignored"; result.label = `${result.ignored}%`; } diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 index 283814967a8..2a2440a2949 100644 --- a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 +++ b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 @@ -9,7 +9,7 @@ export default Ember.Helper.extend({ let title = "admin.flags.dispositions." + disposition; switch (disposition) { case "deferred": { - icon = "external-link"; + icon = "external-link-alt"; break; } case "agreed": { diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs index 6d96983b2d6..b9cab70960f 100644 --- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs +++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs @@ -94,7 +94,7 @@ class="btn-default defer-flag" title="admin.flags.ignore_flag_title" action=(action "defer") - icon="external-link" + icon="external-link-alt" label="admin.flags.ignore_flag"}} {{admin-delete-flag-dropdown diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs index 42e6674fac1..663488607fe 100644 --- a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs +++ b/app/assets/javascripts/admin/templates/components/themes-list-item.hbs @@ -12,7 +12,7 @@ {{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}} {{/if}} {{#if theme.isPendingUpdates}} - {{d-icon "refresh" title="admin.customize.theme.updates_available_tooltip" class="light-grey-icon"}} + {{d-icon "sync" title="admin.customize.theme.updates_available_tooltip" class="light-grey-icon"}} {{/if}} {{#if theme.isBroken}} {{d-icon "exclamation-circle" class="broken-indicator" title="admin.customize.theme.broken_theme_tooltip"}} diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs index 565d0024dbb..39bdfc7c85c 100644 --- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs @@ -4,7 +4,7 @@

{{I18n "admin.customize.theme.themes_intro"}}

{{#each externalResources as |resource|}} - + {{d-icon resource.icon}} {{I18n resource.key}} diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index 6aab3866b91..4e353674029 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -52,7 +52,7 @@ {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}} {{#if user.staged}} - {{d-icon "envelope-o" title="user.staged" }} + {{d-icon "far-envelope" title="user.staged" }} {{/if}} diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs index abd5f4befdd..111d8634122 100644 --- a/app/assets/javascripts/admin/templates/version-checks.hbs +++ b/app/assets/javascripts/admin/templates/version-checks.hbs @@ -9,13 +9,13 @@
{{#if versionCheck.noCheckPerformed}} -
-

{{i18n 'admin.dashboard.latest_version'}}

+
+

{{i18n 'admin.dashboard.latest_version'}}

—

- {{d-icon "frown-o"}} + {{d-icon "far-frown"}}
{{i18n 'admin.dashboard.no_check_performed'}} @@ -24,15 +24,15 @@ {{else}} {{#if versionCheck.stale_data}}
-

{{i18n 'admin.dashboard.latest_version'}}

+

{{i18n 'admin.dashboard.latest_version'}}

{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}

{{#if versionCheck.version_check_pending}} - {{d-icon "smile-o"}} + {{d-icon "far-smile"}} {{else}} - {{d-icon "frown-o"}} + {{d-icon "far-frown"}} {{/if}}
@@ -47,19 +47,19 @@
{{else}}
-

{{i18n 'admin.dashboard.latest_version'}}

+

{{i18n 'admin.dashboard.latest_version'}}

{{dash-if-empty versionCheck.latest_version}}

{{#if versionCheck.upToDate }} - {{d-icon "smile-o"}} + {{d-icon "far-smile"}} {{else}} {{#if versionCheck.behindByOneVersion}} {{d-icon "meh-o"}} {{else}} - {{d-icon "frown-o"}} + {{d-icon "far-frown"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 index 25fc7f4ddbc..bf7c9bcc414 100644 --- a/app/assets/javascripts/discourse/components/composer-action-title.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-action-title.js.es6 @@ -56,7 +56,7 @@ export default Ember.Component.extend({ if (originalUser) { editTitle += ` - ${iconHTML("mail-forward", { class: "reply-to-glyph" })} + ${iconHTML("share", { class: "reply-to-glyph" })} ${originalUser.avatar} ${originalUser.username} `; diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index fe0a627a1b6..c84ebc91908 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -816,7 +816,7 @@ export default Ember.Component.extend({ toolbar.addButton({ id: "quote", group: "fontStyles", - icon: "comment-o", + icon: "far-comment", sendAction: this.get("importQuote"), title: "composer.quote_post_title", unshift: true diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 4c265a8a368..04db1ef745b 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -134,7 +134,7 @@ class Toolbar { this.addButton({ id: "toggle-direction", group: "extras", - icon: "exchange", + icon: "exchange-alt", shortcut: "Shift+6", title: "composer.toggle_direction", perform: e => e.toggleDirection() diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 index d7df51ce65e..71bf416025b 100644 --- a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 +++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 @@ -16,7 +16,7 @@ export default { toolbar.addButton({ id: "emoji", group: "extras", - icon: "smile-o", + icon: "far-smile", action: () => toolbar.context.send("emoji"), title: "composer.emoji" }); diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index f237987af84..34a607d93ee 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -133,12 +133,20 @@ class PluginApi { * * // for the place in code that render a string * string() { - * return ""; + * return ""; * }, * * // for the places in code that render virtual dom elements * node() { - * return h('i', { className: 'fa fa-smile-o' }); + * return h("svg", { + * attributes: { class: "fa d-icon d-icon-far-smile", "aria-hidden": true }, + * namespace: "http://www.w3.org/2000/svg" + * },[ + * h("use", { + * "xlink:href": attributeHook("http://www.w3.org/1999/xlink", `#far-smile`), + * namespace: "http://www.w3.org/2000/svg" + * })] + * ); * } * }); **/ diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs index 21f58db314c..fb732e1700b 100644 --- a/app/assets/javascripts/discourse/templates/about.hbs +++ b/app/assets/javascripts/discourse/templates/about.hbs @@ -97,7 +97,7 @@ {{#if contactInfo}}
-

{{d-icon "envelope-o"}} {{i18n 'about.contact'}}

+

{{d-icon "far-envelope"}} {{i18n 'about.contact'}}

{{{contactInfo}}}

{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs index a0d595707f0..b5dce6e3603 100644 --- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs +++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs @@ -6,10 +6,10 @@ {{i18n "user.desktop_notifications.perm_denied_expl"}} {{else}} {{#if isEnabled}} - {{d-button icon="bell-slash-o" class="btn-default" label="user.desktop_notifications.disable" action=(action "turnoff")}} + {{d-button icon="far-bell-slash" class="btn-default" label="user.desktop_notifications.disable" action=(action "turnoff")}} {{i18n "user.desktop_notifications.currently_enabled"}} {{else}} - {{d-button icon="bell-o" class="btn-default" label="user.desktop_notifications.enable" action=(action "turnon")}} + {{d-button icon="far-bell" class="btn-default" label="user.desktop_notifications.enable" action=(action "turnon")}} {{i18n "user.desktop_notifications.currently_disabled"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs index a45f57ee828..b68c0603dc6 100644 --- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs +++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs @@ -147,7 +147,7 @@
{{text-field id="category-email-in" class="email-in" value=category.email_in}} diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs index 0ee844d9d4a..33da28314ed 100644 --- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs @@ -133,11 +133,11 @@ {{#if showCheckEmail}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 8f1cc2150ab..c59c4b5760a 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -195,7 +195,7 @@
{{#if model.topic}} - {{d-icon "mail-forward"}} {{{draftTitle}}} + {{d-icon "share"}} {{{draftTitle}}} {{else}} {{i18n "composer.saved_draft"}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs index e94154ab9e9..800ad4d47f6 100644 --- a/app/assets/javascripts/discourse/templates/preferences/account.hbs +++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs @@ -45,7 +45,7 @@
{{else}}
- {{d-button action=(route-action "checkEmail") class="btn-default" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}} + {{d-button action=(route-action "checkEmail") class="btn-default" actionParam=model title="admin.users.check_email.title" icon="far-envelope" label="admin.users.check_email.text"}}
{{/if}}
@@ -132,7 +132,7 @@ {{else}}
- {{d-button action=(route-action "checkEmail") actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}} + {{d-button action=(route-action "checkEmail") actionParam=model title="admin.users.check_email.title" icon="far-envelope" label="admin.users.check_email.text"}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index 34287cacfc1..f7f8efb9947 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -165,7 +165,7 @@ {{#if model.email}} {{model.email}} {{else}} - {{d-button action=(route-action "checkEmail") actionParam=model icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}} + {{d-button action=(route-action "checkEmail") actionParam=model icon="far-envelope" label="admin.users.check_email.text" class="btn-primary"}} {{/if}}
@@ -207,7 +207,7 @@ {{/if}} {{#if showPrivateMessages}} -
  • {{#link-to 'userPrivateMessages'}}{{d-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}
    • +
  • {{#link-to 'userPrivateMessages'}}{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}{{/link-to}}
    • {{/if}} {{#if canInviteToForum}}
  • {{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}
    • diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 671b7b9105a..abc5d7a300c 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -115,7 +115,7 @@ createWidget("reply-to-tab", { } return [ - iconNode("mail-forward"), + iconNode("share"), " ", avatarImg("small", { template: attrs.replyToAvatarTemplate, @@ -202,7 +202,7 @@ createWidget("post-email-indicator", { html(attrs) { return attrs.isAutoGenerated ? iconNode("envelope") - : iconNode("envelope-o"); + : iconNode("far-envelope"); }, click() { diff --git a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 index 422385ebd18..416df62d782 100644 --- a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 +++ b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 @@ -29,7 +29,7 @@ export default DropdownSelectBox.extend({ const canDeleteSpammer = this.get("canDeleteSpammer"); content.push({ - icon: "external-link", + icon: "external-link-alt", id: "delete-defer", action: () => this.send("deletePostDeferFlag"), label: I18n.t("admin.flags.delete_post_defer_flag"), diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index be9902dc4ab..0fe64b0cc77 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -59,7 +59,7 @@ export default DropdownSelectBoxComponent.extend({ case PRIVATE_MESSAGE: case CREATE_TOPIC: case REPLY: - content.icon = "mail-forward"; + content.icon = "share"; content.title = I18n.t("composer.composer_actions.reply"); break; case EDIT: @@ -106,7 +106,7 @@ export default DropdownSelectBoxComponent.extend({ postUsername: _postSnapshot.get("username") }), description: I18n.t("composer.composer_actions.reply_to_post.desc"), - icon: "mail-forward", + icon: "share", id: "reply_to_post" }); } @@ -136,7 +136,7 @@ export default DropdownSelectBoxComponent.extend({ items.push({ name: I18n.t("composer.composer_actions.reply_to_topic.label"), description: I18n.t("composer.composer_actions.reply_to_topic.desc"), - icon: "mail-forward", + icon: "share", id: "reply_to_topic" }); } @@ -186,7 +186,7 @@ export default DropdownSelectBoxComponent.extend({ description: I18n.t( "composer.composer_actions.reply_as_new_topic.desc" ), - icon: "mail-forward", + icon: "share", id: "create_topic" }); } diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js.es6 index f4734e86211..9b353c8a085 100644 --- a/test/javascripts/acceptance/group-card-mobile-test.js.es6 +++ b/test/javascripts/acceptance/group-card-mobile-test.js.es6 @@ -7,5 +7,5 @@ QUnit.test("group card", async assert => { assert.ok(invisible("#group-card"), "user card is invisible by default"); await click("a.mention-group:first"); - assert.ok(visible(".group-details-container"), "group page show be shown"); + assert.ok(visible(".group-details-container"), "group page should be shown"); }); diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js.es6 index 6edbcc6cd56..82190fb0e70 100644 --- a/test/javascripts/admin/components/themes-list-item-test.js.es6 +++ b/test/javascripts/admin/components/themes-list-item-test.js.es6 @@ -26,11 +26,7 @@ componentTest("pending updates", { test(assert) { assert.expect(1); - assert.equal( - this.$(".d-icon-refresh").length, - 1, - "shows pending update icon" - ); + assert.equal(this.$(".d-icon-sync").length, 1, "shows pending update icon"); } }); diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6 index 4b806bee267..cefbb859e39 100644 --- a/test/javascripts/components/d-editor-test.js.es6 +++ b/test/javascripts/components/d-editor-test.js.es6 @@ -685,7 +685,7 @@ componentTest("emoji", { toolbar.addButton({ id: "emoji", group: "extras", - icon: "smile-o", + icon: "far-smile", action: () => toolbar.context.send("emoji") }); }); diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js.es6 index 6286e3947b6..bd4e57dd0cc 100644 --- a/test/javascripts/widgets/button-test.js.es6 +++ b/test/javascripts/widgets/button-test.js.es6 @@ -6,7 +6,7 @@ widgetTest("icon only button", { template: '{{mount-widget widget="button" args=args}}', beforeEach() { - this.set("args", { icon: "smile-o" }); + this.set("args", { icon: "far-smile" }); }, test(assert) { @@ -15,7 +15,7 @@ widgetTest("icon only button", { "it has all the classes" ); assert.ok( - this.$("button .d-icon.d-icon-smile-o").length, + this.$("button .d-icon.d-icon-far-smile").length, "it has the icon" ); }