Merge branch 'devel' into calls-dev

src/index.js

@@ -23,7 +23,7 @@ const language = (params && params.hl) ||
 const baseLanguage = language.toLowerCase().split(/[-_]/)[0];
 
 // Try the full locale first, then the locale without the region code, fallback to 'en'.
-const htmlLang = allMessages[language] ? langauge : allMessages[baseLanguage] ? baseLanguage : 'en';
+const htmlLang = allMessages[language] ? language : allMessages[baseLanguage] ? baseLanguage : 'en';
 const messages = allMessages[htmlLang];
 
 // Set lang attribute of the HTML element: <html lang="XX">

src/version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.18.2";
+export const PACKAGE_VERSION = "0.18.3-rc1";

src/views/info-view.jsx

@@ -18,7 +18,7 @@ import TopicSecurity from '../widgets/topic-security.jsx';
 import { MAX_TITLE_LENGTH, MAX_TOPIC_DESCRIPTION_LENGTH, NO_ACCESS_MODE } from '../config.js';
 
 import { makeImageUrl } from '../lib/blob-helpers.js';
-import { arrayEqual, theCard } from '../lib/utils.js';
+import { theCard } from '../lib/utils.js';
 
 const messages = defineMessages({
   info: {

src/views/tinode-web.jsx

@@ -1459,7 +1459,7 @@ class TinodeWeb extends React.Component {
       return;
     }
 
-    topic.updateMode(null, '-JP').then((ctrl) => {
+    topic.updateMode(null, '-JP').then(_ => {
       // Hide MessagesView and InfoView panels.
       HashNavigation.navigateTo(HashNavigation.setUrlTopic(window.location.hash, ''));
     }).catch((err) => {
@@ -1474,10 +1474,7 @@ class TinodeWeb extends React.Component {
     }
 
     // Publish spam report.
-    this.tinode.publish(Tinode.TOPIC_SYS, Tinode.Drafty.attachJSON(null, {
-      'action': 'report',
-      'target': topicName
-    }));
+    this.tinode.report('report', topicName);
 
     // Remove J and P permissions.
     topic.updateMode(null, '-JP').then((ctrl) => {
@@ -1507,8 +1504,7 @@ class TinodeWeb extends React.Component {
     const header = '➦ ' + params.userName;
     const content = typeof params.content == 'string' ?
             Tinode.Drafty.init(params.content) : Tinode.Drafty.forwardedContent(params.content);
-    const preview = Tinode.Drafty.preview(content, FORWARDED_PREVIEW_LENGTH,
-                                          undefined, params.forwarded != null);
+    const preview = Tinode.Drafty.preview(content, FORWARDED_PREVIEW_LENGTH, true);
     const msg = Tinode.Drafty.append(
         Tinode.Drafty.appendLineBreak(
             Tinode.Drafty.mention(header, params.userFrom)),

src/widgets/topic-security.jsx

@@ -143,7 +143,7 @@ class TopicSecurity extends React.PureComponent {
     this.props.onShowAlert(
       formatMessage(messages.report_chat), // title
       formatMessage(messages.report_chat_warning), // content
-      (() => { this.props.onReportTopic(this.props.topic); }), // onConfirm
+      (_ => { this.props.onReportTopic(this.props.topic); }), // onConfirm
       null, // "OK"
       true, // Show Reject button
       null  // "Cancel"