diff --git a/app/assets/javascripts/discourse/views/modal/avatar_selector_view.js b/app/assets/javascripts/discourse/views/modal/avatar_selector_view.js
index 25dcb912c..993dcce2c 100644
--- a/app/assets/javascripts/discourse/views/modal/avatar_selector_view.js
+++ b/app/assets/javascripts/discourse/views/modal/avatar_selector_view.js
@@ -10,90 +10,10 @@ Discourse.AvatarSelectorView = Discourse.ModalBodyView.extend({
templateName: 'modal/avatar_selector',
classNames: ['avatar-selector'],
title: I18n.t('user.change_avatar.title'),
- uploading: false,
- uploadProgress: 0,
saveDisabled: false,
gravatarRefreshEnabled: Em.computed.not('controller.gravatarRefreshDisabled'),
- imageIsNotASquare : false,
-
hasUploadedAvatar: Em.computed.or('uploadedAvatarTemplate', 'controller.custom_avatar_upload_id'),
- didInsertElement: function() {
- var self = this;
- var $upload = $("#avatar-input");
-
- this._super();
-
- // simulate a click on the hidden file input when clicking on our fake file input
- $("#fake-avatar-input").on("click", function(e) {
- // do *NOT* use the cached `$upload` variable, because fileupload is cloning & replacing the input
- // cf. https://github.com/blueimp/jQuery-File-Upload/wiki/Frequently-Asked-Questions#why-is-the-file-input-field-cloned-and-replaced-after-each-selection
- $("#avatar-input").click();
- e.preventDefault();
- });
-
- // define the upload endpoint
- $upload.fileupload({
- url: Discourse.getURL("/users/" + this.get("controller.username") + "/preferences/user_image"),
- dataType: "json",
- fileInput: $upload,
- formData: { image_type: "avatar" }
- });
-
- // when a file has been selected
- $upload.on('fileuploadsubmit', function (e, data) {
- var result = Discourse.Utilities.validateUploadedFiles(data.files, true);
- self.setProperties({
- uploadProgress: 0,
- uploading: result,
- imageIsNotASquare: false
- });
- return result;
- });
-
- // when there is a progression for the upload
- $upload.on("fileuploadprogressall", function (e, data) {
- var progress = parseInt(data.loaded / data.total * 100, 10);
- self.set("uploadProgress", progress);
- });
-
- // when the upload is successful
- $upload.on("fileuploaddone", function (e, data) {
- // make sure we have a url
- if (data.result.url) {
- // indicates the users is using an uploaded avatar
- self.set("controller.custom_avatar_upload_id", data.result.upload_id);
-
- // display a warning whenever the image is not a square
- self.set("imageIsNotASquare", data.result.width !== data.result.height);
- // in order to be as much responsive as possible, we're cheating a bit here
- // indeed, the server gives us back the url to the file we've just uploaded
- // often, this file is not a square, so we need to crop it properly
- // this will also capture the first frame of animated avatars when they're not allowed
- Discourse.Utilities.cropAvatar(data.result.url, data.files[0].type).then(function(avatarTemplate) {
- self.set("uploadedAvatarTemplate", avatarTemplate);
- });
- } else {
- bootbox.alert(I18n.t('post.errors.upload'));
- }
- });
-
- // when there has been an error with the upload
- $upload.on("fileuploadfail", function (e, data) {
- Discourse.Utilities.displayErrorForUpload(data);
- });
-
- // when the upload is done
- $upload.on("fileuploadalways", function () {
- self.setProperties({ uploading: false, uploadProgress: 0 });
- });
- },
-
- willDestroyElement: function() {
- $("#fake-avatar-input").off("click");
- $("#avatar-input").fileupload("destroy");
- },
-
// *HACK* used to select the proper radio button, cause {{action}}
// stops the default behavior
selectedChanged: function() {
@@ -104,8 +24,4 @@ Discourse.AvatarSelectorView = Discourse.ModalBodyView.extend({
});
}.observes('controller.selected'),
- uploadButtonText: function() {
- return this.get("uploading") ? I18n.t("uploading") : I18n.t("user.change_avatar.upload_picture");
- }.property("uploading")
-
});