From b4ce79cac0c8d35ed29f829c2a1a0d418eaed2ca Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 9 Apr 2018 16:38:40 -0700 Subject: [PATCH] Reply -> Quote --- preload.js | 6 +++++- ts/components/conversation/{Reply.md => Quote.md} | 0 ts/components/conversation/{Reply.tsx => Quote.tsx} | 0 ts/styleguide/StyleGuideUtil.ts | 6 ++---- 4 files changed, 7 insertions(+), 5 deletions(-) rename ts/components/conversation/{Reply.md => Quote.md} (100%) rename ts/components/conversation/{Reply.tsx => Quote.tsx} (100%) diff --git a/preload.js b/preload.js index a547ee69ab6c..b6ef667a7e67 100644 --- a/preload.js +++ b/preload.js @@ -161,7 +161,11 @@ window.Signal.Debug = require('./js/modules/debug'); window.Signal.HTML = require('./ts/html'); window.Signal.Logs = require('./js/modules/logs'); -window.Signal.Components = {}; +const Quote = require('./ts/components/conversation/Quote'); + +window.Signal.Components = { + Quote, +}; window.Signal.Migrations = {}; window.Signal.Migrations.deleteAttachmentData = diff --git a/ts/components/conversation/Reply.md b/ts/components/conversation/Quote.md similarity index 100% rename from ts/components/conversation/Reply.md rename to ts/components/conversation/Quote.md diff --git a/ts/components/conversation/Reply.tsx b/ts/components/conversation/Quote.tsx similarity index 100% rename from ts/components/conversation/Reply.tsx rename to ts/components/conversation/Quote.tsx diff --git a/ts/styleguide/StyleGuideUtil.ts b/ts/styleguide/StyleGuideUtil.ts index 8b633fb9212e..5c7b235fd3fa 100644 --- a/ts/styleguide/StyleGuideUtil.ts +++ b/ts/styleguide/StyleGuideUtil.ts @@ -13,8 +13,7 @@ export { BackboneWrapper } from '../components/utility/BackboneWrapper'; // Here we can make things inside Webpack available to Backbone views like preload.js. -import { Message } from '../components/conversation/Message'; -import { Reply } from '../components/conversation/Reply'; +import { Quote } from '../components/conversation/Quote'; // TypeScript wants two things when you import: @@ -78,8 +77,7 @@ parent.React = React; parent.ReactDOM = ReactDOM; parent.Signal.Components = { - Message, - Reply, + Quote, }; parent.ConversationController._initialFetchComplete = true;