Skip to content
Browse files

Merge branch 'master' of github.com:Flotype/now

  • Loading branch information...
2 parents 9f62700 + f3830da commit 5db90c03096b23a03da0036419960e04e6040bf4 @sridatta sridatta committed Sep 12, 2011
View
2 doc/public/best_practices.md
@@ -16,6 +16,6 @@ We try to make remote functions and variables as natural to use as local ones. B
Further Reading
----------------------
-Now that you've read the Best Practices guide, try the NowJS [User Manual](http://nowjs.com/doc) and [Quick Start](http://nowjs.com/guide)
+Now that you've read the Best Practices guide, try the NowJS [User Manual](http://nowjs.org/doc) and [Quick Start](http://nowjs.org/guide)
Have more questions? You can reach us in #nowjs on freenode
View
2 doc/public/company.md
@@ -5,4 +5,4 @@ Based in Berkeley, California, Flotype Inc. was founded by three UC Berkeley com
Led by a top-notch engineering and sales team, Flotype sells an enterprise-level, production ready version of NowJS that operates across a cluster of NowJS servers, scaling to hundreds of thousands of concurrent users.
-For more information, email team@nowjs.com
+For more information, email team@nowjs.org
View
2 doc/public/getting_started.md
@@ -77,6 +77,6 @@ That's all there is to building things in NowJS. Armed with this knowledge, you
Further Reading
----------------------
-Now that you've read the Getting Started guide, try the NowJS [User Manual](http://nowjs.com/doc) and [Best Practices](http://nowjs.com/bestpractices)
+Now that you've read the Getting Started guide, try the NowJS [User Manual](http://nowjs.org/doc) and [Best Practices](http://nowjs.org/bestpractices)
Have more questions? You can reach us in #nowjs on freenode
View
4 doc/public/user_manual.md
@@ -364,7 +364,7 @@ Further Reading
----------------------
Now that you've read the User Manual guide, try the NowJS
-[Quick Start](http://nowjs.com/guide) and
-[Best Practices](http://nowjs.com/bestpractices)
+[Quick Start](http://nowjs.org/guide) and
+[Best Practices](http://nowjs.org/bestpractices)
Have more questions? You can reach us in #nowjs on freenode.
View
29 examples/helloworld_example/helloworld_server.js
@@ -13,42 +13,13 @@ var everyone = nowjs.initialize(server);
nowjs.on("connect", function(){
- group.addUser(this.user.clientId);
console.log("Joined: " + this.now.name);
});
nowjs.on("disconnect", function(){
console.log("Left: " + this.now.name);
});
-everyone.on('join', function(){
- console.log("joined " + this.now.name);
-});
-
-
-everyone.on('leave', function(){
- console.log("left " + this.now.name);
-});
-
-
-
-
-var group = nowjs.getGroup('x');
-
-
-everyone.now.add = function(){
-
- group.now.x = {};
- group.now.x.a = 1;
- group.now.x.b = function(){console.log('hello'); everyone.now.receiveMessage('hi', 'hi')}
-}
-
-everyone.now.test = function(){group.now.x.b();};
-
-everyone.now.exclude = function(){
- group = group.exclude(this.user.clientId);
-}
-
everyone.now.distributeMessage = function(message){
everyone.now.receiveMessage(this.now.name, message);
View
4 lib/scopeTable.js
@@ -45,7 +45,7 @@ ScopeTable.prototype.deleteVar = function (fqn) {
var lastIndex = fqn.lastIndexOf('.');
var parent = fqn.substring(0, lastIndex);
- if (nowUtil.hasProperty(this.data, fqn)) {
+ if (nowUtil.hasProperty(this.data, parent)) {
// Remove from its parent.
var index = this.data[parent].indexOf(fqn.substring(lastIndex + 1));
if (index > -1) {
@@ -61,4 +61,4 @@ ScopeTable.prototype.flagAsArray = function (fqn, len) {
return (this.arrays[fqn] = len);
};
-exports.ScopeTable = ScopeTable;
+exports.ScopeTable = ScopeTable;
View
6 readme.md
@@ -1,4 +1,4 @@
-Get NowJS http://www.nowjs.com/
+Get NowJS http://www.nowjs.org/
=========
###NowJS makes realtime web apps really easy.
@@ -75,10 +75,10 @@ You do not need to host the file /nowjs/now.js. It is automatically hosted by th
Further Reading
---------------
-Now that you have NowJS, try the NowJS [User Manual](http://nowjs.com/doc) and [Quick Chat Example](http://nowjs.com/guide)
+Now that you have NowJS, try the NowJS [User Manual](http://nowjs.org/doc) and [Quick Chat Example](http://nowjs.org/guide)
Have more questions? Please contact us:
-Email: team@nowjs.com
+Email: team@nowjs.org
IRC: [#nowjs on freenode](http://webchat.freenode.net/?nick=nowjs.&channels=nowjs)

0 comments on commit 5db90c0

Please sign in to comment.
Something went wrong with that request. Please try again.