blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-20 08:12:16 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
ali 2018-11-02 11:22:28 +00:00 committed by GitHub
commit 619f93a499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -824,12 +824,12 @@ form.html
<form action="/" method="POST"> <form action="/" method="POST">
<p>Check some colors</p> <p>Check some colors</p>
<label for="red">Red</label> <label for="red">Red</label>
<input type="checkbox" name="colors[]" value="red" id="red" /> <input type="checkbox" name="colors[]" value="red" id="red">
<label for="green">Green</label> <label for="green">Green</label>
<input type="checkbox" name="colors[]" value="green" id="green" /> <input type="checkbox" name="colors[]" value="green" id="green">
<label for="blue">Blue</label> <label for="blue">Blue</label>
<input type="checkbox" name="colors[]" value="blue" id="blue" /> <input type="checkbox" name="colors[]" value="blue" id="blue">
<input type="submit" /> <input type="submit">
</form> </form>
``` ```
@ -1022,7 +1022,7 @@ func main() {
}) })
// listen and serve on 0.0.0.0:8080 // listen and serve on 0.0.0.0:8080
r.Run(":8080) r.Run(":8080")
} }
``` ```
@ -1160,7 +1160,7 @@ You may use custom delims
```go ```go
r := gin.Default() r := gin.Default()
r.Delims("{[{", "}]}") r.Delims("{[{", "}]}")
r.LoadHTMLGlob("/path/to/templates")) r.LoadHTMLGlob("/path/to/templates")
``` ```
#### Custom Template Funcs #### Custom Template Funcs

4
errors.go
View File

@ -24,8 +24,9 @@ const (
ErrorTypePrivate ErrorType = 1 << 0 ErrorTypePrivate ErrorType = 1 << 0
// ErrorTypePublic indicates a public error. // ErrorTypePublic indicates a public error.
ErrorTypePublic ErrorType = 1 << 1 ErrorTypePublic ErrorType = 1 << 1
// ErrorTypeAny indicates other any error. // ErrorTypeAny indicates any other error.
ErrorTypeAny ErrorType = 1<<64 - 1 ErrorTypeAny ErrorType = 1<<64 - 1
// ErrorTypeNu indicates any other error.
ErrorTypeNu = 2 ErrorTypeNu = 2
) )
@ -52,6 +53,7 @@ func (msg *Error) SetMeta(data interface{}) *Error {
return msg return msg
} }
// JSON creates a properly formated JSON
func (msg *Error) JSON() interface{} { func (msg *Error) JSON() interface{} {
json := H{} json := H{}
if msg.Meta != nil { if msg.Meta != nil {

10
examples/realtime-advanced/resources/room_login.templ.html
View File

@ -20,7 +20,7 @@
<!-- Latest compiled and minified JavaScript --> <!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<!-- Primjs --> <!-- Primjs -->
<link href="/static/prismjs.min.css" rel="stylesheet" /> <link href="/static/prismjs.min.css" rel="stylesheet">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -79,19 +79,19 @@
<label class="sr-only" for="chat-message">Message</label> <label class="sr-only" for="chat-message">Message</label>
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{{.nick}}</div> <div class="input-group-addon">{{.nick}}</div>
<input type="text" name="message" id="chat-message" class="form-control" placeholder="a message" value="" /> <input type="text" name="message" id="chat-message" class="form-control" placeholder="a message" value="">
</div> </div>
</div> </div>
<input type="submit" class="btn btn-primary" value="Send" /> <input type="submit" class="btn btn-primary" value="Send">
</form> </form>
{{else}} {{else}}
<form action="" method="get" class="form-inline"> <form action="" method="get" class="form-inline">
<legend>Join the SSE real-time chat</legend> <legend>Join the SSE real-time chat</legend>
<div class="form-group"> <div class="form-group">
<input value='' name="nick" id="nick" placeholder="Your Name" type="text" class="form-control" /> <input value='' name="nick" id="nick" placeholder="Your Name" type="text" class="form-control">
</div> </div>
<div class="form-group text-center"> <div class="form-group text-center">
<input type="submit" class="btn btn-success btn-login-submit" value="Join" /> <input type="submit" class="btn btn-success btn-login-submit" value="Join">
</div> </div>
</form> </form>
{{end}} {{end}}

8
examples/realtime-chat/template.go
View File

@ -6,7 +6,7 @@ var html = template.Must(template.New("chat_room").Parse(`
<html> <html>
<head> <head>
<title>{{.roomid}}</title> <title>{{.roomid}}</title>
<link rel="stylesheet" type="text/css" href="http://meyerweb.com/eric/tools/css/reset/reset.css"/> <link rel="stylesheet" type="text/css" href="http://meyerweb.com/eric/tools/css/reset/reset.css">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.js"></script>
<script src="http://malsup.github.com/jquery.form.js"></script> <script src="http://malsup.github.com/jquery.form.js"></script>
<script> <script>
@ -35,9 +35,9 @@ var html = template.Must(template.New("chat_room").Parse(`
<h1>Welcome to {{.roomid}} room</h1> <h1>Welcome to {{.roomid}} room</h1>
<div id="messages"></div> <div id="messages"></div>
<form id="myForm" action="/room/{{.roomid}}" method="post"> <form id="myForm" action="/room/{{.roomid}}" method="post">
User: <input id="user_form" name="user" value="{{.userid}}"></input> User: <input id="user_form" name="user" value="{{.userid}}">
Message: <input id="message_form" name="message"></input> Message: <input id="message_form" name="message">
<input type="submit" value="Submit" /> <input type="submit" value="Submit">
</form> </form>
</body> </body>
</html> </html>

4
mode.go
View File

@ -28,7 +28,7 @@ const (
testCode testCode
) )
// DefaultWriter is the default io.Writer used the Gin for debug output and // DefaultWriter is the default io.Writer used by Gin for debug output and
// middleware output like Logger() or Recovery(). // middleware output like Logger() or Recovery().
// Note that both Logger and Recovery provides custom ways to configure their // Note that both Logger and Recovery provides custom ways to configure their
// output io.Writer. // output io.Writer.
@ -36,6 +36,8 @@ const (
// import "github.com/mattn/go-colorable" // import "github.com/mattn/go-colorable"
// gin.DefaultWriter = colorable.NewColorableStdout() // gin.DefaultWriter = colorable.NewColorableStdout()
var DefaultWriter io.Writer = os.Stdout var DefaultWriter io.Writer = os.Stdout
// DefaultErrorWriter is the default io.Writer used by Gin to debug errors
var DefaultErrorWriter io.Writer = os.Stderr var DefaultErrorWriter io.Writer = os.Stderr
var ginMode = debugCode var ginMode = debugCode