From f782ebf837f818c57faf964869abab846d74e896 Mon Sep 17 00:00:00 2001
From: Michael Rienstra <mrienstra@gmail.com>
Date: Fri, 17 Feb 2012 15:20:36 -0800
Subject: [PATCH 1/4] Updates to examples/express_example: Added package.json;
 Improved styling; Improved JS.

---
 examples/express_example/package.json    | 19 +++++++++++++
 examples/express_example/views/chat.ejs  | 35 +++++++++++++++---------
 examples/express_example/views/index.ejs | 11 ++++----
 3 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 examples/express_example/package.json

diff --git a/examples/express_example/package.json b/examples/express_example/package.json
new file mode 100644
index 0000000..b108a0c
--- /dev/null
+++ b/examples/express_example/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "nowjs-express-example",
+  "version": "0.0.2",
+  "author": "ericz (Eric Zhang) <eric@nowjs.com>",
+  "description": "This is an example of an embedded chat window added to any site.",
+  "keywords": [
+    "nowjs",
+    "express",
+    "example"
+  ],
+  "dependencies" : {
+    "now"     :  ">=0.7",
+    "express" :  ">=2.4",
+    "ejs"     :  ">=0.5"
+  },
+  "engine": {
+    "node": ">=0.4"
+  }
+} 
\ No newline at end of file
diff --git a/examples/express_example/views/chat.ejs b/examples/express_example/views/chat.ejs
index 00f7dd0..0b88b9f 100644
--- a/examples/express_example/views/chat.ejs
+++ b/examples/express_example/views/chat.ejs
@@ -6,19 +6,28 @@
 </div>
 
 <script>
-    $(document).ready(function(){
-
-      now.receiveMessage = function(name, message){
-        $("#messages").append("<br>" + name + ": " + message);
+  $(document).ready(function(){
+    
+    now.receiveMessage = function(name, message){
+      $("#messages").append("<br>" + name + ": " + message);
+    }
+    
+    $("#send-button").click(function(){
+      now.distributeMessage($("#text-input").val());
+      $("#text-input").val("");
+      $("#text-input").focus();
+    });
+    
+    $("#text-input").keypress(function (e) {
+      if (e.which && e.which === 13) {
+        $("#send-button").click();
+        return false;
       }
-
-      $("#send-button").click(function(){
-        now.distributeMessage($("#text-input").val());
-        $("#text-input").val("");
-        $("#text-input").focus();
-      });
-
-      now.name = prompt("What's your name?", "");
-
     });
+    
+    now.name = prompt("What's your name?", "");
+    
+    $("#text-input").focus();
+    
+  });
 </script>
\ No newline at end of file
diff --git a/examples/express_example/views/index.ejs b/examples/express_example/views/index.ejs
index 44d7595..9b662bf 100644
--- a/examples/express_example/views/index.ejs
+++ b/examples/express_example/views/index.ejs
@@ -1,13 +1,12 @@
 <h1><%= title %></h1>
 <p>Welcome to <%= title %></p>
 <p>This is an example of an embedded chat window added to any site. <a href='#' id='chat'>Chat with us</a></p>
-<div id="floater" style="position: absolute; right: 0; top:0; width="25%" height="100%"></div>
+<div id="floater" style="position: absolute; right: 0; top:0; width: 300px; height: 100%;"></div>
 <script>
-    $(document).ready(function() {
+  $(document).ready(function() {
     $('#chat').click(function(e) {
-        e.preventDefault();
-        $('<iframe width="300px" height="100%" sandbox="allow-same-origin allow-forms allow-scripts" src="http://localhost:8080/chat"></iframe>').appendTo('#floater');
-        });
-
+      e.preventDefault();
+      $('#floater').css("border-left", "1px solid #000").append('<iframe style="width: 300px; border: 0;" sandbox="allow-same-origin allow-forms allow-scripts" src="http://localhost:8080/chat"></iframe>');
     });
+  });
 </script>
\ No newline at end of file

From ec78b9e7bc608d5f97b898107a0dce547ee78b07 Mon Sep 17 00:00:00 2001
From: Michael Rienstra <mrienstra@gmail.com>
Date: Fri, 17 Feb 2012 15:38:35 -0800
Subject: [PATCH 2/4] Updates to examples/helloworld_example: Added
 package.json; Improved JS.

---
 examples/helloworld_example/helloworld.html | 11 +++++++++--
 examples/helloworld_example/package.json    | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 examples/helloworld_example/package.json

diff --git a/examples/helloworld_example/helloworld.html b/examples/helloworld_example/helloworld.html
index d2afd1a..e2be934 100644
--- a/examples/helloworld_example/helloworld.html
+++ b/examples/helloworld_example/helloworld.html
@@ -16,9 +16,16 @@
     $("#text-input").val("");
   });
   
-
+  $("#text-input").keypress(function (e) {
+    if (e.which && e.which === 13) {
+      $("#send-button").click();
+      return false;
+    }
+  });
+  
   now.name = prompt("What's your name?", "");
-
+  
+  $("#text-input").focus();
 });
 </script>
 </head>
diff --git a/examples/helloworld_example/package.json b/examples/helloworld_example/package.json
new file mode 100644
index 0000000..7782588
--- /dev/null
+++ b/examples/helloworld_example/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "nowjs-helloworld-example",
+  "version": "0.0.6",
+  "author": "ericz (Eric Zhang) <eric@nowjs.com>",
+  "description": "'Hello world' example for NowJS.",
+  "keywords": [
+    "nowjs",
+    "example"
+  ],
+  "dependencies" : {
+    "now"     :  ">=0.7"
+  },
+  "engine": {
+    "node": ">=0.4"
+  }
+} 
\ No newline at end of file

