refactoring: moved upload logic out of the attachment icon

Issue #548

3 files changed, 49 insertions, 78 deletions

diff --git a/web-ui/app/js/mail_view/ui/attachment.js b/web-ui/app/js/mail_view/ui/attachment.js
deleted file mode 100644
index fcb0fe68..00000000
--- a/web-ui/app/js/mail_view/ui/attachment.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2015 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define(
-    [
-        'flight/lib/component',
-        'page/events',
-        'features'
-    ],
-
-    function (defineComponent, events, features) {
-        'use strict';
-
-        return defineComponent(function () {
-            this.render = function () {
-                this.$node.html('<i class="fa fa-paperclip fa-2x"></i>');
-            };
-
-            function humanReadable(bytes) {
-                var e = Math.floor(Math.log(bytes) / Math.log(1024));
-                return (bytes / Math.pow(1024, e)).toFixed(2) + ' ' + ' KMGTP'.charAt(e) + 'b';
-            }
-
-            function addJqueryFileUploadConfig(on) {
-                var url = '/attachment';
-                $('#fileupload').fileupload({
-                    url: url,
-                    dataType: 'json',
-                    done: function (e, response) {
-                        var data = response.result;
-                        var link = '<a href="/attachment/'+ data.attachment_id + '?filename='+ data.filename +'&encoding=base64">' + data.filename + ' (' + humanReadable(data.filesize) + ')' + '</a>';
-                        $('#attachment-list-item').html(link);
-                        on.trigger(document, events.mail.uploadedAttachment, data);
-                    },
-                    progressall: function (e, data) {
-                        var progress = parseInt(data.loaded / data.total * 100, 10);
-                        $('#progress .progress-bar').css('width', progress + '%');
-                    }
-                }).bind('fileuploadstart', function(e) {
-                    on.trigger(document, events.mail.uploadingAttachment);
-                }).bind('fileuploadadd', function(e) {
-                    $('.attachmentsAreaWrap').show();
-                });
-            }
-
-            this.upload = function () {
-                addJqueryFileUploadConfig(this);
-                $('#fileupload').click();
-            };
-
-            this.after('initialize', function () {
-                if (features.isEnabled('attachment')) {
-                    this.render();
-                    $('.attachmentsAreaWrap').hide();
-                }
-                this.on(this.$node, 'click', this.upload);
-            });
-
-        });
-    });
diff --git a/web-ui/app/js/mail_view/ui/attachment_icon.js b/web-ui/app/js/mail_view/ui/attachment_icon.js
new file mode 100644
index 00000000..802087f8
--- /dev/null
+++ b/web-ui/app/js/mail_view/ui/attachment_icon.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2015 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define(
+    [
+        'flight/lib/component',
+        'page/events',
+        'features'
+    ],
+
+    function (defineComponent, events, features) {
+        'use strict';
+
+        return defineComponent(function () {
+            this.render = function () {
+                this.$node.html('<i class="fa fa-paperclip fa-2x"></i>');
+            };
+
+            this.triggerUploadAttachment = function () {
+                this.trigger(document, events.mail.startUploadAttachment);
+            };
+
+            this.after('initialize', function () {
+                if (features.isEnabled('attachment')) {
+                    this.render();
+                    $('.attachmentsAreaWrap').hide();
+                }
+                this.on(this.$node, 'click', this.triggerUploadAttachment);
+            });
+
+        });
+    });
diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/app/js/mail_view/ui/compose_box.js
index 993cf880..8e03c081 100644
--- a/web-ui/app/js/mail_view/ui/compose_box.js
+++ b/web-ui/app/js/mail_view/ui/compose_box.js
@@ -20,14 +20,13 @@ define(
     'views/templates',
     'mixins/with_mail_edit_base',
     'page/events',
-    'mail_view/data/mail_builder',
-    'mail_view/data/attachment_list'
+    'mail_view/data/mail_builder'
   ],
 
-  function (defineComponent, templates, withMailEditBase, events, mailBuilder, attachmentList) {
+  function (defineComponent, templates, withMailEditBase, events, mailBuilder) {
     'use strict';
 
-    return defineComponent(composeBox, withMailEditBase, attachmentList);
+    return defineComponent(composeBox, withMailEditBase);
 
     function composeBox() {