merge devel
This commit is contained in:
@@ -542,7 +542,7 @@ class InfoView extends React.Component {
|
|||||||
:
|
:
|
||||||
view == 'qrcode' ?
|
view == 'qrcode' ?
|
||||||
<ShowQRCode
|
<ShowQRCode
|
||||||
uri={Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.myUserId}
|
uri={Tinode.URI_TOPIC_ID_PREFIX + this.props.topic}
|
||||||
onCancel={this.handleBackNavigate} />
|
onCancel={this.handleBackNavigate} />
|
||||||
:
|
:
|
||||||
<div id="info-view-content" className="scrollable-panel">
|
<div id="info-view-content" className="scrollable-panel">
|
||||||
|
|||||||
+1
-1
@@ -4727,7 +4727,7 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
onLaunchPermissionsEditor: this.handleLaunchPermissionsEditor,
|
onLaunchPermissionsEditor: this.handleLaunchPermissionsEditor,
|
||||||
onNavigate: this.props.onNavigate
|
onNavigate: this.props.onNavigate
|
||||||
}) : view == 'qrcode' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_show_qrcode_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
|
}) : view == 'qrcode' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_show_qrcode_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
|
||||||
uri: tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.myUserId,
|
uri: tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.URI_TOPIC_ID_PREFIX + this.props.topic,
|
||||||
onCancel: this.handleBackNavigate
|
onCancel: this.handleBackNavigate
|
||||||
}) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
}) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
||||||
id: "info-view-content",
|
id: "info-view-content",
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user