partial fix for avatar uploads
This commit is contained in:
@@ -50,7 +50,8 @@ export default class CreateAccountView extends React.PureComponent {
|
|||||||
this.setState({fn: e.target.value});
|
this.setState({fn: e.target.value});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
|
console.log("handleImageChanged", mime, img);
|
||||||
this.setState({imageDataUrl: img});
|
this.setState({imageDataUrl: img});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +94,8 @@ export default class CreateAccountView extends React.PureComponent {
|
|||||||
</div>
|
</div>
|
||||||
<AvatarUpload
|
<AvatarUpload
|
||||||
tinode={this.props.tinode}
|
tinode={this.props.tinode}
|
||||||
onImageChanged={this.handleImageChanged}
|
avatar={this.state.imageDataUrl}
|
||||||
|
onImageUpdated={this.handleImageChanged}
|
||||||
onError={this.props.onError} />
|
onError={this.props.onError} />
|
||||||
</div>
|
</div>
|
||||||
<div className="panel-form-row">
|
<div className="panel-form-row">
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ class InfoView extends React.Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
this.setState({avatar: img});
|
this.setState({avatar: img});
|
||||||
this.props.onTopicDescUpdate(this.props.topic, theCard(null, img || Tinode.DEL_CHAR), null);
|
this.props.onTopicDescUpdate(this.props.topic, theCard(null, img || Tinode.DEL_CHAR), null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export default class NewTopicGroup extends React.PureComponent {
|
|||||||
this.setState({[name]: e.target.value || ''});
|
this.setState({[name]: e.target.value || ''});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
this.setState({imageDataUrl: img});
|
this.setState({imageDataUrl: img});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ export default class NewTopicGroup extends React.PureComponent {
|
|||||||
<AvatarUpload
|
<AvatarUpload
|
||||||
tinode={this.props.tinode}
|
tinode={this.props.tinode}
|
||||||
onError={this.props.onError}
|
onError={this.props.onError}
|
||||||
onImageChanged={this.handleImageChanged} />
|
onImageUpdated={this.handleImageChanged} />
|
||||||
</center>
|
</center>
|
||||||
<div className="group">
|
<div className="group">
|
||||||
<label className="small" htmlFor="new-topic-fn">
|
<label className="small" htmlFor="new-topic-fn">
|
||||||
|
|||||||
+7
-8
@@ -4307,7 +4307,8 @@ class CreateAccountView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
|
console.log("handleImageChanged", mime, img);
|
||||||
this.setState({
|
this.setState({
|
||||||
imageDataUrl: img
|
imageDataUrl: img
|
||||||
});
|
});
|
||||||
@@ -4373,7 +4374,8 @@ class CreateAccountView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
|
|||||||
required: true
|
required: true
|
||||||
}))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_avatar_upload_jsx__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
}))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_avatar_upload_jsx__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
||||||
tinode: this.props.tinode,
|
tinode: this.props.tinode,
|
||||||
onImageChanged: this.handleImageChanged,
|
avatar: this.state.imageDataUrl,
|
||||||
|
onImageUpdated: this.handleImageChanged,
|
||||||
onError: this.props.onError
|
onError: this.props.onError
|
||||||
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
||||||
className: "panel-form-row"
|
className: "panel-form-row"
|
||||||
@@ -4750,7 +4752,7 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
this.setState({
|
this.setState({
|
||||||
avatar: img
|
avatar: img
|
||||||
});
|
});
|
||||||
@@ -7828,7 +7830,6 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
getBlankState() {
|
getBlankState() {
|
||||||
const settings = _lib_local_storage_js__WEBPACK_IMPORTED_MODULE_17__["default"].getObject('settings') || {};
|
const settings = _lib_local_storage_js__WEBPACK_IMPORTED_MODULE_17__["default"].getObject('settings') || {};
|
||||||
const persist = !!_lib_local_storage_js__WEBPACK_IMPORTED_MODULE_17__["default"].getObject('keep-logged-in');
|
const persist = !!_lib_local_storage_js__WEBPACK_IMPORTED_MODULE_17__["default"].getObject('keep-logged-in');
|
||||||
console.log("Blank state");
|
|
||||||
return {
|
return {
|
||||||
connected: false,
|
connected: false,
|
||||||
ready: false,
|
ready: false,
|
||||||
@@ -8154,7 +8155,6 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (hash.params.cred_done) {
|
if (hash.params.cred_done) {
|
||||||
console.log("credentials validated");
|
|
||||||
this.handleError(this.props.intl.formatMessage(messages.cred_confirmed_successfully), 'info');
|
this.handleError(this.props.intl.formatMessage(messages.cred_confirmed_successfully), 'info');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9356,7 +9356,6 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
resp: code
|
resp: code
|
||||||
}
|
}
|
||||||
}).then(_ => {
|
}).then(_ => {
|
||||||
console.log("URL with creds:", _lib_navigation_js__WEBPACK_IMPORTED_MODULE_18__["default"].addUrlParam('', 'cred_done', 1));
|
|
||||||
_lib_navigation_js__WEBPACK_IMPORTED_MODULE_18__["default"].navigateTo(_lib_navigation_js__WEBPACK_IMPORTED_MODULE_18__["default"].addUrlParam('', 'cred_done', 1));
|
_lib_navigation_js__WEBPACK_IMPORTED_MODULE_18__["default"].navigateTo(_lib_navigation_js__WEBPACK_IMPORTED_MODULE_18__["default"].addUrlParam('', 'cred_done', 1));
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
this.handleError(err.message, 'err');
|
this.handleError(err.message, 'err');
|
||||||
@@ -15299,7 +15298,7 @@ class NewTopicGroup extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCo
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleImageChanged(img) {
|
handleImageChanged(mime, img) {
|
||||||
this.setState({
|
this.setState({
|
||||||
imageDataUrl: img
|
imageDataUrl: img
|
||||||
});
|
});
|
||||||
@@ -15343,7 +15342,7 @@ class NewTopicGroup extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCo
|
|||||||
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("center", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_avatar_upload_jsx__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("center", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_avatar_upload_jsx__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
||||||
tinode: this.props.tinode,
|
tinode: this.props.tinode,
|
||||||
onError: this.props.onError,
|
onError: this.props.onError,
|
||||||
onImageChanged: this.handleImageChanged
|
onImageUpdated: this.handleImageChanged
|
||||||
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
|
||||||
className: "group"
|
className: "group"
|
||||||
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
|
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
|
||||||
|
|||||||
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