nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6684 from svbergerem/fix-mobile-js-avatar-upload

Browse source 
Fix uncaught type error for mobile avatar upload
This commit is contained in:
Dennis Schubert 2016-02-08 08:00:29 +01:00
commit 5933c63a4a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -96,6 +96,7 @@ Contributions are very welcome, the hard work is done!
* Fix timeago tooltips for reshares [#6648](https://github.com/diaspora/diaspora/pull/6648) * Fix timeago tooltips for reshares [#6648](https://github.com/diaspora/diaspora/pull/6648)
* "Getting started" is now turned off after first visit on mobile [#6681](https://github.com/diaspora/diaspora/pull/6681) * "Getting started" is now turned off after first visit on mobile [#6681](https://github.com/diaspora/diaspora/pull/6681)
* Fixed a 500 when liking on mobile without JS enabled [#6683](https://github.com/diaspora/diaspora/pull/6683) * Fixed a 500 when liking on mobile without JS enabled [#6683](https://github.com/diaspora/diaspora/pull/6683)
* Fixed profile image upload in the mobile UI [#6684](https://github.com/diaspora/diaspora/pull/6684)
## Features ## Features
* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033) * Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

2
app/views/photos/_new_profile_photo.haml
View file

@ -38,7 +38,7 @@
/* flash message prompt */ /* flash message prompt */
var message = Diaspora.I18n.t("photo_uploader.looking_good"); var message = Diaspora.I18n.t("photo_uploader.looking_good");
app.flashMessages.success(message); if(app.flashMessages) { app.flashMessages.success(message); }
var id = responseJSON.data.photo.id; var id = responseJSON.data.photo.id;
var url = responseJSON.data.photo.unprocessed_image.url; var url = responseJSON.data.photo.unprocessed_image.url;