From 35da8b93fe354f3b3c3d24b9842dae81664f5c06 Mon Sep 17 00:00:00 2001
From: Michael Rienstra <mrienstra@gmail.com>
Date: Fri, 17 Feb 2012 15:58:03 -0800
Subject: [PATCH 3/4] Updates to examples/multiroomchat_example: Added
 package.json; Added count of others in room; Improved JS.

---
 .../multiroomchat_example/multiroomchat.html     | 14 +++++++++++---
 .../multiroomchat_server.js                      |  3 ++-
 examples/multiroomchat_example/package.json      | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 examples/multiroomchat_example/package.json

diff --git a/examples/multiroomchat_example/multiroomchat.html b/examples/multiroomchat_example/multiroomchat.html
index b260a41..9e6e2ee 100644
--- a/examples/multiroomchat_example/multiroomchat.html
+++ b/examples/multiroomchat_example/multiroomchat.html
@@ -15,13 +15,21 @@
     now.distributeMessage($("#text-input").val());
     $("#text-input").val("");
   });
-
+  
   $(".change").click(function(){
     now.changeRoom($(this).text());
   });
-
+  
+  $("#text-input").keypress(function (e) {
+    if (e.which && e.which === 13) {
+      $("#send-button").click();
+      return false;
+    }
+  });
+  
   now.name = prompt("What's your name?", "");
-
+  
+  $("#text-input").focus();
 });
 </script>
 </head>
diff --git a/examples/multiroomchat_example/multiroomchat_server.js b/examples/multiroomchat_example/multiroomchat_server.js
index 1e248d4..87f275e 100644
--- a/examples/multiroomchat_example/multiroomchat_server.js
+++ b/examples/multiroomchat_example/multiroomchat_server.js
@@ -28,7 +28,8 @@ everyone.now.changeRoom = function(newRoom){
   nowjs.getGroup(this.now.room).removeUser(this.user.clientId);
   nowjs.getGroup(newRoom).addUser(this.user.clientId);
   this.now.room = newRoom;
-  this.now.receiveMessage("SERVER", "You're now in " + this.now.room);
+  var others = Object.keys(nowjs.getGroup(this.now.room).users).length - 1;
+  this.now.receiveMessage("SERVER", "You're now in " + this.now.room + " (" + others + " other(s) in this room).");
 }
 
 everyone.now.distributeMessage = function(message){
diff --git a/examples/multiroomchat_example/package.json b/examples/multiroomchat_example/package.json
new file mode 100644
index 0000000..7782588
--- /dev/null
+++ b/examples/multiroomchat_example/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "nowjs-helloworld-example",
+  "version": "0.0.6",
+  "author": "ericz (Eric Zhang) <eric@nowjs.com>",
+  "description": "'Hello world' example for NowJS.",
+  "keywords": [
+    "nowjs",
+    "example"
+  ],
+  "dependencies" : {
+    "now"     :  ">=0.7"
+  },
+  "engine": {
+    "node": ">=0.4"
+  }
+} 
\ No newline at end of file

From 424243d2ab05055bff32d9255c9c8d5c357ea8b1 Mon Sep 17 00:00:00 2001
From: Michael Rienstra <mrienstra@gmail.com>
Date: Mon, 20 Feb 2012 15:48:56 -0800
Subject: [PATCH 4/4] Retrieving room count in a better way (using Group count
 method instead of counting the Group users property). Added notification of
 leaving and entering -- though this is a bit crude, may be better to leave it
 out, rather than show it being done somewhat poorly.

---
 examples/multiroomchat_example/multiroomchat.html      | 2 +-
 examples/multiroomchat_example/multiroomchat_server.js | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/examples/multiroomchat_example/multiroomchat.html b/examples/multiroomchat_example/multiroomchat.html
index 9e6e2ee..dc61388 100644
--- a/examples/multiroomchat_example/multiroomchat.html
+++ b/examples/multiroomchat_example/multiroomchat.html
@@ -8,7 +8,7 @@
 <script>
 $(document).ready(function(){
   now.receiveMessage = function(name, message){
-    $("#messages").append("<br>" + name + ": " + message);
+    $("#messages").append("<br><b>" + name + "</b>: " + message);
   }
   
   $("#send-button").click(function(){
diff --git a/examples/multiroomchat_example/multiroomchat_server.js b/examples/multiroomchat_example/multiroomchat_server.js
index 87f275e..b2209ed 100644
--- a/examples/multiroomchat_example/multiroomchat_server.js
+++ b/examples/multiroomchat_example/multiroomchat_server.js
@@ -25,11 +25,16 @@ nowjs.on('disconnect', function(){
 });
 
 everyone.now.changeRoom = function(newRoom){
+  this.now.distributeMessage("[leaving " + this.now.room + "]");
   nowjs.getGroup(this.now.room).removeUser(this.user.clientId);
   nowjs.getGroup(newRoom).addUser(this.user.clientId);
   this.now.room = newRoom;
-  var others = Object.keys(nowjs.getGroup(this.now.room).users).length - 1;
-  this.now.receiveMessage("SERVER", "You're now in " + this.now.room + " (" + others + " other(s) in this room).");
+  this.now.distributeMessage("[entering " + this.now.room + "]");
+  var that = this;
+  nowjs.getGroup(this.now.room).count(function(count){
+    var prettyCount = (count === 1) ? "Room is empty." : (count - 1) + " other(s) in room.";
+    that.now.receiveMessage("SERVER", "You're now in " + that.now.room + ". " + prettyCount);
+  });
 }
 
 everyone.now.distributeMessage = function(message){