From af78b914df51646ed64ece6d26d00b2761833dfd Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Tue, 11 Jun 2024 09:35:49 +0100 Subject: [PATCH] Merge pull request #18729 from overleaf/ae-ng-non-bindable Remove unused Angular attributes from Pug templates GitOrigin-RevId: ab3ed4105ea02994924c6dd190dad65fff106c11 --- .../views/_mixins/faq_search-marketing.pug | 2 +- services/web/app/views/_mixins/links.pug | 24 +++++++++---------- services/web/app/views/admin/index.pug | 6 ++--- services/web/app/views/general/closed.pug | 2 +- .../web/app/views/layout/footer-marketing.pug | 2 +- .../web/app/views/project/invite/show.pug | 6 ++--- .../web/app/views/subscriptions/plans.pug | 4 ++-- services/web/app/views/user/reconfirm.pug | 2 +- services/web/app/views/user/register.pug | 8 +++---- .../web/app/views/user_membership/new.pug | 3 +-- .../modules/launchpad/app/views/launchpad.pug | 2 +- 11 files changed, 30 insertions(+), 31 deletions(-) diff --git a/services/web/app/views/_mixins/faq_search-marketing.pug b/services/web/app/views/_mixins/faq_search-marketing.pug index afe607efe4..8ec136e08e 100644 --- a/services/web/app/views/_mixins/faq_search-marketing.pug +++ b/services/web/app/views/_mixins/faq_search-marketing.pug @@ -1,7 +1,7 @@ mixin faq_search-marketing(headerText, headerClass) if (typeof(settings.algolia) != "undefined" && typeof(settings.algolia.indexes) != "undefined" && typeof(settings.algolia.indexes.wiki) != "undefined") if headerText - div(class=headerClass, ng-non-bindable) #{headerText} + div(class=headerClass) #{headerText} .wiki form.project-search.form-horizontal(role="search" data-ol-faq-search) .form-group.has-feedback.has-feedback-left diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug index 24ba1d0288..740bda5d7a 100644 --- a/services/web/app/views/_mixins/links.pug +++ b/services/web/app/views/_mixins/links.pug @@ -15,27 +15,27 @@ mixin linkAdvisors(linkText, linkClass, track) event-tracking-mb=mb event-segmentation=mbSegmentation ) - span(ng-non-bindable) #{linkText ? linkText : 'advisor programme'} + span #{linkText ? linkText : 'advisor programme'} mixin linkBenefits(linkText, linkClass) - a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/authors" class=linkClass ? linkClass : '', ng-non-bindable) + a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/authors" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'benefits'} mixin linkBlog(linkText, linkClass, slug) if slug - a(href=(settings.siteUrl ? settings.siteUrl : '') + "/blog/" + slug class=linkClass ? linkClass : '', ng-non-bindable) + a(href=(settings.siteUrl ? settings.siteUrl : '') + "/blog/" + slug class=linkClass ? linkClass : '') | #{linkText ? linkText : 'blog'} mixin linkContact(linkText, linkClass) - a(href=(settings.siteUrl ? settings.siteUrl : '') + "/contact" class=linkClass ? linkClass : '', ng-non-bindable) + a(href=(settings.siteUrl ? settings.siteUrl : '') + "/contact" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'contact'} mixin linkDash(linkText, linkClass) - a(href="/project" class=linkClass ? linkClass : '', ng-non-bindable) + a(href="/project" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'project dashboard'} mixin linkEducation(linkText, linkClass) - a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/edu" class=linkClass ? linkClass : '', ng-non-bindable) + a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/edu" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'teaching toolkit'} mixin linkInvite(linkText, linkClass, track) @@ -55,10 +55,10 @@ mixin linkInvite(linkText, linkClass, track) event-tracking-mb=mb event-segmentation=mbSegmentation ) - span(ng-non-bindable) #{linkText ? linkText : 'invite your friends'} + span #{linkText ? linkText : 'invite your friends'} mixin linkPlansAndPricing(linkText, linkClass) - a(href="/user/subscription/plans" class=linkClass ? linkClass : '', ng-non-bindable) + a(href="/user/subscription/plans" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'plans and pricing'} mixin linkPrintNewTab(linkText, linkClass, icon, track) @@ -83,14 +83,14 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track) if icon i(class="fa fa-print") |   - span(ng-non-bindable) #{linkText ? linkText : 'print'} + span #{linkText ? linkText : 'print'} mixin linkSignIn(linkText, linkClass, redirect) - a(href=`/login${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '', ng-non-bindable) + a(href=`/login${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '') | #{linkText ? linkText : 'sign in'} mixin linkSignUp(linkText, linkClass, redirect) - a(href=`/register${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '', ng-non-bindable) + a(href=`/register${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '') | #{linkText ? linkText : 'sign up'} mixin linkTweet(linkText, linkClass, tweetText, track) @@ -114,5 +114,5 @@ mixin linkTweet(linkText, linkClass, tweetText, track) ) #{linkText ? linkText : 'tweet'} mixin linkUniversities(linkText, linkClass) - a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/universities" class=linkClass ? linkClass : '', ng-non-bindable) + a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/universities" class=linkClass ? linkClass : '') | #{linkText ? linkText : 'universities'} diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index 9897c912c4..ad31c80667 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -23,7 +23,7 @@ block content id='system-messages' ) each message in systemMessages - .alert.alert-info.row-spaced(ng-non-bindable) #{message.content} + .alert.alert-info.row-spaced #{message.content} hr form(method='post', action='/admin/messages') input(name="_csrf", type="hidden", value=csrfToken) @@ -43,10 +43,10 @@ block content .row-spaced ul each agents, url in openSockets - li(ng-non-bindable) #{url} - total : #{agents.length} + li #{url} - total : #{agents.length} ul each agent in agents - li(ng-non-bindable) #{agent} + li #{agent} .tab-pane( role="tabpanel" diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug index 39bc32cdd7..91654c3f77 100644 --- a/services/web/app/views/general/closed.pug +++ b/services/web/app/views/general/closed.pug @@ -7,7 +7,7 @@ block content .col-md-8.col-md-offset-2.text-center .page-header h1 Maintenance - p(ng-non-bindable) + p if settings.statusPageUrl | #{settings.appName} is currently down for maintenance. | Please check our #[a(href='https://' + settings.statusPageUrl) status page] diff --git a/services/web/app/views/layout/footer-marketing.pug b/services/web/app/views/layout/footer-marketing.pug index 8fffe0cb1b..bc9ff70764 100644 --- a/services/web/app/views/layout/footer-marketing.pug +++ b/services/web/app/views/layout/footer-marketing.pug @@ -33,7 +33,7 @@ footer.site-footer ul.col-md-3.text-right each item in nav.right_footer - li(ng-non-bindable) + li if item.url a(href=item.url, class=item.class, aria-label=item.label) !{item.text} else diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index e691886f80..49945f59c7 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -7,14 +7,14 @@ block content .col-md-8.col-md-offset-2 .card.project-invite-accept .page-header.text-centered - h1(ng-non-bindable) #{translate("user_wants_you_to_see_project", {username:owner.first_name, projectname:""})} + h1 #{translate("user_wants_you_to_see_project", {username:owner.first_name, projectname:""})} br - em(ng-non-bindable) #{project.name} + em #{project.name} .row.text-center .col-md-12 p | #{translate("accepting_invite_as")}  - em(ng-non-bindable) #{user.email} + em #{user.email} .row .col-md-12 form.form( diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug index 9ba135a0f3..d34e94eacc 100644 --- a/services/web/app/views/subscriptions/plans.pug +++ b/services/web/app/views/subscriptions/plans.pug @@ -14,7 +14,7 @@ block content main.content.content-alt#main-content .content-page .plans - .container(ng-cloak) + .container if showInrGeoBanner div.notification.notification-type-success.text-centered div.notification-content !{translate("inr_discount_offer_plans_page_banner", {flag: '🇮🇳'})} @@ -28,7 +28,7 @@ block content .row .col-md-12 .page-header.centered.plans-header.text-centered.top-page-header - h1.text-capitalize(ng-non-bindable) #{translate('choose_your_plan')} + h1.text-capitalize #{translate('choose_your_plan')} include ./plans/_cards_controls_tables diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug index 90b05b0e8c..62ba37202b 100644 --- a/services/web/app/views/user/reconfirm.pug +++ b/services/web/app/views/user/reconfirm.pug @@ -22,7 +22,7 @@ block content .card h1.card-header.text-capitalize #{translate("reconfirm")} #{translate("Account")} p #{translate('reconfirm_explained')}  - a(href=`mailto:${settings.adminEmail}`, ng-non-bindable) #{settings.adminEmail} + a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail} | . form( data-ol-async-form diff --git a/services/web/app/views/user/register.pug b/services/web/app/views/user/register.pug index 093d3275c9..9392fbdd49 100644 --- a/services/web/app/views/user/register.pug +++ b/services/web/app/views/user/register.pug @@ -6,15 +6,15 @@ block content .row .registration_message if sharedProjectData.user_first_name !== undefined - h1(ng-non-bindable) #{translate("user_wants_you_to_see_project", {username:sharedProjectData.user_first_name, projectname:""})} - em(ng-non-bindable) #{sharedProjectData.project_name} + h1 #{translate("user_wants_you_to_see_project", {username:sharedProjectData.user_first_name, projectname:""})} + em #{sharedProjectData.project_name} div | #{translate("join_sl_to_view_project")}. div | #{translate("already_have_sl_account")} a(href="/login") #{translate("login_here")} else if newTemplateData.templateName !== undefined - h1(ng-non-bindable) #{translate("register_to_edit_template", {templateName:newTemplateData.templateName})} + h1 #{translate("register_to_edit_template", {templateName:newTemplateData.templateName})} div #{translate("already_have_sl_account")} a(href="/login") #{translate("login_here")} @@ -27,6 +27,6 @@ block content p | Please contact | - strong(ng-non-bindable) #{settings.adminEmail} + strong #{settings.adminEmail} | | to create an account. diff --git a/services/web/app/views/user_membership/new.pug b/services/web/app/views/user_membership/new.pug index 00f1309b1a..0500d22470 100644 --- a/services/web/app/views/user_membership/new.pug +++ b/services/web/app/views/user_membership/new.pug @@ -5,7 +5,7 @@ block content .container .row .col-md-10.col-md-offset-1 - h3(ng-non-bindable) #{entityName} "#{entityId}" does not exists in v2 + h3 #{entityName} "#{entityId}" does not exists in v2 form( data-ol-regular-form method='post', @@ -14,7 +14,6 @@ block content input(name="_csrf", type="hidden", value=csrfToken) button.btn.btn-primary.text-capitalize( type="submit", - ng-non-bindable data-ol-disabled-inflight ) span(data-ol-inflight="idle") Create #{entityName} in v2 diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug index aaf3d7b9af..c478fe7b64 100644 --- a/services/web/modules/launchpad/app/views/launchpad.pug +++ b/services/web/modules/launchpad/app/views/launchpad.pug @@ -34,7 +34,7 @@ block content script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js') .content.content-alt#main-content - .container(ng-cloak) + .container .row .col-md-8.col-md-offset-2 .card.launchpad-body