From ffab08bd60be34dd34cd0db7c0aa6eca986ce52e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 13 Jul 2020 17:32:17 +0100 Subject: [PATCH] Update various brand instances in code --- src/components/structures/VectorEmbeddedPage.js | 2 +- src/vector/index.html | 8 ++++---- src/vector/index.ts | 2 +- src/vector/jitsi/index.ts | 2 +- src/vector/mobile_guide/index.html | 6 +++--- src/vector/mobile_guide/index.js | 10 +++++----- src/vector/platform/WebPlatform.ts | 2 +- src/vector/static/incompatible-browser.html | 6 +++--- src/vector/static/unable-to-load.html | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/structures/VectorEmbeddedPage.js b/src/components/structures/VectorEmbeddedPage.js index fc3b41a504..537b80bc57 100644 --- a/src/components/structures/VectorEmbeddedPage.js +++ b/src/components/structures/VectorEmbeddedPage.js @@ -25,7 +25,7 @@ import { _t } from 'matrix-react-sdk/src/languageHandler'; export default class VectorEmbeddedPage extends EmbeddedPage { static replaces = 'EmbeddedPage'; - // we're overriding the base component here, for Riot-specific tweaks + // we're overriding the base component here, for Element-specific tweaks translate(s) { s = sanitizeHtml(_t(s)); // ugly fix for https://github.com/vector-im/riot-web/issues/4243 diff --git a/src/vector/index.html b/src/vector/index.html index 58483bd88f..4cda4b37a5 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -2,7 +2,7 @@ - Riot + Element @@ -16,8 +16,8 @@ - - + + @@ -51,7 +51,7 @@ } %> - +
diff --git a/src/vector/index.ts b/src/vector/index.ts index e4701cede1..3f35144df4 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -121,7 +121,7 @@ async function start() { const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; const isAndroid = /Android/.test(navigator.userAgent); if (isIos || isAndroid) { - if (document.cookie.indexOf("riot_mobile_redirect_to_guide=false") === -1) { + if (document.cookie.indexOf("element_mobile_redirect_to_guide=false") === -1) { window.location.href = "mobile_guide/"; return; } diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 50f07fb954..2526782d71 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -55,7 +55,7 @@ let widgetApi: WidgetApi; const parentUrl = qsParam('parentUrl', true); const widgetId = qsParam('widgetId', true); - // Set this up as early as possible because Riot will be hitting it almost immediately. + // Set this up as early as possible because Element will be hitting it almost immediately. if (parentUrl && widgetId) { widgetApi = new WidgetApi(qsParam('parentUrl'), qsParam('widgetId'), [ Capability.AlwaysOnScreen, diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index 2262ac9e4f..e9b118cd87 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -162,7 +162,7 @@ body { -

Set up Riot on iOS or Android

+

Set up Element on iOS or Android

@@ -330,7 +330,7 @@ body {

2: Configure your app

- Configure + Configure

Tap the button above, or manually enable Use custom server and enter:

Homeserver:

Identity Server:

@@ -339,7 +339,7 @@ body {

- + Go to Desktop Site

diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index f174d777b1..4ff7de2820 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -1,8 +1,8 @@ import {getVectorConfig} from '../getconfig'; -function onBackToRiotClick() { +function onBackToElementClick() { // Cookie should expire in 4 hours - document.cookie = 'riot_mobile_redirect_to_guide=false;path=/;max-age=14400'; + document.cookie = 'element_mobile_redirect_to_guide=false;path=/;max-age=14400'; window.location.href = '../'; } @@ -10,7 +10,7 @@ function onBackToRiotClick() { function renderConfigError(message) { const contactMsg = "If this is unexpected, please contact your system administrator " + "or technical support representative."; - message = `

Error loading Riot

${message}

${contactMsg}

`; + message = `

Error loading Element

${message}

${contactMsg}

`; const toHide = document.getElementsByClassName("mx_HomePage_container"); const errorContainers = document.getElementsByClassName("mx_HomePage_errorContainer"); @@ -27,7 +27,7 @@ function renderConfigError(message) { } async function initPage() { - document.getElementById('back_to_riot_button').onclick = onBackToRiotClick; + document.getElementById('back_to_element_button').onclick = onBackToElementClick; let config = await getVectorConfig('..'); @@ -92,7 +92,7 @@ async function initPage() { if (isUrl && !isUrl.endsWith('/')) isUrl += '/'; if (hsUrl !== 'https://matrix.org/') { - document.getElementById('configure_riot_button').href = + document.getElementById('configure_element_button').href = "https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) + "&is_url=" + encodeURIComponent(isUrl); document.getElementById('step1_heading').innerHTML= '1: Install the app'; diff --git a/src/vector/platform/WebPlatform.ts b/src/vector/platform/WebPlatform.ts index 2539440fdc..9d3c635c86 100644 --- a/src/vector/platform/WebPlatform.ts +++ b/src/vector/platform/WebPlatform.ts @@ -186,7 +186,7 @@ export default class WebPlatform extends VectorBasePlatform { let appName = u.format(); // Remove leading slashes if present appName = appName.replace(/^\/\//, ""); - // `appName` is now in the format `riot.im/develop`. + // `appName` is now in the format `develop.element.io`. const ua = new UAParser(); const browserName = ua.getBrowser().name || "unknown browser"; diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html index 7caee20488..1d685d5394 100644 --- a/src/vector/static/incompatible-browser.html +++ b/src/vector/static/incompatible-browser.html @@ -168,8 +168,8 @@
-

Your browser can't run Riot

-

Riot uses many advanced browser features, some of which are not available or experimental in your current browser.

+

Your browser can't run Element

+

Element uses many advanced browser features, some of which are not available or experimental in your current browser.

Please install Chrome, Firefox, or Safari for the best experience.

@@ -178,7 +178,7 @@