From da5e7c73836a4f224a9bca20cf1e25bc1ba77a30 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 6 May 2016 16:04:38 -0400 Subject: [PATCH] Deprecations: {{bind-attr}} is deprecated --- .../admin/templates/backups_index.hbs | 2 +- .../admin/templates/badges-show.hbs | 2 +- .../components/admin-report-counts.hbs | 6 ++--- .../templates/components/permalink-form.hbs | 2 +- .../components/setting-validation-message.hbs | 2 +- .../templates/customize-css-html-show.hbs | 2 +- .../admin/templates/customize_colors.hbs | 16 ++++++------- .../javascripts/admin/templates/dashboard.hbs | 4 ++-- .../admin/templates/email_index.hbs | 2 +- .../admin/templates/flags-list.hbs | 2 +- .../javascripts/admin/templates/group.hbs | 5 ++-- .../logs/screened_emails_list_item.hbs | 2 +- .../logs/screened_urls_list_item.hbs | 2 +- .../logs/site_customization_change_modal.hbs | 8 +++---- .../templates/logs/staff_action_logs.hbs | 2 +- .../logs/staff_action_logs_list_item.hbs | 2 +- .../modal/admin_edit_badge_groupings.hbs | 6 ++--- .../templates/modal/admin_suspend_user.hbs | 2 +- .../admin/templates/plugins-index.hbs | 2 +- .../admin/templates/user-index.hbs | 4 ++-- .../admin/templates/user-tl3-requirements.hbs | 24 +++++++++---------- .../admin/templates/users-list-show.hbs | 2 +- .../admin/templates/version-checks.hbs | 6 ++--- .../javascripts/discourse/lib/mobile.js.es6 | 2 +- .../templates/components/avatar-uploader.hbs | 4 ++-- .../templates/components/category-drop.hbs | 6 ++--- .../templates/components/emoji-uploader.hbs | 4 ++-- .../templates/components/flag-action-type.hbs | 4 ++-- .../templates/components/group-selector.hbs | 2 +- .../templates/components/image-uploader.hbs | 4 ++-- .../templates/components/login-buttons.hbs | 2 +- .../templates/components/period-chooser.hbs | 2 +- .../templates/components/share-source.hbs | 2 +- .../templates/components/tag-drop.hbs | 8 +++---- .../discourse/templates/composer.hbs | 2 +- .../templates/discovery/categories.hbs | 4 ++-- .../discourse/templates/exception.hbs | 2 +- .../mobile/components/basic-topic-list.hbs | 2 +- .../templates/mobile/discovery/categories.hbs | 2 +- .../templates/mobile/modal/login.hbs | 4 ++-- .../modal/bulk_notification_level.hbs | 2 +- .../templates/modal/change-owner.hbs | 2 +- .../templates/modal/change-timestamp.hbs | 4 ++-- .../templates/modal/create-account.hbs | 4 ++-- .../discourse/templates/modal/flag.hbs | 8 +++---- .../templates/modal/forgot-password.hbs | 2 +- .../discourse/templates/modal/history.hbs | 4 ++-- .../discourse/templates/modal/login.hbs | 6 ++--- .../templates/preferences/card-badge.hbs | 2 +- .../javascripts/discourse/templates/share.hbs | 2 +- .../discourse/templates/user/badge-title.hbs | 2 +- .../discourse/templates/user/email.hbs | 2 +- .../discourse/templates/user/posts.hbs | 2 +- .../discourse/templates/user/user.hbs | 2 +- .../discourse/templates/user/username.hbs | 2 +- 55 files changed, 105 insertions(+), 104 deletions(-) diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs index d326aede6..c7323ebea 100644 --- a/app/assets/javascripts/admin/templates/backups_index.hbs +++ b/app/assets/javascripts/admin/templates/backups_index.hbs @@ -19,7 +19,7 @@ {{human-size backup.size}}
- {{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}} + {{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}} {{#if status.model.isOperationRunning}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.model.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs index 23dc5f5d3..36208a57a 100644 --- a/app/assets/javascripts/admin/templates/badges-show.hbs +++ b/app/assets/javascripts/admin/templates/badges-show.hbs @@ -134,7 +134,7 @@
- + {{savingStatus}} {{#unless readOnly}} {{i18n 'admin.badges.delete'}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs index d86e5ed5d..d9286ef58 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs @@ -5,7 +5,7 @@ {{report.title}} {{report.todayCount}} -{{report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} -{{report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} -{{report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} +{{report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} +{{report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} +{{report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} {{report.total}} diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs index f5155c27c..987a1bc91 100644 --- a/app/assets/javascripts/admin/templates/components/permalink-form.hbs +++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs @@ -2,4 +2,4 @@ {{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}} {{combo-box content=permalinkTypes value=permalinkType}} {{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}} - + diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs index e60ffd471..92451dbbf 100644 --- a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs +++ b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs @@ -1,4 +1,4 @@ -
+
{{fa-icon "times"}} {{message}}
diff --git a/app/assets/javascripts/admin/templates/customize-css-html-show.hbs b/app/assets/javascripts/admin/templates/customize-css-html-show.hbs index 95b82ba97..387cf32d7 100644 --- a/app/assets/javascripts/admin/templates/customize-css-html-show.hbs +++ b/app/assets/javascripts/admin/templates/customize-css-html-show.hbs @@ -28,7 +28,7 @@
  • {{#link-to 'adminCustomizeCssHtml.show' model.id 'embedded-css' replace=true}}{{i18n "admin.customize.embedded_css"}}{{/link-to}}
  • {{/if}}
  • - {{fa-icon "mobile"}} + {{fa-icon "mobile"}}
  • diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize_colors.hbs index dcb7355a5..62b489075 100644 --- a/app/assets/javascripts/admin/templates/customize_colors.hbs +++ b/app/assets/javascripts/admin/templates/customize_colors.hbs @@ -3,7 +3,7 @@ @@ -16,8 +16,8 @@

    {{text-field class="style-name" value=selectedItem.name}}

    - - + - {{selectedItem.savingStatus}} + {{selectedItem.savingStatus}}

    @@ -51,16 +51,16 @@ {{#each colors as |c|}} - - + + {{c.translatedName}}
    {{c.description}} {{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}} - - + + {{/each}} diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs index 58c1ab21d..47a731d98 100644 --- a/app/assets/javascripts/admin/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/templates/dashboard.hbs @@ -192,9 +192,9 @@
    {{fa-icon "exclamation-triangle"}}
    -

    +

    {{i18n 'admin.dashboard.problems_found'}} -

      +
        {{#each problems as |problem|}}
      • {{{problem}}}
      • {{/each}} diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email_index.hbs index cd3696739..7fc5ce5d8 100644 --- a/app/assets/javascripts/admin/templates/email_index.hbs +++ b/app/assets/javascripts/admin/templates/email_index.hbs @@ -20,7 +20,7 @@ {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
    - + {{#if sentTestEmail}}{{i18n 'admin.email.sent_test'}}{{/if}}
    {{/if}} diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs index dbbec2a23..5503f4254 100644 --- a/app/assets/javascripts/admin/templates/flags-list.hbs +++ b/app/assets/javascripts/admin/templates/flags-list.hbs @@ -10,7 +10,7 @@ {{#each flaggedPost in content}} - + {{#if flaggedPost.postAuthorFlagged}} diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs index 585df0bca..49db722d6 100644 --- a/app/assets/javascripts/admin/templates/group.hbs +++ b/app/assets/javascripts/admin/templates/group.hbs @@ -102,11 +102,12 @@ {{/unless}}
    - + {{#unless model.automatic}} {{/unless}} - {{savingStatus}} + + {{savingStatus}}
    diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs index 7522d0af6..27cbf4198 100644 --- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs @@ -1,5 +1,5 @@
    {{actionName}}
    {{match_count}}
    diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs index 51589bf2c..234f24812 100644 --- a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.hbs @@ -1,5 +1,5 @@
    -
    {{domain}}
    +
    {{domain}}
    {{actionName}}
    {{match_count}}
    diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs index 556f6310d..8d36dd964 100644 --- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs +++ b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs @@ -1,14 +1,14 @@
  • {{/each}} @@ -22,6 +22,6 @@
    diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs index 7a82cc071..1ba54ce67 100644 --- a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs +++ b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs @@ -10,6 +10,6 @@
    diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index d65c703f9..f90ea2d1c 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -25,7 +25,7 @@ {{#if plugin.url}} - {{plugin.name}} + {{plugin.name}} {{else}} {{plugin.name}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index 6499840ac..ef3ce6ebc 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -288,7 +288,7 @@ -
    +
    {{i18n 'admin.user.suspended'}}
    {{model.isSuspended}}
    @@ -325,7 +325,7 @@
    {{/if}} -
    +
    {{i18n 'admin.user.blocked'}}
    {{model.blocked}}
    diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs index d3e8e4edb..a9b1cfdc8 100644 --- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs +++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs @@ -24,7 +24,7 @@ {{i18n 'admin.user.tl3_requirements.visits'}} - + {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n 'admin.user.tl3_requirements.days'}}) @@ -32,67 +32,67 @@ {{i18n 'admin.user.tl3_requirements.topics_replied_to'}} - + {{model.tl3Requirements.num_topics_replied_to}} {{model.tl3Requirements.min_topics_replied_to}} {{i18n 'admin.user.tl3_requirements.topics_viewed'}} - + {{model.tl3Requirements.topics_viewed}} {{model.tl3Requirements.min_topics_viewed}} {{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}} - + {{model.tl3Requirements.topics_viewed_all_time}} {{model.tl3Requirements.min_topics_viewed_all_time}} {{i18n 'admin.user.tl3_requirements.posts_read'}} - + {{model.tl3Requirements.posts_read}} {{model.tl3Requirements.min_posts_read}} {{i18n 'admin.user.tl3_requirements.posts_read_all_time'}} - + {{model.tl3Requirements.posts_read_all_time}} {{model.tl3Requirements.min_posts_read_all_time}} {{i18n 'admin.user.tl3_requirements.flagged_posts'}} - + {{model.tl3Requirements.num_flagged_posts}} {{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_posts}} {{i18n 'admin.user.tl3_requirements.flagged_by_users'}} - + {{model.tl3Requirements.num_flagged_by_users}} {{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_by_users}} {{i18n 'admin.user.tl3_requirements.likes_given'}} - + {{model.tl3Requirements.num_likes_given}} {{model.tl3Requirements.min_likes_given}} {{i18n 'admin.user.tl3_requirements.likes_received'}} - + {{model.tl3Requirements.num_likes_received}} {{model.tl3Requirements.min_likes_received}} {{i18n 'admin.user.tl3_requirements.likes_received_days'}} - + {{model.tl3Requirements.num_likes_received_days}} {{model.tl3Requirements.min_likes_received_days}} {{i18n 'admin.user.tl3_requirements.likes_received_users'}} - + {{model.tl3Requirements.num_likes_received_users}} {{model.tl3Requirements.min_likes_received_users}} diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index 00e3fc1d4..cc23c3fb2 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -42,7 +42,7 @@ {{#each model as |user|}} - + {{#if controller.showApproval}} {{#if user.can_approve}} diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs index fdc5c7994..26617f3cc 100644 --- a/app/assets/javascripts/admin/templates/version-checks.hbs +++ b/app/assets/javascripts/admin/templates/version-checks.hbs @@ -1,4 +1,4 @@ -
    +
    {{custom-html 'upgrade-header'}} @@ -11,7 +11,7 @@ {{#unless loading}} - + {{#if versionCheck.noCheckPerformed}} @@ -46,7 +46,7 @@ {{#if versionCheck.upToDate }} {{fa-icon "smile-o"}} {{else}} - + {{#if versionCheck.behindByOneVersion}} {{fa-icon "meh-o"}} {{else}} diff --git a/app/assets/javascripts/discourse/lib/mobile.js.es6 b/app/assets/javascripts/discourse/lib/mobile.js.es6 index 9fef722aa..ef2d07bbf 100644 --- a/app/assets/javascripts/discourse/lib/mobile.js.es6 +++ b/app/assets/javascripts/discourse/lib/mobile.js.es6 @@ -10,7 +10,7 @@ const Mobile = { this.isMobileDevice = mobileForced || $html.hasClass('mobile-device'); this.mobileView = mobileForced || $html.hasClass('mobile-view'); - if (mobileForced) { return; } + if (Ember.testing || mobileForced) { return; } try{ if (window.location.search.match(/mobile_view=1/)){ diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs index f75af0995..89c46363e 100644 --- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs +++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs @@ -1,6 +1,6 @@ - {{#each model.categories as |c|}} - + -
    {{i18n 'admin.dashboard.version'}}{{dash-if-empty versionCheck.installed_describe}}{{dash-if-empty versionCheck.installed_describe}}
    {{category-title-link category=c}} @@ -38,7 +38,7 @@ {{featured-topic topic=f latestTopicOnly=latestTopicOnly action="showTopicEntrance"}} {{/each}}
    + {{#each c.topicCountStats as |s|}} diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs index f8e486bb6..34f2234dc 100644 --- a/app/assets/javascripts/discourse/templates/exception.hbs +++ b/app/assets/javascripts/discourse/templates/exception.hbs @@ -3,7 +3,7 @@
    :(
    {{reason}}
    - {{i18n 'errors.prev_page'}} {{requestUrl}} + {{i18n 'errors.prev_page'}} {{requestUrl}}
    {{#if networkFixed}} 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 1eb96dc3e..be2b59358 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 @@ -3,7 +3,7 @@
    {{#each topics as |t|}} - + + {{/if}} @@ -94,7 +94,7 @@ {{#if showCreateForm}} diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs index 2d5e39f8c..9371c61dd 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 8a5303fd0..47b3f36a2 100644 --- a/app/assets/javascripts/discourse/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/templates/modal/history.hbs @@ -3,7 +3,7 @@
    {{d-button action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}} {{d-button action="loadPreviousVersion" icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}} -
    +
    {{#conditional-loading-spinner condition=loading size="small"}} {{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="model.current_version" totalBinding="model.version_count"}} {{/conditional-loading-spinner}} @@ -44,7 +44,7 @@ {{/if}} {{/unless}}
    -
    +
    {{#if model.title_changes}}

    {{{titleDiff}}}

    diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs index 4e528dc91..f275f9900 100644 --- a/app/assets/javascripts/discourse/templates/modal/login.hbs +++ b/app/assets/javascripts/discourse/templates/modal/login.hbs @@ -26,7 +26,7 @@
    - +
    {{i18n 'login.caps_lock_warning'}}
    {{i18n 'login.caps_lock_warning'}}
    @@ -34,12 +34,12 @@ {{/if}} {{authMessage}} -
    {{alert}}
    +
    {{alert}}