修改readme 支持火狐

boiawang · boiawang · commit 1b3f0a200cbe · 2014-07-28T15:51:24.000+08:00
diff --git a/README.md b/README.md
@@ -7,3 +7,7 @@
 - Node
 - Mongoose
 
+## author
+
+site: [http://www.boiajs.com](http://www.boiajs.com)
+github: [http://github.com/boiawang](http://github.com/boiawang)
diff --git a/public/css/chat_web.css b/public/css/chat_web.css
diff --git a/public/css/chat_web.css.map b/public/css/chat_web.css.map
diff --git a/public/css/chat_web.min.css b/public/css/chat_web.min.css
diff --git a/public/js/custom.js b/public/js/custom.js
@@ -45,9 +45,11 @@ jQuery(function($) {
 
     // 发送消息
     $('.btn-send').on('click', function(event) {
-        var content = $('.msg-input-box').text().empty();
+        var content = $('.msg-input-box').text();
         var user = $('.login-box').data('user');
 
+        $('.msg-input-box').empty();
+
         socket.emit('send-msg', {
             user: user,
             content: content
diff --git a/public/sass/_chatBox.scss b/public/sass/_chatBox.scss
@@ -12,7 +12,7 @@
 	& > .head{
 		height: 128px;
 
-		background-image:  -webkit-linear-gradient(#86c6ee,#4ca2d5);
+		@include background-gradient-linear(#86c6ee,#4ca2d5);
 	}
 	
 	.col-1{
@@ -25,7 +25,7 @@
 		
 		.toolbar{
 			height: 25px;
-			background-image:  -webkit-linear-gradient(left,#bdd9ea,#deecf5);
+			@include background-gradient-linear(#bdd9ea,#deecf5,left);
 		}
 
 		.msg-input-box{
diff --git a/public/sass/_minixs.scss b/public/sass/_minixs.scss
@@ -0,0 +1,4 @@
+@mixin background-gradient-linear($from, $end, $pos: top) {
+	background-image: -webkit-linear-gradient($pos, $from, $end);
+	background-image: -moz-linear-gradient($pos, $from, $end);
+}
diff --git a/public/sass/main.scss b/public/sass/main.scss
@@ -1,5 +1,6 @@
 @import "reset";
 @import "core";
+@import "minixs";
 
 @import "chatBox";
 @import "register";
diff --git a/routes/index.js b/routes/index.js
@@ -2,7 +2,7 @@ var express = require('express');
 var router = express.Router();
 
 var User = require('mongoose').model('User');;
-var chatServer = require('../server');
+var userList = require('../server').userList;
 
 var fs = require('fs');
 var projectData;
@@ -13,7 +13,8 @@ fs.readFile('package.json', function(error, data) {
 
 router.get('/', function(req, res) {
     res.render('index', {
-        title: '聊天室'
+        title: '聊天室',
+        session: req.session
     });
 });
 
@@ -38,14 +39,15 @@ router.post('/register', function(req, res) {
 
             user.save(function(err, user) {
                 req.session.myUser = userName;
+                userList.push(userName);
                 if (!err) {
                     /*return res.render('room', {
                         myUser: userName,
                         isLogin: true,
                         title: '房间',
-                        users: chatServer.userList
+                        users: userList
                     });*/
-                    return res.redirect('/');
+                    return res.redirect('/room');
                 }
             });
         }
@@ -70,7 +72,8 @@ router.post('/login', function(req, res) {
 router.get('/room', function(req, res) {
     res.render('room', {
         title: '房间',
-        users: chatServer.userList
+        users: userList,
+        session: req.session
     });
 });
 
diff --git a/views/room.ejs b/views/room.ejs
@@ -1,9 +1,13 @@
 <% include head %>
 <body>
 	<span class="login-box">
+		<% if(!session.myUser){ %>
 		<label for="username">用户名: </label>
 		<input class="username" id="username" name="username" />
 		<button class="btn-login">登陆</button>
+		<% }else{ %>
+			<%= session.myUser %>已登录
+		<% } %>
 	</span>
 	<div class="chat-room-box clearfix">	
 		<div class="head"></div>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`& > .head{`
`13`	`13`	`height: 128px;`
`14`	`14`
`15`		`- background-image: -webkit-linear-gradient(#86c6ee,#4ca2d5);`
	`15`	`+ @include background-gradient-linear(#86c6ee,#4ca2d5);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`.col-1{`
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`.toolbar{`
`27`	`27`	`height: 25px;`
`28`		`- background-image: -webkit-linear-gradient(left,#bdd9ea,#deecf5);`
	`28`	`+ @include background-gradient-linear(#bdd9ea,#deecf5,left);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`.msg-input-box{`