servers

assets/javascripts/candy.fix.js

@@ -19,11 +19,39 @@ Candy.Util.getPosTopAccordingToWindowBounds = function(elem, pos) {
         marginDiff = elemHeight - elem.outerHeight(true),
         backgroundPositionAlignment = 'top';
 
-    pos -= relative = $('#candy').offset().top
-    if (pos + elemHeight >= windowHeight - relative) {
+    if (pos + elemHeight >= windowHeight) {
         pos -= elemHeight - marginDiff;
         backgroundPositionAlignment = 'bottom';
     }
-
+    pos -= $('#candy').offset().top
     return { px: pos, backgroundPositionAlignment: backgroundPositionAlignment };
-};
+};
\ No newline at end of file
+
+
+    /** Function: update
+     * Messages received get dispatched from this method.
+     *
+     * Parameters:
+     *   (Candy.Core.Event) obj - Candy core event object
+     *   (Object) args - {message, roomJid}
+     */
+    Candy.View.Observer.Message.update = function(obj, args) {
+        if(args.message.type === 'subject') {
+            if (!Candy.View.Pane.Chat.rooms[args.roomJid]) {
+                Candy.View.Pane.Room.init(args.roomJid, args.message.name);
+                Candy.View.Pane.Room.show(args.roomJid);
+            }
+            Candy.View.Pane.Room.setSubject(args.roomJid, args.message.body);
+        } else if(args.message.type === 'info') {
+            Candy.View.Pane.Chat.infoMessage(args.roomJid, args.message.body);
+        } else {
+            // Initialize room if it's a message for a new private user chat
+            if(args.message.isNoConferenceRoomJid){
+                args.roomJid = Strophe.getBareJidFromJid(args.roomJid)
+            }
+            if(args.message.type === 'chat' && !Candy.View.Pane.Chat.rooms[args.roomJid]) {
+                Candy.View.Pane.PrivateRoom.open(args.roomJid, args.message.name, false, args.message.isNoConferenceRoomJid);
+            }
+            Candy.View.Pane.Message.show(args.roomJid, args.message.name, args.message.body, args.timestamp);
+        }
+    }
\ No newline at end of file

rooms/index.html

@@ -119,7 +119,7 @@
                 <span>下面留的是管理员</span>
             </li>
             <li>
-                <span>戳一下可以直接发消息哦</span>
+                <span>登录聊天之后才能发消息哦</span>
             </li>
             <li class="xmpp" data-jid="zh99998@gmail.com" data-nick="zh99998">
                 <img src="https://lh3.googleusercontent.com/-EVHxW12CgMs/AAAAAAAAAAI/AAAAAAAAAAA/b4Rq4BiFUT4/s32-c-k/photo.jpg?sz=32" alt=""/><span>zh99998</span>

servers.json

 [
-    {"auth":true,"created_at":"2012-08-04T18:12:07+08:00","id":2,"index":"http://ygopro-server.my-card.in:7922/","ip":"122.0.65.70","login":"http://master.smdcn.net:7922/?operation=passcheck&username={name}&pass={password}","max_rooms":100,"name":"mycard","port":7911,"pvp":true,"register":"http://master.smdcn.net:7922/?pass={key}&operation=forceuserpass&username={name}&password={password}","server_type":"ygopro","updated_at":"2012-09-05T07:12:08+08:00"},
-    {"auth":false,"created_at":"2012-08-04T18:12:07+08:00","id":3,"index":"http://ygopro-server.my-card.in:7966/","ip":"122.0.65.70","login":"http://master.smdcn.net:7966/?operation=passcheck&username={name}&pass={password}","max_rooms":100,"name":"mycard-free","port":7955,"pvp":false,"register":"http://master.smdcn.net:7966/?pass={key}&operation=forceuserpass&username={name}&password={password}","server_type":"ygopro","updated_at":"2012-09-05T07:12:08+08:00"},
+    {"auth":true,"created_at":"2012-08-04T18:12:07+08:00","id":2,"index":"http://s70.hebexpo.com:7922/","ip":"122.0.65.70","login":"http://s70.hebexpo.com:7922/?operation=passcheck&username={name}&pass={password}","max_rooms":100,"name":"mycard","port":7911,"pvp":true,"register":"http://s70.hebexpo.com:7922/?pass={key}&operation=forceuserpass&username={name}&password={password}","server_type":"ygopro","updated_at":"2012-09-05T07:12:08+08:00"},
+    {"auth":false,"created_at":"2012-08-04T18:12:07+08:00","id":3,"index":"http://s70.hebexpo.com:7966/","ip":"122.0.65.70","login":"http://s70.hebexpo.com:7966/?operation=passcheck&username={name}&pass={password}","max_rooms":100,"name":"mycard-free","port":7955,"pvp":false,"register":"http://s70.hebexpo.com:7966/?pass={key}&operation=forceuserpass&username={name}&password={password}","server_type":"ygopro","updated_at":"2012-09-05T07:12:08+08:00"},
 	{"auth":false,"created_at":"2012-08-04T18:12:07+08:00","id":4,"index":"http://zh99998.66rpg.com:7988/","ip":"116.255.201.171","login":"http://zh99998.66rpg.com:7988/?operation=passcheck&username={name}&pass={password}","max_rooms":100,"name":"mycard-66rpg","port":7977,"pvp":false,"register":"http://zh99998.66rpg.com:7988/?pass={key}&operation=forceuserpass&username={name}&password={password}","server_type":"ygopro","updated_at":"2012-09-05T07:12:08+08:00"}
 ]
\ No newline at end of file