Merge pull request Flotype#179 from mrienstra/master

Updates to examples: package.json; CSS; JS.
bkeybmetz · Mar 6, 2012 · 1629218 · 1629218
2 parents cc73280 + 424243d
commit 1629218
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 26 deletions.
diff --git a/examples/express_example/package.json 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"
+  }
+} 
diff --git 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>
diff --git 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>
diff --git 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
@@ -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"
+  }
+} 
diff --git a/examples/multiroomchat_example/multiroomchat.html b/examples/multiroomchat_example/multiroomchat.html
@@ -8,20 +8,28 @@
 <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(){
     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
@@ -25,10 +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;
-  this.now.receiveMessage("SERVER", "You're now in " + this.now.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){

diff --git a/examples/multiroomchat_example/package.json 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"
+  }
+}