From e55b437eb98f84c9e52b3fbec1c956134974d86f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 3 Oct 2014 14:42:58 -0400 Subject: [PATCH] Replace the rest of the deprecated `{{action xyz}}` with `{{action "xyz"}}` --- .../javascripts/admin/templates/user_badges.hbs | 4 ++-- .../javascripts/admin/templates/users_list.hbs | 6 +++--- .../components/private-message-map.js.es6 | 8 -------- .../templates/category_notification_dropdown.hbs | 2 +- .../discourse/templates/choose_topic.hbs | 2 +- .../templates/components/avatar-uploader.hbs | 2 +- .../templates/components/category-drop.hbs | 8 ++++---- .../templates/components/discourse-banner.hbs | 2 +- .../templates/components/edit-category-tab.hbs | 2 +- .../templates/components/image-uploader.hbs | 4 ++-- .../discourse/templates/components/ip-lookup.hbs | 4 ++-- .../templates/components/login-buttons.hbs | 2 +- .../templates/components/private-message-map.hbs | 4 ++-- .../components/screened-ip-address-form.hbs | 2 +- .../templates/components/toggle-deleted.hbs | 4 ++-- .../templates/components/toggle-summary.hbs | 4 ++-- .../discourse/templates/components/topic-map.hbs | 4 ++-- .../templates/components/topic-participant.hbs | 2 +- .../discourse/templates/composer/education.hbs | 2 +- .../templates/composer/similar_topics.hbs | 2 +- .../discourse/templates/list/topic_list_item.hbs | 4 ++-- .../mobile/components/basic-topic-list.hbs | 2 +- .../templates/mobile/discovery/categories.hbs | 4 ++-- .../templates/mobile/list/topic_list_item.hbs | 2 +- .../discourse/templates/mobile/modal/login.hbs | 6 +++--- .../templates/modal/archetype_options.hbs | 2 +- .../discourse/templates/modal/auto_close.hbs | 6 +++--- .../templates/modal/bulk_change_category.hbs | 2 +- .../templates/modal/bulk_notification_level.hbs | 2 +- .../discourse/templates/modal/change_owner.hbs | 2 +- .../discourse/templates/modal/create-account.hbs | 5 ++--- .../templates/modal/edit-category-general.hbs | 2 +- .../templates/modal/edit-category-security.hbs | 6 +++--- .../discourse/templates/modal/edit-category.hbs | 4 ++-- .../javascripts/discourse/templates/modal/flag.hbs | 8 ++++---- .../discourse/templates/modal/forgot_password.hbs | 2 +- .../discourse/templates/modal/history.hbs | 14 +++++++------- .../discourse/templates/modal/invite.hbs | 4 ++-- .../discourse/templates/modal/invite_private.hbs | 4 ++-- .../discourse/templates/modal/login.hbs | 6 +++--- .../discourse/templates/modal/merge_topic.hbs | 2 +- .../discourse/templates/modal/modal.hbs | 2 +- .../discourse/templates/modal/not_activated.hbs | 2 +- .../discourse/templates/modal/split_topic.hbs | 2 +- .../discourse/templates/navigation/categories.hbs | 4 ++-- .../discourse/templates/navigation/category.hbs | 4 ++-- .../discourse/templates/navigation/default.hbs | 2 +- .../javascripts/discourse/templates/search.hbs | 2 +- .../javascripts/discourse/templates/share.hbs | 2 +- .../javascripts/discourse/templates/share_link.hbs | 2 +- .../javascripts/discourse/templates/site_map.hbs | 4 ++-- .../javascripts/discourse/templates/static.hbs | 2 +- .../discourse/templates/topic-entrance.hbs | 4 ++-- .../discourse/templates/topic-progress.hbs | 6 +++--- .../discourse/templates/user-expansion.hbs | 6 +++--- .../javascripts/discourse/templates/user/about.hbs | 2 +- .../discourse/templates/user/badge-title.hbs | 2 +- .../javascripts/discourse/templates/user/email.hbs | 2 +- .../discourse/templates/user/invited.hbs | 4 ++-- .../templates/user/preferences/_save_button.hbs | 2 +- .../discourse/templates/user/stream.hbs | 2 +- .../javascripts/discourse/templates/user/user.hbs | 4 ++-- .../discourse/templates/user/username.hbs | 2 +- .../javascripts/discourse/templates/poll.hbs | 6 +++--- 64 files changed, 110 insertions(+), 119 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs index 8ee7f0f99d..5b24155378 100644 --- a/app/assets/javascripts/admin/templates/user_badges.hbs +++ b/app/assets/javascripts/admin/templates/user_badges.hbs @@ -16,7 +16,7 @@ {{else}}
{{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}} - + {{/if}}
@@ -44,7 +44,7 @@ {{age-with-tooltip granted_at}} - + {{else}} diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs index d37213e923..d3cc12b2ad 100644 --- a/app/assets/javascripts/admin/templates/users_list.hbs +++ b/app/assets/javascripts/admin/templates/users_list.hbs @@ -16,15 +16,15 @@ {{text-field value=username placeholderKey="search_hint"}}
- +
{{#if hasSelection}}
- - + +
{{/if}} diff --git a/app/assets/javascripts/discourse/components/private-message-map.js.es6 b/app/assets/javascripts/discourse/components/private-message-map.js.es6 index 22410fe4a8..f8d402ba76 100644 --- a/app/assets/javascripts/discourse/components/private-message-map.js.es6 +++ b/app/assets/javascripts/discourse/components/private-message-map.js.es6 @@ -1,11 +1,3 @@ -/** - The controls at the top of a private message in the map area. - - @class PrivateMessageMapComponent - @extends Ember.Component - @namespace Discourse - @module Discourse -**/ export default Ember.Component.extend({ layoutName: 'components/private-message-map', tagName: 'section', diff --git a/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs b/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs index 22d91f0f72..a8610862d2 100644 --- a/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs +++ b/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs @@ -8,7 +8,7 @@
{{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs index 726b1d3a75..3c03c87774 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs @@ -19,7 +19,7 @@ {{#unless canClearPin}}{{i18n read_more}}{{/unless}} {{/if}} {{#if canClearPin}} - {{i18n topic.clear_pin.title}} + {{i18n topic.clear_pin.title}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs index 3d222889d2..aa5725b767 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs @@ -30,7 +30,7 @@ {{#unless canClearPin}}{{i18n read_more}}{{/unless}} {{/if}} {{#if canClearPin}} - {{i18n topic.clear_pin.title}} + {{i18n topic.clear_pin.title}} {{/if}} {{/if}} @@ -60,7 +60,7 @@
{{number topics_week}}
{{i18n week}}
{{#if controller.canEdit}} - {{i18n category.edit}} + {{i18n category.edit}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs index cd11faed57..670c9f5b14 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs @@ -14,7 +14,7 @@ {{#unless canClearPin}}{{i18n read_more}}{{/unless}} {{/if}} {{#if canClearPin}} - {{i18n topic.clear_pin.title}} + {{i18n topic.clear_pin.title}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs index 1fde21ccc7..806ffd6548 100644 --- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs @@ -23,7 +23,7 @@ - {{i18n forgot_password.action}} + {{i18n forgot_password.action}} @@ -40,12 +40,12 @@ {{#if canLoginLocal}} {{#if showSignupLink}} - {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs index 0c7e5104c9..2d46cf5394 100644 --- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs +++ b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs @@ -4,5 +4,5 @@
- +
diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs index 15ac4ffcdd..e0eaf6b73a 100644 --- a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs +++ b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs @@ -1,10 +1,10 @@ -
+
{{auto-close-form autoCloseTime=auto_close_time autoCloseValid=auto_close_valid}}
- {{i18n cancel}} - + {{i18n cancel}} +
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs index 074dc8ffad..4861aa42b9 100644 --- a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs +++ b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs @@ -5,6 +5,6 @@ {{#if loading}}
{{i18n loading}}
{{else}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs index 2dad1a349e..4e37543dba 100644 --- a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs +++ b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs @@ -7,4 +7,4 @@ {{/each}} - + diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs index 6a4ebc637c..e8cc1c2ee0 100644 --- a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs +++ b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs @@ -12,5 +12,5 @@
- +
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index 8542767350..c22bc997d6 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -71,7 +71,6 @@ - {{log userFields}} {{#if userFields}}
{{#each userFields}} @@ -87,11 +86,11 @@ {{#if showCreateForm}}
- + {{#if formSubmitted}}   {{else}} - {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs index 99b6acf75f..69232f908d 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs @@ -29,7 +29,7 @@ {{/if}} {{#if topic_url}}
- + {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs index 1e09f67618..8291af7492 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs @@ -6,7 +6,7 @@ {{{i18n "category.can"}}} {{permission.description}} {{#if controller.editingPermissions}} - + {{/if}} {{/each}} @@ -14,8 +14,8 @@ {{#if controller.editingPermissions}} {{view Ember.Select content=availableGroups value=selectedGroup}} {{view Ember.Select class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}} - + {{else}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs index 786de606f4..314ee7366d 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs @@ -15,9 +15,9 @@
- + {{#if can_delete}} - + {{else}}
{{{cannot_delete_reason}}} diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs index 41d95f3307..eaf5f16084 100644 --- a/app/assets/javascripts/discourse/templates/modal/flag.hbs +++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs @@ -4,7 +4,7 @@ {{#each flagsAvailable itemController="flag-action-type"}}
- + {{#if canTakeAction}} - + {{/if}} {{#if canDeleteSpammer}} - + {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs index 7c9c2d8415..13c4ae09a1 100644 --- a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs +++ b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs @@ -4,6 +4,6 @@ {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
- +
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs index 8e4c60343d..5ef0ef9836 100644 --- a/app/assets/javascripts/discourse/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/templates/modal/history.hbs @@ -1,18 +1,18 @@
- - + +
{{{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="version" totalBinding="revisions_count"}}}
- - + +
{{#if loading}}
{{i18n loading}}
{{/if}}
- + {{#unless site.mobileView}} - - + + {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs index 34b854fb9e..d2a129f560 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs @@ -21,9 +21,9 @@
{{#if finished}} - + {{else}} - + {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs index 30ea58dcd4..d4635dead9 100644 --- a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs +++ b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs @@ -15,9 +15,9 @@
{{#if finished}} - + {{else}} - + {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs index 920b9c61bd..8ee34887b0 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/modal/login.hbs @@ -21,7 +21,7 @@ {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}   - {{i18n forgot_password.action}} + {{i18n forgot_password.action}} @@ -40,13 +40,13 @@ {{#if canLoginLocal}} {{#if showSignupLink}}   - {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs index a2fc09ed96..b6a7b52699 100644 --- a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs @@ -13,5 +13,5 @@
- +
diff --git a/app/assets/javascripts/discourse/templates/modal/modal.hbs b/app/assets/javascripts/discourse/templates/modal/modal.hbs index 206991dee0..8116605100 100644 --- a/app/assets/javascripts/discourse/templates/modal/modal.hbs +++ b/app/assets/javascripts/discourse/templates/modal/modal.hbs @@ -3,7 +3,7 @@
- +

{{title}}

diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs index 182dc57787..cee8245db0 100644 --- a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs +++ b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs @@ -7,5 +7,5 @@ {{/if}}
- +
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs index 1c53e39579..ce83a0f191 100644 --- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs @@ -18,5 +18,5 @@
- +
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs index 7e0b5f7ee6..7644841f58 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs @@ -8,8 +8,8 @@ {{#if canCreateCategory}} - + {{/if}} {{#if canCreateTopic}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index a4a6ecdbda..a149080878 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -15,11 +15,11 @@ {{/if}} {{#if canCreateTopic}} - + {{/if}} {{#if canEditCategory}} - + {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index 5acd6e0952..88b276198f 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -8,5 +8,5 @@ {{#if canCreateTopic}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs index 175870f2f1..ff8a6bdd4e 100644 --- a/app/assets/javascripts/discourse/templates/search.hbs +++ b/app/assets/javascripts/discourse/templates/search.hbs @@ -19,7 +19,7 @@
{{#if resultType.more}} - {{i18n show_more}} + {{i18n show_more}} {{else}} {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs index 73ad0abf55..d81da9289b 100644 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ b/app/assets/javascripts/discourse/templates/share.hbs @@ -9,5 +9,5 @@ {{each shareLinks itemView='share-link'}}
- +
diff --git a/app/assets/javascripts/discourse/templates/share_link.hbs b/app/assets/javascripts/discourse/templates/share_link.hbs index f7837fc58e..c10ee05981 100644 --- a/app/assets/javascripts/discourse/templates/share_link.hbs +++ b/app/assets/javascripts/discourse/templates/share_link.hbs @@ -1,5 +1,5 @@ {{#if openInPopup}} - + {{else}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/site_map.hbs b/app/assets/javascripts/discourse/templates/site_map.hbs index dd9a9f64dc..2270759076 100644 --- a/app/assets/javascripts/discourse/templates/site_map.hbs +++ b/app/assets/javascripts/discourse/templates/site_map.hbs @@ -22,7 +22,7 @@ {{/if}} {{#if showKeyboardShortcuts}} -
  • {{i18n keyboard_shortcuts_help.title}} +
  • {{i18n keyboard_shortcuts_help.title}} {{/if}}
  • {{i18n faq}} @@ -31,7 +31,7 @@ {{#link-to 'about'}}{{i18n about.simple_title}}{{/link-to}}
    • {{#if showMobileToggle}} -
  • {{boundI18n mobileViewLinkTextKey}}
    • +
  • {{boundI18n mobileViewLinkTextKey}}
    • {{/if}} diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs index a8a4c0db6f..e6aa2f99a7 100644 --- a/app/assets/javascripts/discourse/templates/static.hbs +++ b/app/assets/javascripts/discourse/templates/static.hbs @@ -3,7 +3,7 @@ {{{html}}} {{#if showLoginButton}} - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/topic-entrance.hbs index 41f86c3c29..8613848bb7 100644 --- a/app/assets/javascripts/discourse/templates/topic-entrance.hbs +++ b/app/assets/javascripts/discourse/templates/topic-entrance.hbs @@ -1,6 +1,6 @@ - - diff --git a/app/assets/javascripts/discourse/templates/topic-progress.hbs b/app/assets/javascripts/discourse/templates/topic-progress.hbs index 9bea0ff4a7..a04f5bec48 100644 --- a/app/assets/javascripts/discourse/templates/topic-progress.hbs +++ b/app/assets/javascripts/discourse/templates/topic-progress.hbs @@ -1,13 +1,13 @@ {{#if expanded}}