tabs work to navigate between rooms, removed relational

Author: dobrite

.gitignore

@@ -25,6 +25,7 @@ develop-eggs
 *.swm
 *.swl
 *.swk
+
 *.bak
 
 pyvenv.cfg
@@ -81,3 +82,6 @@ npm-debug.log
 centrifuge.db
 config.json
 .centrc
+
+#build files
+*.built.js

Makefile

@@ -18,3 +18,6 @@ ws:
 
 shell:
 	bin/pshell -p bpython wwc/development.ini
+
+build:
+	node node_modules/requirejs/bin/r.js -o build.js

app/index.html

@@ -27,6 +27,8 @@
 
         <!-- build:js scripts/main.js -->
         <script data-main="app/scripts/init" src="app/bower_components/requirejs/require.js"></script>
+        <!--<script src="app/bower_components/requirejs/require.js"></script>
+        <script src="app/main.built.js"></script>-->
         <!-- endbuild -->
 
     </body>

app/scripts/chat/chat_app.js

@@ -6,7 +6,7 @@ define([
     "scripts/chat/common/channel/channel_controller",
     "scripts/chat/common/input/input_controller",
     "scripts/chat/room/room_controller",
-    "scripts/entities/relation/room_relation",
+    "scripts/entities/model/room_model",
     "scripts/region_manager",
 ],
 function (
@@ -17,13 +17,13 @@ function (
     ChannelController,
     InputController,
     RoomController,
-    RoomRelationalModel,
+    RoomModel,
     regionManager
 ) {
 
     var ChatRouter = Backbone.Marionette.AppRouter.extend({
         appRoutes: {
-            "room/:room" : "showChat"
+            "room/:room" : "showChatRoom"
         }
     });
 
@@ -39,26 +39,33 @@ function (
 
     var roomControllers = {};
 
-    var API = {
-        createChatRoom: function (room) {
+    var createChatRoom = function (room) {
 
-            /* called to create a room
-             */
+        /* called to create a room
+        */
 
-            var roomRelationalModel = communicator.reqres.request('entities:room:add', room);
+        var roomModel = communicator.reqres.request('entities:room:add', room);
 
-            roomControllers[room] = new RoomController({
-                region: chatLayout.roomRegion,
-                roomModel: roomRelationalModel,
-            });
+        roomControllers[room] = new RoomController({
+            region: chatLayout.roomRegion,
+            roomModel: roomModel,
+        });
 
-        },
+        communicator.vent.trigger("chat:create:room", room);
+
+    };
+
+    var API = {
         showChatRoom: function (room) {
 
             /* called to show a specific room
              * i.e. to switch between rooms
              */
 
+            if(!roomControllers.hasOwnProperty(room)){
+                createChatRoom(room);
+            }
+
             roomControllers[room].showRoom();
 
         },
@@ -86,8 +93,6 @@ function (
     communicator.vent.on("login:submit", function (room) {
         communicator.command.execute("ws:connect");
         communicator.vent.on("ws:connect", function () {
-            API.createChatRoom(room);
-            communicator.vent.trigger("chat:create:room", room);
             API.showChat();
             communicator.vent.trigger("chat:show:room", room);
         });

app/scripts/chat/common/channel/channel_collection_view.js

@@ -22,11 +22,15 @@ function (Backbone, ChannelItemView) {
 
         onTabChange: function (view) {
             //TODO don't do this if tab clicked is already active tab
+            //TODO refactor duplicate function
+            //TODO refactor duplicate comment
             this.$el.children().removeClass("active");
             view.$el.addClass("active");
         },
 
         onAfterItemAdded: function(view){
+            //TODO refactor duplicate function
+            //TODO refactor duplicate comment
             this.$el.children().removeClass("active");
             view.$el.addClass("active");
         },

app/scripts/chat/common/channel/channel_controller.js

@@ -16,15 +16,18 @@ function (Backbone, communicator, ChannelCollection, ChannelCollectionView) {
                 collection: new ChannelCollection()
             });
 
+            //TODO shouldn't we just listen for room collection add events?
             communicator.vent.on("chat:create:room", function (room) {
                 this.channelCollectionView.collection.add({channel: room});
             }, this);
+
+            this.listenTo(this.channelCollectionView, 'itemview:change', function (event, view) {
+                communicator.vent.trigger('chat:show:room', view.model.get('channel'));
+            });
         },
 
         showChannels: function () {
             this.region.show(this.channelCollectionView);
-            //move somewhere else
-            //this.channelCollectionView.collection.add({channel: room});
         },
 
         onClose: function () {

app/scripts/chat/room/message/message_collection_view.js

@@ -12,17 +12,17 @@ function (Backbone, MessageItemView) {
 
         itemView: MessageItemView,
 
-        /* ui selector cache */
         ui: {},
 
-        /* Ui events hash */
         events: {},
 
         collectionEvents: {
         },
 
         /* on render callback */
-        onRender: function() {}
+        onRender: function() {
+            console.log("rendering");
+        }
     });
 
     return MessageCollectionView;

app/scripts/chat/room/message/message_controller.js

@@ -19,10 +19,12 @@ function (Backbone, communicator, MessageCollection, MessageCollectionView) {
         },
 
         showMessages: function () {
+            this.region.reset();
             this.region.show(this.messageCollectionView);
         },
 
         onClose: function () {
+            console.log("close");
         },
 
     });

app/scripts/chat/room/nick/nick_controller.js

@@ -18,6 +18,7 @@ function (Backbone, communicator, NickCollectionView) {
         },
 
         showNicks: function () {
+            this.region.reset();
             this.region.show(this.nickCollectionView);
         },
 

app/scripts/entities/collection/channel_collection.js

@@ -9,8 +9,6 @@ function (Backbone, Communicator, ChannelModel) {
         model: ChannelModel
     });
 
-    //Communicator.vent.on('ws:');
-
     return ChannelCollection;
 
 });