From 94c94eb7c9657894ddb15f8368f345b5b0a98be9 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Tue, 17 Feb 2015 11:54:15 -0800
Subject: [PATCH] Refactor message view

The message view has three flavors so far, a normal text+attachments
message, a group update, and an end session message. This changeset
extracts the normal message rendering into its own subview, and adds
some convenience functions to the message model in order to simplify
some of that flavoring logic.
---
 js/models/messages.js    |  7 +++++
 js/views/message_view.js | 65 +++++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index aaea2d8e..1208b7b5 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -33,6 +33,13 @@
             if (missing.length) {
                 console.log("Message missing attributes: " + missing);
             }
+        },
+        isEndSession: function() {
+            var flag = textsecure.protobuf.PushMessageContent.Flags.END_SESSION;
+            return !!(this.get('flags') & flag);
+        },
+        isGroupUpdate: function() {
+            return !!(this.get('group_update'));
         }
     });
 
diff --git a/js/views/message_view.js b/js/views/message_view.js
index ffd54da1..0bf6ed8a 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -16,6 +16,8 @@
 (function () {
   'use strict';
 
+  window.Whisper = window.Whisper || {};
+
   var ErrorView = Backbone.View.extend({
       className: 'error',
       events: {
@@ -30,38 +32,14 @@
       }
   });
 
-  window.Whisper = window.Whisper || {};
 
-  Whisper.MessageView = Backbone.View.extend({
-    tagName:   "li",
-    className: "entry",
-
-    initialize: function() {
-      var groupUpdate = this.model.get('group_update');
-      this.$el.addClass(this.model.get('type'));
-
-      if (groupUpdate) {
-          this.group_update_view = new Whisper.GroupUpdateView({
-              model: groupUpdate
-          }).render();
-      } else if (this.model.get('flags') === textsecure.protobuf.PushMessageContent.Flags.END_SESSION) {
-          this.end_session_view = new Whisper.EndSessionView().render();
-      } else {
+  var ContentMessageView = Backbone.View.extend({
+      tagName: 'div',
+      initialize: function() {
         this.template = $('#message').html();
-      }
-      Mustache.parse(this.template);
-
-      this.listenTo(this.model, 'change',  this.render); // auto update
-      this.listenTo(this.model, 'destroy', this.remove); // auto update
-
-    },
-
-    render: function() {
-        if (this.group_update_view) {
-            this.$el.append(this.group_update_view.$el);
-        } else if (this.end_session_view) {
-            this.$el.append(this.end_session_view.$el);
-        } else {
+        Mustache.parse(this.template);
+      },
+      render: function() {
             this.$el.html(
                 Mustache.render(this.template, {
                     message: this.model.get('body'),
@@ -89,8 +67,33 @@
                     })
                 );
             }
-        }
+      }
+  });
 
+  Whisper.MessageView = Backbone.View.extend({
+    tagName:   "li",
+    className: function() {
+        return ["entry", this.model.get('type')].join(' ');
+    },
+    initialize: function() {
+        if (this.model.isEndSession()) {
+            this.view = new Whisper.EndSessionView();
+        } else if (this.model.isGroupUpdate()) {
+            this.view = new Whisper.GroupUpdateView({
+                model: this.model.get('group_update')
+            });
+        } else {
+            this.view = new ContentMessageView({model: this.model});
+        }
+        this.$el.append(this.view.el);
+
+      this.listenTo(this.model, 'change',  this.render); // auto update
+      this.listenTo(this.model, 'destroy', this.remove); // auto update
+
+    },
+
+    render: function() {
+        this.view.render();
         return this;
     }