change your avatar in a modal

2013-08-17 00:29:54 +02:00
parent baff59d752
commit ea6e73076b
14 changed files with 197 additions and 200 deletions
@@ -0,0 +1,46 @@
+/**
+  The modal for selecting an avatar
+
+  @class AvatarSelectorController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @uses Discourse.ModalFunctionality
+  @module Discourse
+**/
+Discourse.AvatarSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
+  init: function() {
+    // copy some data to support the cancel action
+    this.setProperties(this.get("currentUser").getProperties(
+      "username",
+      "has_uploaded_avatar",
+      "use_uploaded_avatar",
+      "gravatar_template",
+      "uploaded_avatar_template"
+    ));
+  },
+
+  toggleUseUploadedAvatar: function(toggle) {
+    this.set("use_uploaded_avatar", toggle);
+  },
+
+  saveAvatarSelection: function() {
+    // sends the information to the server if it has changed
+    if (this.get("use_uploaded_avatar") !== this.get("currentUser.use_uploaded_avatar")) {
+      var data = { use_uploaded_avatar: this.get("use_uploaded_avatar") };
+      Discourse.ajax("/users/" + this.get("currentUser.username") + "/preferences/avatar/toggle", { type: 'PUT', data: data });
+    }
+    // saves the data back to the currentUser object
+    var currentUser = this.get("currentUser");
+    currentUser.setProperties(this.getProperties(
+      "has_uploaded_avatar",
+      "use_uploaded_avatar",
+      "gravatar_template",
+      "uploaded_avatar_template"
+    ));
+    if (this.get("use_uploaded_avatar")) {
+      currentUser.set("avatar_template", this.get("uploaded_avatar_template"));
+    } else {
+      currentUser.set("avatar_template", this.get("gravatar_template"));
+    }
+  }
+});
@@ -1,84 +0,0 @@
-/**
-  This controller supports actions related to updating one's avatar
-
-  @class PreferencesAvatarController
-  @extends Discourse.ObjectController
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.PreferencesAvatarController = Discourse.ObjectController.extend({
-  uploading: false,
-  uploadProgress: 0,
-  uploadDisabled: Em.computed.or("uploading"),
-  useGravatar: Em.computed.not("use_uploaded_avatar"),
-  useUploadedAvatar: Em.computed.alias("use_uploaded_avatar"),
-
-  toggleUseUploadedAvatar: function(toggle) {
-    if (this.get("use_uploaded_avatar") !== toggle) {
-      var controller = this;
-      this.set("use_uploaded_avatar", toggle);
-      Discourse.ajax("/users/" + this.get("username") + "/preferences/avatar/toggle", { type: 'PUT', data: { use_uploaded_avatar: toggle }})
-               .then(function(result) { controller.set("avatar_template", result.avatar_template); });
-    }
-  },
-
-  uploadButtonText: function() {
-    return this.get("uploading") ? I18n.t("user.change_avatar.uploading") : I18n.t("user.change_avatar.upload");
-  }.property("uploading"),
-
-  uploadAvatar: function() {
-    var controller = this;
-    var $upload = $("#avatar-input");
-
-    // do nothing if no file is selected
-    if (Em.isEmpty($upload.val())) { return; }
-
-    this.set("uploading", true);
-
-    // define the upload endpoint
-    $upload.fileupload({
-      url: Discourse.getURL("/users/" + this.get("username") + "/preferences/avatar"),
-      dataType: "json",
-      timeout: 20000
-    });
-
-    // when there is a progression for the upload
-    $upload.on("fileuploadprogressall", function (e, data) {
-      var progress = parseInt(data.loaded / data.total * 100, 10);
-      controller.set("uploadProgress", progress);
-    });
-
-    // when the upload is successful
-    $upload.on("fileuploaddone", function (e, data) {
-      // set some properties
-      controller.setProperties({
-        has_uploaded_avatar: true,
-        use_uploaded_avatar: true,
-        avatar_template: data.result.url,
-        uploaded_avatar_template: data.result.url
-      });
-    });
-
-    // 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 (e, data) {
-      // prevent automatic upload when selecting a file
-      $upload.fileupload("destroy");
-      $upload.off();
-      // clear file input
-      $upload.val("");
-      // indicate upload is done
-      controller.setProperties({
-        uploading: false,
-        uploadProgress: 0
-      });
-    });
-
-    // *actually* launch the upload
-    $("#avatar-input").fileupload("add", { fileInput: $("#avatar-input") });
-  }
-});