diff --git a/HISTORY.md b/HISTORY.md index 0e741499..fe4c3436 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -28,6 +28,8 @@ The codebase for Dependency Injection, Internationalization and localization and ## Fixes and Improvements +- **Breaking-change**: HTML template functions `yield`, `part`, `partial`, `partial_r` and `render` now accept (and require for some cases) a second argument of the binding data context too. Convert: `{{ yield }}` to `{{ yield . }}`, `{{ render "templates/mytemplate.html" }}` to `{{ render "templates/mytemplate.html" . }}`, `{{ partial "partials/mypartial.html" }}` to `{{ partial "partials/mypartial.html" . }}` and so on. + - Add new `URLParamSeparator` to the configuration. Defaults to "," but can be set to an empty string to disable splitting query values on `Context.URLParamSlice` method. - [PR #1992](https://github.com/kataras/iris/pull/1992): Added support for third party packages on [httptest](https://github.com/kataras/iris/tree/master/httptest). An example using 3rd-party module named [Ginkgo](github.com/onsi/ginkgo) can be found [here](https://github.com/kataras/iris/blob/master/_examples/testing/ginkgotest). diff --git a/_benchmarks/view/ace/main.go b/_benchmarks/view/ace/main.go index b5f32ea6..4bd1bf10 100644 --- a/_benchmarks/view/ace/main.go +++ b/_benchmarks/view/ace/main.go @@ -20,5 +20,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/ace/views/layouts/main.ace b/_benchmarks/view/ace/views/layouts/main.ace index d90a58fe..b1e74baa 100644 --- a/_benchmarks/view/ace/views/layouts/main.ace +++ b/_benchmarks/view/ace/views/layouts/main.ace @@ -3,6 +3,6 @@ html head title {{.Title}} body - {{ yield }} + {{ yield . . }} footer = include partials/footer.ace . diff --git a/_benchmarks/view/amber/main.go b/_benchmarks/view/amber/main.go index 742fd668..4b63f684 100644 --- a/_benchmarks/view/amber/main.go +++ b/_benchmarks/view/amber/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { // On Amber this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/blocks/main.go b/_benchmarks/view/blocks/main.go index 5a9957ed..62b86b4c 100644 --- a/_benchmarks/view/blocks/main.go +++ b/_benchmarks/view/blocks/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/blocks/views/layouts/main.html b/_benchmarks/view/blocks/views/layouts/main.html index 934080b2..7686db90 100644 --- a/_benchmarks/view/blocks/views/layouts/main.html +++ b/_benchmarks/view/blocks/views/layouts/main.html @@ -1 +1 @@ -{{.Title}}{{ template "content" . }} \ No newline at end of file +{{.Title}}{{ template "content" . }} \ No newline at end of file diff --git a/_benchmarks/view/django/main.go b/_benchmarks/view/django/main.go index 4c625c49..ad6cc034 100644 --- a/_benchmarks/view/django/main.go +++ b/_benchmarks/view/django/main.go @@ -21,5 +21,8 @@ func index(ctx iris.Context) { // On Django this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/handlebars/main.go b/_benchmarks/view/handlebars/main.go index 0cd5c701..70daefe5 100644 --- a/_benchmarks/view/handlebars/main.go +++ b/_benchmarks/view/handlebars/main.go @@ -19,5 +19,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/handlebars/views/layouts/main.html b/_benchmarks/view/handlebars/views/layouts/main.html index 50a79f87..c37a0de8 100644 --- a/_benchmarks/view/handlebars/views/layouts/main.html +++ b/_benchmarks/view/handlebars/views/layouts/main.html @@ -1 +1 @@ -{{Title}}{{ yield }} \ No newline at end of file +{{Title}}{{ yield . }} \ No newline at end of file diff --git a/_benchmarks/view/html/main.go b/_benchmarks/view/html/main.go index 214c4b11..494f1c76 100644 --- a/_benchmarks/view/html/main.go +++ b/_benchmarks/view/html/main.go @@ -20,5 +20,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/html/views/layouts/main.html b/_benchmarks/view/html/views/layouts/main.html index 379a5ffa..398a0aad 100644 --- a/_benchmarks/view/html/views/layouts/main.html +++ b/_benchmarks/view/html/views/layouts/main.html @@ -1 +1 @@ -{{.Title}}{{ yield }} \ No newline at end of file +{{.Title}}{{ yield . }} \ No newline at end of file diff --git a/_benchmarks/view/jet/main.go b/_benchmarks/view/jet/main.go index c5888759..aa28cdf6 100644 --- a/_benchmarks/view/jet/main.go +++ b/_benchmarks/view/jet/main.go @@ -21,5 +21,8 @@ func index(ctx iris.Context) { // On Jet this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_benchmarks/view/pug/main.go b/_benchmarks/view/pug/main.go index fd4e340e..aa1affca 100644 --- a/_benchmarks/view/pug/main.go +++ b/_benchmarks/view/pug/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { // On Pug this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/auth/auth/main.go b/_examples/auth/auth/main.go index eca0be59..4858eee1 100644 --- a/_examples/auth/auth/main.go +++ b/_examples/auth/auth/main.go @@ -118,7 +118,10 @@ func main() { } func renderSigninForm(ctx iris.Context) { - ctx.View("signin", iris.Map{"Title": "Signin Page"}) + if err := ctx.View("signin", iris.Map{"Title": "Signin Page"}); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func renderMemberPage(s *auth.Auth[User]) iris.Handler { diff --git a/_examples/auth/auth/views/layouts/main.html b/_examples/auth/auth/views/layouts/main.html index c6efd56d..b44c3648 100644 --- a/_examples/auth/auth/views/layouts/main.html +++ b/_examples/auth/auth/views/layouts/main.html @@ -24,7 +24,7 @@
{{ template "content" . }}
- +
\ No newline at end of file diff --git a/_examples/auth/goth/main.go b/_examples/auth/goth/main.go index 9fc4f4b1..0a188cfb 100644 --- a/_examples/auth/goth/main.go +++ b/_examples/auth/goth/main.go @@ -377,9 +377,12 @@ func main() { // ctx.View("user.html", user) // // Directly (user as .user variable): - ctx.View("user.html", iris.Map{ + if err := ctx.View("user.html", iris.Map{ "user": user, - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/logout/{provider}", func(ctx iris.Context) { @@ -395,11 +398,17 @@ func main() { return } - ctx.View("user.html", gothUser) + if err := ctx.View("user.html", gothUser); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/", func(ctx iris.Context) { - ctx.View("index.html", providerIndex) + if err := ctx.View("index.html", providerIndex); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // http://localhost:3000 diff --git a/_examples/auth/hcaptcha/main.go b/_examples/auth/hcaptcha/main.go index 87e917ac..7d4e9298 100644 --- a/_examples/auth/hcaptcha/main.go +++ b/_examples/auth/hcaptcha/main.go @@ -42,5 +42,8 @@ func register(ctx iris.Context) { func registerForm(ctx iris.Context) { ctx.ViewData("SiteKey", siteKey) - ctx.View("register_form.html") + if err := ctx.View("register_form.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/bootstrapper/bootstrap/bootstrapper.go b/_examples/bootstrapper/bootstrap/bootstrapper.go index 0d24c50c..4b2ddbf2 100644 --- a/_examples/bootstrapper/bootstrap/bootstrapper.go +++ b/_examples/bootstrapper/bootstrap/bootstrapper.go @@ -77,7 +77,10 @@ func (b *Bootstrapper) SetupErrorHandlers() { ctx.ViewData("Err", err) ctx.ViewData("Title", "Error") - ctx.View("shared/error.html") + if err := ctx.View("shared/error.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) } diff --git a/_examples/bootstrapper/routes/index.go b/_examples/bootstrapper/routes/index.go index 4ce214d4..5a314044 100644 --- a/_examples/bootstrapper/routes/index.go +++ b/_examples/bootstrapper/routes/index.go @@ -7,5 +7,8 @@ import ( // GetIndexHandler handles the GET: / func GetIndexHandler(ctx iris.Context) { ctx.ViewData("Title", "Index Page") - ctx.View("index.html") + if err := ctx.View("index.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/bootstrapper/views/shared/layout.html b/_examples/bootstrapper/views/shared/layout.html index cf920444..70891776 100644 --- a/_examples/bootstrapper/views/shared/layout.html +++ b/_examples/bootstrapper/views/shared/layout.html @@ -12,7 +12,7 @@
- {{ yield }} + {{ yield . }}
diff --git a/_examples/routing/subdomains/http-errors-view/views/layouts/layout.html b/_examples/routing/subdomains/http-errors-view/views/layouts/layout.html index e454f1fc..cd6fa3d5 100644 --- a/_examples/routing/subdomains/http-errors-view/views/layouts/layout.html +++ b/_examples/routing/subdomains/http-errors-view/views/layouts/layout.html @@ -7,6 +7,6 @@

This is the global layout


- {{ yield }} + {{ yield . }} diff --git a/_examples/routing/subdomains/http-errors-view/views/layouts/test.layout.html b/_examples/routing/subdomains/http-errors-view/views/layouts/test.layout.html index 8849bd75..957cee95 100644 --- a/_examples/routing/subdomains/http-errors-view/views/layouts/test.layout.html +++ b/_examples/routing/subdomains/http-errors-view/views/layouts/test.layout.html @@ -5,6 +5,6 @@ - {{ yield }} + {{ yield . }} diff --git a/_examples/routing/versioning/main.go b/_examples/routing/versioning/main.go index 3e18aa7e..052a87a3 100644 --- a/_examples/routing/versioning/main.go +++ b/_examples/routing/versioning/main.go @@ -98,5 +98,8 @@ func testError(v string) iris.Handler { } func testView(ctx iris.Context) { - ctx.View("index.html") + if err := ctx.View("index.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/sessions/viewdata/main.go b/_examples/sessions/viewdata/main.go index 44aae9c1..e20424b0 100644 --- a/_examples/sessions/viewdata/main.go +++ b/_examples/sessions/viewdata/main.go @@ -29,14 +29,17 @@ func setSessionViewData(ctx iris.Context) { func index(ctx iris.Context) { session := sessions.Get(ctx) session.Set("username", "kataras") - ctx.View("index") + if err := ctx.View("index"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } /* OR without middleware: - ctx.View("index", iris.Map{ - "session": session, - // {{.session.Get "username"}} - // OR to pass only the 'username': - // "username": session.Get("username"), - // {{.username}} - }) + if err := ctx.View("index", iris.Map{ + "session": session, + // {{.session.Get "username"}} + // OR to pass only the 'username': + // "username": session.Get("username"), + // {{.username}} + }) */ } diff --git a/_examples/url-shortener/main.go b/_examples/url-shortener/main.go index 8ce91c18..ac10db8d 100644 --- a/_examples/url-shortener/main.go +++ b/_examples/url-shortener/main.go @@ -50,7 +50,10 @@ func newApp(db *DB) *iris.Application { indexHandler := func(ctx iris.Context) { ctx.ViewData("URL_COUNT", db.Len()) - ctx.View("index.html") + if err := ctx.View("index.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } app.Get("/", indexHandler) diff --git a/_examples/view/context-view-data/templates/layouts/layout.html b/_examples/view/context-view-data/templates/layouts/layout.html index a4833774..4e0179c7 100644 --- a/_examples/view/context-view-data/templates/layouts/layout.html +++ b/_examples/view/context-view-data/templates/layouts/layout.html @@ -5,6 +5,6 @@ - {{ yield }} + {{ yield . . }} diff --git a/_examples/view/context-view-engine/main.go b/_examples/view/context-view-engine/main.go index ddc6d90f..22ee15ef 100644 --- a/_examples/view/context-view-engine/main.go +++ b/_examples/view/context-view-engine/main.go @@ -37,7 +37,10 @@ func index(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func admin(ctx iris.Context) { @@ -46,7 +49,10 @@ func admin(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func setViews(views iris.ViewEngine) iris.Handler { @@ -61,5 +67,8 @@ func onFly(ctx iris.Context) { "Message": "View engine changed through 'setViews' custom middleware.", } - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/context-view-engine/views/public/layouts/main.html b/_examples/view/context-view-engine/views/public/layouts/main.html index 5b5a509f..e2b112b3 100644 --- a/_examples/view/context-view-engine/views/public/layouts/main.html +++ b/_examples/view/context-view-engine/views/public/layouts/main.html @@ -8,6 +8,6 @@ {{ template "content" . }} - + \ No newline at end of file diff --git a/_examples/view/embedding-templates-into-app-bindata/main.go b/_examples/view/embedding-templates-into-app-bindata/main.go index ffd83683..fbecfdda 100644 --- a/_examples/view/embedding-templates-into-app-bindata/main.go +++ b/_examples/view/embedding-templates-into-app-bindata/main.go @@ -37,10 +37,16 @@ func main() { my := app.Party("/my").Layout("layouts/mylayout.html") { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) my.Get("/other", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) } diff --git a/_examples/view/embedding-templates-into-app-bindata/templates/layouts/layout.html b/_examples/view/embedding-templates-into-app-bindata/templates/layouts/layout.html index 69b545ec..929a31cd 100644 --- a/_examples/view/embedding-templates-into-app-bindata/templates/layouts/layout.html +++ b/_examples/view/embedding-templates-into-app-bindata/templates/layouts/layout.html @@ -7,6 +7,6 @@

This is the global layout


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/embedding-templates-into-app-bindata/templates/layouts/mylayout.html b/_examples/view/embedding-templates-into-app-bindata/templates/layouts/mylayout.html index d22426fe..4cbced18 100644 --- a/_examples/view/embedding-templates-into-app-bindata/templates/layouts/mylayout.html +++ b/_examples/view/embedding-templates-into-app-bindata/templates/layouts/mylayout.html @@ -7,6 +7,6 @@

This is the layout for the /my/ and /my/other routes only


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/embedding-templates-into-app-bindata/templates/page1.html b/_examples/view/embedding-templates-into-app-bindata/templates/page1.html index 6f63f7b3..03659b45 100644 --- a/_examples/view/embedding-templates-into-app-bindata/templates/page1.html +++ b/_examples/view/embedding-templates-into-app-bindata/templates/page1.html @@ -2,6 +2,6 @@

Page 1 {{ greet "iris developer"}}

- {{ render "partials/page1_partial1.html"}} + {{ render "partials/page1_partial1.html" . }} diff --git a/_examples/view/embedding-templates-into-app/embedded/templates/layouts/layout.html b/_examples/view/embedding-templates-into-app/embedded/templates/layouts/layout.html index 69b545ec..929a31cd 100644 --- a/_examples/view/embedding-templates-into-app/embedded/templates/layouts/layout.html +++ b/_examples/view/embedding-templates-into-app/embedded/templates/layouts/layout.html @@ -7,6 +7,6 @@

This is the global layout


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/embedding-templates-into-app/embedded/templates/layouts/mylayout.html b/_examples/view/embedding-templates-into-app/embedded/templates/layouts/mylayout.html index d22426fe..4cbced18 100644 --- a/_examples/view/embedding-templates-into-app/embedded/templates/layouts/mylayout.html +++ b/_examples/view/embedding-templates-into-app/embedded/templates/layouts/mylayout.html @@ -7,6 +7,6 @@

This is the layout for the /my/ and /my/other routes only


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/embedding-templates-into-app/embedded/templates/page1.html b/_examples/view/embedding-templates-into-app/embedded/templates/page1.html index 6f63f7b3..03659b45 100644 --- a/_examples/view/embedding-templates-into-app/embedded/templates/page1.html +++ b/_examples/view/embedding-templates-into-app/embedded/templates/page1.html @@ -2,6 +2,6 @@

Page 1 {{ greet "iris developer"}}

- {{ render "partials/page1_partial1.html"}} + {{ render "partials/page1_partial1.html" . }} diff --git a/_examples/view/embedding-templates-into-app/main.go b/_examples/view/embedding-templates-into-app/main.go index 2fc45ed6..b6f5d2ca 100644 --- a/_examples/view/embedding-templates-into-app/main.go +++ b/_examples/view/embedding-templates-into-app/main.go @@ -4,7 +4,6 @@ import ( "embed" "github.com/kataras/iris/v12" - "github.com/kataras/iris/v12/x/errors" ) //go:embed embedded/* @@ -24,7 +23,7 @@ func main() { app.Get("/", func(ctx iris.Context) { if err := ctx.View("page1.html"); err != nil { - errors.InvalidArgument.Err(ctx, err) + ctx.HTML("

%s

", err.Error()) return } }) @@ -33,7 +32,7 @@ func main() { app.Get("/nolayout", func(ctx iris.Context) { ctx.ViewLayout(iris.NoLayout) if err := ctx.View("page1.html"); err != nil { - errors.InvalidArgument.Err(ctx, err) + ctx.HTML("

%s

", err.Error()) return } }) @@ -42,10 +41,16 @@ func main() { my := app.Party("/my").Layout("layouts/mylayout.html") { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) my.Get("/other", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) } diff --git a/_examples/view/fallback/main.go b/_examples/view/fallback/main.go index 47837866..067744b7 100644 --- a/_examples/view/fallback/main.go +++ b/_examples/view/fallback/main.go @@ -38,5 +38,8 @@ func main() { // } func index(ctx iris.Context) { - ctx.View("blabla.html") + if err := ctx.View("blabla.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/ace/main.go b/_examples/view/layout/ace/main.go index a73cebe5..e3d05eef 100644 --- a/_examples/view/layout/ace/main.go +++ b/_examples/view/layout/ace/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/ace/views/layouts/main.ace b/_examples/view/layout/ace/views/layouts/main.ace index 010cb9fe..d17414b3 100644 --- a/_examples/view/layout/ace/views/layouts/main.ace +++ b/_examples/view/layout/ace/views/layouts/main.ace @@ -3,6 +3,6 @@ html head title {{.Title}} body - {{ yield }} + {{ yield . }} footer = include partials/footer.ace . \ No newline at end of file diff --git a/_examples/view/layout/amber/main.go b/_examples/view/layout/amber/main.go index c0b95b3b..92195ee3 100644 --- a/_examples/view/layout/amber/main.go +++ b/_examples/view/layout/amber/main.go @@ -21,5 +21,8 @@ func index(ctx iris.Context) { // On Amber this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/blocks/main.go b/_examples/view/layout/blocks/main.go index 5a9957ed..62b86b4c 100644 --- a/_examples/view/layout/blocks/main.go +++ b/_examples/view/layout/blocks/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/blocks/views/layouts/main.html b/_examples/view/layout/blocks/views/layouts/main.html index e033deef..e8bd6089 100644 --- a/_examples/view/layout/blocks/views/layouts/main.html +++ b/_examples/view/layout/blocks/views/layouts/main.html @@ -5,7 +5,7 @@ {{ template "content" . }} \ No newline at end of file diff --git a/_examples/view/layout/django/main.go b/_examples/view/layout/django/main.go index 4c625c49..ad6cc034 100644 --- a/_examples/view/layout/django/main.go +++ b/_examples/view/layout/django/main.go @@ -21,5 +21,8 @@ func index(ctx iris.Context) { // On Django this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/handlebars/main.go b/_examples/view/layout/handlebars/main.go index 8d30373d..7b62c7b8 100644 --- a/_examples/view/layout/handlebars/main.go +++ b/_examples/view/layout/handlebars/main.go @@ -20,5 +20,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/handlebars/views/layouts/main.html b/_examples/view/layout/handlebars/views/layouts/main.html index dcb98620..1dd581b8 100644 --- a/_examples/view/layout/handlebars/views/layouts/main.html +++ b/_examples/view/layout/handlebars/views/layouts/main.html @@ -3,7 +3,7 @@ {{Title}} - {{ yield }} + {{ yield . }} diff --git a/_examples/view/layout/html/main.go b/_examples/view/layout/html/main.go index 214c4b11..494f1c76 100644 --- a/_examples/view/layout/html/main.go +++ b/_examples/view/layout/html/main.go @@ -20,5 +20,8 @@ func index(ctx iris.Context) { } ctx.ViewLayout("layouts/main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/html/views/layouts/main.html b/_examples/view/layout/html/views/layouts/main.html index fe646117..898f7f60 100644 --- a/_examples/view/layout/html/views/layouts/main.html +++ b/_examples/view/layout/html/views/layouts/main.html @@ -3,9 +3,9 @@ {{.Title}} -{{ yield }} +{{ yield . }} \ No newline at end of file diff --git a/_examples/view/layout/jet/main.go b/_examples/view/layout/jet/main.go index 50350396..075266b3 100644 --- a/_examples/view/layout/jet/main.go +++ b/_examples/view/layout/jet/main.go @@ -22,5 +22,8 @@ func index(ctx iris.Context) { // On Jet this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/layout/jet/views/layouts/main.jet b/_examples/view/layout/jet/views/layouts/main.jet index e896d1e0..39a625cd 100644 --- a/_examples/view/layout/jet/views/layouts/main.jet +++ b/_examples/view/layout/jet/views/layouts/main.jet @@ -3,7 +3,7 @@ {{.Title}} - {{ yield documentBody() }} + {{ yield . documentBody() }} \ No newline at end of file diff --git a/_examples/view/layout/pug/main.go b/_examples/view/layout/pug/main.go index bb43e07d..4432545f 100644 --- a/_examples/view/layout/pug/main.go +++ b/_examples/view/layout/pug/main.go @@ -21,5 +21,8 @@ func index(ctx iris.Context) { // On Pug this is ignored: ctx.ViewLayout("layouts/main") // Layouts are only rendered from inside the index page itself // using the "extends" keyword. - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/overview/main.go b/_examples/view/overview/main.go index 6f6387b0..d75e2759 100644 --- a/_examples/view/overview/main.go +++ b/_examples/view/overview/main.go @@ -8,10 +8,10 @@ func main() { // with default template funcs: // // - {{ urlpath "mynamedroute" "pathParameter_ifneeded" }} - // - {{ render "header.html" }} - // - {{ render_r "header.html" }} // partial relative path to current page - // - {{ yield }} - // - {{ current }} + // - {{ render "header.html" . }} + // - {{ render_r "header.html" . }} // partial relative path to current page + // - {{ yield . }} + // - {{ current . }} app.RegisterView(iris.HTML("./templates", ".html"). Reload(true)) // Set Reload false to production. @@ -23,17 +23,23 @@ func main() { ctx.ViewData("Name", "iris") // render the template with the file name relative to the './templates'. // file extension is OPTIONAL. - ctx.View("hi.html") + if err := ctx.View("hi.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/example_map", func(ctx iris.Context) { - ctx.View("example.html", iris.Map{ + if err := ctx.View("example.html", iris.Map{ "Name": "Example Name", "Age": 42, "Items": []string{"Example slice entry 1", "entry 2", "entry 3"}, "Map": iris.Map{"map key": "map value", "other key": "other value"}, "Nested": iris.Map{"Title": "Iris E-Book", "Pages": 620}, - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/example_struct", func(ctx iris.Context) { @@ -59,7 +65,10 @@ func main() { }, } - ctx.View("example.html", examplePage) + if err := ctx.View("example.html", examplePage); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // http://localhost:8080/ diff --git a/_examples/view/parse-template/amber/main.go b/_examples/view/parse-template/amber/main.go index 422c28e5..3fa5829d 100644 --- a/_examples/view/parse-template/amber/main.go +++ b/_examples/view/parse-template/amber/main.go @@ -21,9 +21,12 @@ func main() { } func index(ctx iris.Context) { - ctx.View("program.amber", iris.Map{ + if err := ctx.View("program.amber", iris.Map{ "Name": "Gerasimos", // Or per template: // "greet": func(....) - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/parse-template/django/main.go b/_examples/view/parse-template/django/main.go index 8cf8ad6f..8fe6c08a 100644 --- a/_examples/view/parse-template/django/main.go +++ b/_examples/view/parse-template/django/main.go @@ -21,7 +21,10 @@ func main() { } func index(ctx iris.Context) { - ctx.View("program.html", iris.Map{ + if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/parse-template/handlebars/main.go b/_examples/view/parse-template/handlebars/main.go index 76927270..1a6adb09 100644 --- a/_examples/view/parse-template/handlebars/main.go +++ b/_examples/view/parse-template/handlebars/main.go @@ -19,7 +19,10 @@ func main() { } func index(ctx iris.Context) { - ctx.View("program.html", iris.Map{ + if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/parse-template/jet/main.go b/_examples/view/parse-template/jet/main.go index 565ad929..9b07b32b 100644 --- a/_examples/view/parse-template/jet/main.go +++ b/_examples/view/parse-template/jet/main.go @@ -27,7 +27,10 @@ func main() { } func index(ctx iris.Context) { - ctx.View("program.jet", iris.Map{ + if err := ctx.View("program.jet", iris.Map{ "Name": "Gerasimos", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/parse-template/main.go b/_examples/view/parse-template/main.go index dd99e482..8c9bd88e 100644 --- a/_examples/view/parse-template/main.go +++ b/_examples/view/parse-template/main.go @@ -31,9 +31,12 @@ func main() { } func index(ctx iris.Context) { - ctx.View("program.html", iris.Map{ + if err := ctx.View("program.html", iris.Map{ "Name": "Gerasimos", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func layout(ctx iris.Context) { diff --git a/_examples/view/parse-template/views/layouts/main.html b/_examples/view/parse-template/views/layouts/main.html index 3f6b65a6..588c57bb 100644 --- a/_examples/view/parse-template/views/layouts/main.html +++ b/_examples/view/parse-template/views/layouts/main.html @@ -6,6 +6,6 @@

[layout] Body content is below...

- {{ yield }} + {{ yield . }} diff --git a/_examples/view/template_ace_0/main.go b/_examples/view/template_ace_0/main.go index a86a3c3f..3e8637a0 100644 --- a/_examples/view/template_ace_0/main.go +++ b/_examples/view/template_ace_0/main.go @@ -12,16 +12,22 @@ func main() { app.RegisterView(tmpl) app.Get("/", func(ctx iris.Context) { - ctx.View("index", iris.Map{ + if err := ctx.View("index", iris.Map{ "Title": "Title of The Page", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/layout", func(ctx iris.Context) { - ctx.ViewLayout("layouts/main") // layout for that response. - ctx.View("index", iris.Map{ // file extension is optional. + ctx.ViewLayout("layouts/main") // layout for that response. + if err := ctx.View("index", iris.Map{ // file extension is optional. "Title": "Title of the main Page", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // otherGroup := app.Party("/other").Layout("layouts/other.ace") -> layout for that party. diff --git a/_examples/view/template_ace_0/views/layouts/main.ace b/_examples/view/template_ace_0/views/layouts/main.ace index 58868659..7e6e5ff3 100644 --- a/_examples/view/template_ace_0/views/layouts/main.ace +++ b/_examples/view/template_ace_0/views/layouts/main.ace @@ -4,4 +4,4 @@ html title Main Page body h1 Layout - {{ yield }} \ No newline at end of file + {{ yield . }} \ No newline at end of file diff --git a/_examples/view/template_amber_0/main.go b/_examples/view/template_amber_0/main.go index 8d868ed8..4d6155c0 100644 --- a/_examples/view/template_amber_0/main.go +++ b/_examples/view/template_amber_0/main.go @@ -11,9 +11,12 @@ func main() { app.RegisterView(tmpl) app.Get("/", func(ctx iris.Context) { - ctx.View("index.amber", iris.Map{ + if err := ctx.View("index.amber", iris.Map{ "Title": "Title of The Page", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Listen(":8080") diff --git a/_examples/view/template_amber_1_embedded/main.go b/_examples/view/template_amber_1_embedded/main.go index 207c8e88..36b85315 100644 --- a/_examples/view/template_amber_1_embedded/main.go +++ b/_examples/view/template_amber_1_embedded/main.go @@ -19,9 +19,12 @@ func main() { app.RegisterView(tmpl) app.Get("/", func(ctx iris.Context) { - ctx.View("index.amber", iris.Map{ + if err := ctx.View("index.amber", iris.Map{ "Title": "Title of The Page", - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Listen(":8080") diff --git a/_examples/view/template_blocks_0/main.go b/_examples/view/template_blocks_0/main.go index 8e46a506..8171ffb3 100644 --- a/_examples/view/template_blocks_0/main.go +++ b/_examples/view/template_blocks_0/main.go @@ -19,7 +19,10 @@ func index(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func internalServerError(ctx iris.Context) { @@ -31,5 +34,8 @@ func internalServerError(ctx iris.Context) { } ctx.ViewLayout("error") - ctx.View("500", data) + if err := ctx.View("500", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_blocks_0/views/layouts/main.html b/_examples/view/template_blocks_0/views/layouts/main.html index 5b5a509f..e2b112b3 100644 --- a/_examples/view/template_blocks_0/views/layouts/main.html +++ b/_examples/view/template_blocks_0/views/layouts/main.html @@ -8,6 +8,6 @@ {{ template "content" . }} - + \ No newline at end of file diff --git a/_examples/view/template_blocks_1_embedded/main.go b/_examples/view/template_blocks_1_embedded/main.go index b3e772b6..f036cc81 100644 --- a/_examples/view/template_blocks_1_embedded/main.go +++ b/_examples/view/template_blocks_1_embedded/main.go @@ -28,7 +28,10 @@ func index(ctx iris.Context) { } ctx.ViewLayout("main") - ctx.View("index", data) + if err := ctx.View("index", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } func internalServerError(ctx iris.Context) { @@ -40,5 +43,8 @@ func internalServerError(ctx iris.Context) { } ctx.ViewLayout("error") - ctx.View("500", data) + if err := ctx.View("500", data); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_django_0/main.go b/_examples/view/template_django_0/main.go index f18a97ec..91104bbe 100644 --- a/_examples/view/template_django_0/main.go +++ b/_examples/view/template_django_0/main.go @@ -35,9 +35,12 @@ func hi(ctx iris.Context) { // or if you set all view data in the same handler you can use the // iris.Map/pongo2.Context/map[string]interface{}, look below: - ctx.View("hi.html", iris.Map{ + if err := ctx.View("hi.html", iris.Map{ "title": "Hi Page", "name": "iris", "serverStartTime": startTime, - }) + }); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_django_1/main.go b/_examples/view/template_django_1/main.go index 5769cd97..cb816352 100644 --- a/_examples/view/template_django_1/main.go +++ b/_examples/view/template_django_1/main.go @@ -31,7 +31,8 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - panic(err) + ctx.HTML("

%s

", err.Error()) + return } }) diff --git a/_examples/view/template_handlebars_0/main.go b/_examples/view/template_handlebars_0/main.go index 77c61757..dac5417d 100644 --- a/_examples/view/template_handlebars_0/main.go +++ b/_examples/view/template_handlebars_0/main.go @@ -28,7 +28,10 @@ func main() { }}, } - ctx.View("example.html", viewData) + if err := ctx.View("example.html", viewData); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) exampleRouter := app.Party("/example") diff --git a/_examples/view/template_html_0/main.go b/_examples/view/template_html_0/main.go index 71ef18fc..687adfb7 100644 --- a/_examples/view/template_html_0/main.go +++ b/_examples/view/template_html_0/main.go @@ -12,10 +12,10 @@ func main() { // default template funcs are: // // - {{ urlpath "mynamedroute" "pathParameter_ifneeded" }} - // - {{ render "header.html" }} - // - {{ render_r "header.html" }} // partial relative path to current page - // - {{ yield }} - // - {{ current }} + // - {{ render "header.html" . }} + // - {{ render_r "header.html" . }} // partial relative path to current page + // - {{ yield . }} + // - {{ current . }} tmpl.AddFunc("greet", func(s string) string { return "Greetings " + s + "!" }) @@ -31,5 +31,8 @@ func hi(ctx iris.Context) { ctx.ViewData("Title", "Hi Page") ctx.ViewData("Name", "iris") // {{.Name}} will render: iris // ctx.ViewData("", myCcustomStruct{}) - ctx.View("hi.html") + if err := ctx.View("hi.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_html_1/main.go b/_examples/view/template_html_1/main.go index a2a3b45a..26d2e9a5 100644 --- a/_examples/view/template_html_1/main.go +++ b/_examples/view/template_html_1/main.go @@ -18,7 +18,10 @@ func main() { app.Get("/", func(ctx iris.Context) { ctx.CompressWriter(true) ctx.ViewData("", mypage{"My Page title", "Hello world!"}) - ctx.View("mypage.html") + if err := ctx.View("mypage.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } // Note that: you can pass "layout" : "otherLayout.html" to bypass the config's Layout property // or view.NoLayout to disable layout on this render action. // third is an optional parameter diff --git a/_examples/view/template_html_1/templates/layout.html b/_examples/view/template_html_1/templates/layout.html index 96f0c753..7b18f46b 100644 --- a/_examples/view/template_html_1/templates/layout.html +++ b/_examples/view/template_html_1/templates/layout.html @@ -6,6 +6,6 @@

[layout] Body content is below...

- {{ yield }} + {{ yield . }} diff --git a/_examples/view/template_html_2/main.go b/_examples/view/template_html_2/main.go index 270b99ba..6e864223 100644 --- a/_examples/view/template_html_2/main.go +++ b/_examples/view/template_html_2/main.go @@ -35,10 +35,16 @@ func main() { my := app.Party("/my").Layout("layouts/mylayout.html") { // both of these will use the layouts/mylayout.html as their layout. my.Get("/", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) my.Get("/other", func(ctx iris.Context) { - ctx.View("page1.html") + if err := ctx.View("page1.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) } diff --git a/_examples/view/template_html_2/templates/layouts/layout.html b/_examples/view/template_html_2/templates/layouts/layout.html index eb543f0e..731c2138 100644 --- a/_examples/view/template_html_2/templates/layouts/layout.html +++ b/_examples/view/template_html_2/templates/layouts/layout.html @@ -7,6 +7,6 @@

This is the global layout


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/template_html_2/templates/layouts/mylayout.html b/_examples/view/template_html_2/templates/layouts/mylayout.html index d87575d3..7dba0f33 100644 --- a/_examples/view/template_html_2/templates/layouts/mylayout.html +++ b/_examples/view/template_html_2/templates/layouts/mylayout.html @@ -7,6 +7,6 @@

This is the layout for the /my/ and /my/other routes only


- {{ yield }} + {{ yield . }} diff --git a/_examples/view/template_html_2/templates/page1.html b/_examples/view/template_html_2/templates/page1.html index 8c1d8ed6..75bbb430 100644 --- a/_examples/view/template_html_2/templates/page1.html +++ b/_examples/view/template_html_2/templates/page1.html @@ -2,6 +2,6 @@

Page 1 {{ greet "iris developer"}}

- {{ render "partials/page1_partial1.html" }} + {{ render "partials/page1_partial1.html" . }} diff --git a/_examples/view/template_html_3/main.go b/_examples/view/template_html_3/main.go index 8e02d3a7..91cc7e75 100644 --- a/_examples/view/template_html_3/main.go +++ b/_examples/view/template_html_3/main.go @@ -35,7 +35,8 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - panic(err) + ctx.HTML("

%s

", err.Error()) + return } }) diff --git a/_examples/view/template_html_4/main.go b/_examples/view/template_html_4/main.go index 9c0e4b2b..6a0ea14e 100644 --- a/_examples/view/template_html_4/main.go +++ b/_examples/view/template_html_4/main.go @@ -52,7 +52,8 @@ func main() { paramsAsArray := []string{"username5", "theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.html"); err != nil { - panic(err) + ctx.HTML("

%s

", err.Error()) + return } }) diff --git a/_examples/view/template_html_5/main.go b/_examples/view/template_html_5/main.go index 7e79e0b2..3727c07d 100644 --- a/_examples/view/template_html_5/main.go +++ b/_examples/view/template_html_5/main.go @@ -12,18 +12,28 @@ func main() { app.Get("/home", func(ctx iris.Context) { ctx.ViewData("title", "Home page") - ctx.View("home.html") + if err := ctx.View("home.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } + // Note that: you can pass "layout" : "otherLayout.html" to bypass the config's Layout property // or view.NoLayout to disable layout on this render action. // third is an optional parameter }) app.Get("/about", func(ctx iris.Context) { - ctx.View("about.html") + if err := ctx.View("about.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/user/index", func(ctx iris.Context) { - ctx.View("user/index.html") + if err := ctx.View("user/index.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // http://localhost:8080 diff --git a/_examples/view/template_html_5/views/layout.html b/_examples/view/template_html_5/views/layout.html index c374205f..6fbb4c89 100644 --- a/_examples/view/template_html_5/views/layout.html +++ b/_examples/view/template_html_5/views/layout.html @@ -1,11 +1,11 @@ -{{ part "head" }} +{{ part "head"}}

[layout] Body content is below...

- {{ part "body" }} + {{ part "body" . }} - {{ yield }} + {{ yield . }} diff --git a/_examples/view/template_jet_0/main.go b/_examples/view/template_jet_0/main.go index 1ab0af19..272b9a1e 100644 --- a/_examples/view/template_jet_0/main.go +++ b/_examples/view/template_jet_0/main.go @@ -113,7 +113,10 @@ func main() { } ctx.ViewData("title", "Show TODO") - ctx.View("todos/show.jet", todo) + if err := ctx.View("todos/show.jet", todo); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Get("/all-done", func(ctx iris.Context) { // vars := make(view.JetRuntimeVars) @@ -132,7 +135,10 @@ func main() { // ctx.ViewData("_jet", (&doneTODOs{}).New(todos)) // and ctx.View("todos/index.jet") // OR - ctx.View("todos/index.jet", (&doneTODOs{}).New(todos)) + if err := ctx.View("todos/index.jet", (&doneTODOs{}).New(todos)); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) port := os.Getenv("PORT") diff --git a/_examples/view/template_jet_1_embedded/main.go b/_examples/view/template_jet_1_embedded/main.go index 28083ec5..b6595078 100644 --- a/_examples/view/template_jet_1_embedded/main.go +++ b/_examples/view/template_jet_1_embedded/main.go @@ -22,7 +22,10 @@ func main() { app.RegisterView(tmpl) app.Get("/", func(ctx iris.Context) { - ctx.View("index.jet") + if err := ctx.View("index.jet"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) addr := ":8080" diff --git a/_examples/view/template_jet_2/main.go b/_examples/view/template_jet_2/main.go index db872d2b..d40bf4e5 100644 --- a/_examples/view/template_jet_2/main.go +++ b/_examples/view/template_jet_2/main.go @@ -34,7 +34,8 @@ func main() { paramsAsArray := []string{"theParam1", "theParam2", "paramThirdAfterStatic"} ctx.ViewData("ParamsAsArray", paramsAsArray) if err := ctx.View("page.jet"); err != nil { - panic(err) + ctx.HTML("

%s

", err.Error()) + return } }) diff --git a/_examples/view/template_jet_3/main.go b/_examples/view/template_jet_3/main.go index 0ff91f68..8d7cc864 100644 --- a/_examples/view/template_jet_3/main.go +++ b/_examples/view/template_jet_3/main.go @@ -24,7 +24,10 @@ func main() { app.RegisterView(tmpl) app.Get("/", func(ctx iris.Context) { - ctx.View("index.jet") + if err := ctx.View("index.jet"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) app.Listen(":8080") diff --git a/_examples/view/template_pug_0/main.go b/_examples/view/template_pug_0/main.go index 27c50f06..548f2ac1 100644 --- a/_examples/view/template_pug_0/main.go +++ b/_examples/view/template_pug_0/main.go @@ -38,5 +38,8 @@ func index(ctx iris.Context) { Jobs: []*Job{&job1, &job2}, } - ctx.View("index.pug", person) + if err := ctx.View("index.pug", person); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_pug_1/main.go b/_examples/view/template_pug_1/main.go index 28186b14..fac8bb86 100644 --- a/_examples/view/template_pug_1/main.go +++ b/_examples/view/template_pug_1/main.go @@ -24,5 +24,8 @@ func main() { } func index(ctx iris.Context) { - ctx.View("index.pug") + if err := ctx.View("index.pug"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/view/template_pug_2_embedded/main.go b/_examples/view/template_pug_2_embedded/main.go index 50ee2b50..c04d08ba 100644 --- a/_examples/view/template_pug_2_embedded/main.go +++ b/_examples/view/template_pug_2_embedded/main.go @@ -22,5 +22,8 @@ func main() { } func index(ctx iris.Context) { - ctx.View("index.pug") + if err := ctx.View("index.pug"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } diff --git a/_examples/websocket/gorilla-filewatch/main.go b/_examples/websocket/gorilla-filewatch/main.go index 00583eb3..4254ab50 100644 --- a/_examples/websocket/gorilla-filewatch/main.go +++ b/_examples/websocket/gorilla-filewatch/main.go @@ -146,7 +146,10 @@ func serveHome(ctx iris.Context) { string(p), strconv.FormatInt(lastMod.UnixNano(), 16), } - ctx.View("home.html", v) + if err := ctx.View("home.html", v); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } // $ go get github.com/gorilla/websocket diff --git a/_examples/websocket/native-messages/main.go b/_examples/websocket/native-messages/main.go index 19660642..ffd83d57 100644 --- a/_examples/websocket/native-messages/main.go +++ b/_examples/websocket/native-messages/main.go @@ -49,7 +49,10 @@ func main() { app.Get("/my_endpoint", websocket.Handler(ws)) app.Get("/", func(ctx iris.Context) { - ctx.View("client.html", clientPage{"Client Page", "localhost:8080"}) + if err := ctx.View("client.html", clientPage{"Client Page", "localhost:8080"}); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // Target some browser windows/tabs to http://localhost:8080 and send some messages, diff --git a/_examples/websocket/online-visitors/main.go b/_examples/websocket/online-visitors/main.go index 5df905b4..5b2b9651 100644 --- a/_examples/websocket/online-visitors/main.go +++ b/_examples/websocket/online-visitors/main.go @@ -33,12 +33,18 @@ func main() { h := func(ctx iris.Context) { ctx.ViewData("", page{PageID: "index page"}) - ctx.View("index.html") + if err := ctx.View("index.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } h2 := func(ctx iris.Context) { ctx.ViewData("", page{PageID: "other page"}) - ctx.View("other.html") + if err := ctx.View("other.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } // Open some browser tabs/or windows diff --git a/core/router/api_builder.go b/core/router/api_builder.go index e1dd8b64..5ceac69b 100644 --- a/core/router/api_builder.go +++ b/core/router/api_builder.go @@ -1687,9 +1687,12 @@ func (api *APIBuilder) FallbackView(provider context.FallbackViewProvider) { // app.RegisterView(iris.$VIEW_ENGINE("./views", ".$extension")) // my := app.Party("/my").Layout("layouts/mylayout.html") // -// my.Get("/", func(ctx iris.Context) { -// ctx.View("page1.html") -// }) +// my.Get("/", func(ctx iris.Context) { +// if err := ctx.View("page1.html"); err != nil { +// ctx.HTML("

%s

", err.Error()) +// return +// } +// }) // // Examples: https://github.com/kataras/iris/tree/master/_examples/view func (api *APIBuilder) Layout(tmplLayoutFile string) Party { diff --git a/core/router/party.go b/core/router/party.go index ab49432e..9720c5f2 100644 --- a/core/router/party.go +++ b/core/router/party.go @@ -452,7 +452,10 @@ type Party interface { // app.RegisterView(iris.$VIEW_ENGINE("./views", ".$extension")) // my := app.Party("/my").Layout("layouts/mylayout.html") // my.Get("/", func(ctx iris.Context) { - // ctx.View("page1.html") + // if err := ctx.View("page1.html"); err != nil { + // ctx.HTML("

%s

", err.Error()) + // return + // } // }) // // Examples: https://github.com/kataras/iris/tree/master/_examples/view diff --git a/view/README.md b/view/README.md index 3bc9e7cb..a5232966 100644 --- a/view/README.md +++ b/view/README.md @@ -44,7 +44,10 @@ func main() { // Bind: {{.message}} with "Hello world!" ctx.ViewData("message", "Hello world!") // Render template file: ./views/hello.html - ctx.View("hello.html") + if err := ctx.View("hello.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } }) // Method: GET @@ -85,10 +88,10 @@ func main() { // builtin template funcs are: // // - {{ urlpath "mynamedroute" "pathParameter_ifneeded" }} - // - {{ render "header.html" }} - // - {{ render_r "header.html" }} // partial relative path to current page - // - {{ yield }} - // - {{ current }} + // - {{ render "header.html" . }} + // - {{ render_r "header.html" . }} // partial relative path to current page + // - {{ yield . }} + // - {{ current . }} // register a custom template func. tmpl.AddFunc("greet", func(s string) string { @@ -106,7 +109,10 @@ func main() { func hi(ctx iris.Context) { // render the template file "./templates/hi.html" - ctx.View("hi.html") + if err := ctx.View("hi.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } ``` @@ -150,7 +156,10 @@ type page struct { func hi(ctx iris.Context) { // {{.Page.Title}} and {{Page.Name}} ctx.ViewData("Page", page{Title: "Hi Page", Name: "iris"}) - ctx.View("hi.html") + if err := ctx.View("hi.html"); err != nil { + ctx.HTML("

%s

", err.Error()) + return + } } ``` diff --git a/view/ace.go b/view/ace.go index e6cf90f9..04fe746f 100644 --- a/view/ace.go +++ b/view/ace.go @@ -45,7 +45,7 @@ func Ace(fs interface{}, extension string) *AceEngine { s.middleware = func(name string, text []byte) (contents string, err error) { once.Do(func() { // on first template parse, all funcs are given. - for k, v := range emptyFuncs { + for k, v := range s.getBuiltinFuncs(name) { funcs[k] = v } diff --git a/view/handlebars.go b/view/handlebars.go index 1a80c45a..a5af28fd 100644 --- a/view/handlebars.go +++ b/view/handlebars.go @@ -103,8 +103,8 @@ func (s *HandlebarsEngine) Reload(developmentMode bool) *HandlebarsEngine { } // Layout sets the layout template file which should use -// the {{ yield }} func to yield the main template file -// and optionally {{partial/partial_r/render}} to render +// the {{ yield . }} func to yield the main template file +// and optionally {{partial/partial_r/render . }} to render // other template files like headers and footers. func (s *HandlebarsEngine) Layout(layoutFile string) *HandlebarsEngine { s.layout = layoutFile @@ -238,7 +238,7 @@ func (s *HandlebarsEngine) ExecuteWriter(w io.Writer, filename string, layout st if context == nil { context = make(map[string]interface{}, 1) } - // I'm implemented the {{ yield }} as with the rest of template engines, so this is not inneed for iris, but the user can do that manually if want + // I'm implemented the {{ yield . }} as with the rest of template engines, so this is not inneed for iris, but the user can do that manually if want // there is no performance cost: raymond.RegisterPartialTemplate(name, tmpl) context["yield"] = raymond.SafeString(contents) } diff --git a/view/html.go b/view/html.go index 01b0eae6..5f31bd9c 100644 --- a/view/html.go +++ b/view/html.go @@ -53,27 +53,6 @@ var ( _ EngineFuncer = (*HTMLEngine)(nil) ) -var emptyFuncs = template.FuncMap{ - "yield": func(binding interface{}) (string, error) { - return "", fmt.Errorf("yield was called, yet no layout defined") - }, - "part": func() (string, error) { - return "", fmt.Errorf("block was called, yet no layout defined") - }, - "partial": func() (string, error) { - return "", fmt.Errorf("block was called, yet no layout defined") - }, - "partial_r": func() (string, error) { - return "", fmt.Errorf("block was called, yet no layout defined") - }, - "current": func() (string, error) { - return "", nil - }, - "render": func() (string, error) { - return "", nil - }, -} - // HTML creates and returns a new html view engine. // The html engine used like the "html/template" standard go package // but with a lot of extra features. @@ -175,8 +154,8 @@ func (s *HTMLEngine) Delims(left, right string) *HTMLEngine { } // Layout sets the layout template file which inside should use -// the {{ yield }} func to yield the main template file -// and optionally {{partial/partial_r/render}} to render other template files like headers and footers +// the {{ yield . }} func to yield the main template file +// and optionally {{partial/partial_r/render . }} to render other template files like headers and footers // // The 'tmplLayoutFile' is a relative path of the templates base directory, // for the template file with its extension. @@ -334,6 +313,7 @@ func (s *HTMLEngine) parseTemplate(name string, contents []byte, funcs template. name = strings.TrimPrefix(name, "/") tmpl := s.Templates.New(name) + // tmpl.Option("missingkey=error") tmpl.Option(s.options...) var text string @@ -347,7 +327,12 @@ func (s *HTMLEngine) parseTemplate(name string, contents []byte, funcs template. text = string(contents) } - tmpl.Funcs(emptyFuncs).Funcs(s.funcs) + tmpl.Funcs(s.getBuiltinFuncs(name)).Funcs(s.funcs) + + if strings.Contains(name, "layout") { + tmpl.Funcs(s.layoutFuncs) + } + if len(funcs) > 0 { tmpl.Funcs(funcs) // custom for this template. } @@ -376,27 +361,14 @@ func (s *HTMLEngine) executeTemplateBuf(name string, binding interface{}) (strin return result, err } -func (s *HTMLEngine) layoutFuncsFor(lt *template.Template, name string, binding interface{}) { - s.runtimeFuncsFor(lt, name, binding) - +func (s *HTMLEngine) getBuiltinFuncs(name string) template.FuncMap { funcs := template.FuncMap{ - "yield": func() (template.HTML, error) { + "yield": func(binding interface{}) (template.HTML, error) { result, err := s.executeTemplateBuf(name, binding) // Return safe HTML here since we are rendering our own template. return template.HTML(result), err }, - } - - for k, v := range s.layoutFuncs { - funcs[k] = v - } - - lt.Funcs(funcs) -} - -func (s *HTMLEngine) runtimeFuncsFor(t *template.Template, name string, binding interface{}) { - funcs := template.FuncMap{ - "part": func(partName string) (template.HTML, error) { + "part": func(partName string, binding interface{}) (template.HTML, error) { nameTemp := strings.ReplaceAll(name, s.extension, "") fullPartName := fmt.Sprintf("%s-%s", nameTemp, partName) result, err := s.executeTemplateBuf(fullPartName, binding) @@ -408,7 +380,7 @@ func (s *HTMLEngine) runtimeFuncsFor(t *template.Template, name string, binding "current": func() (string, error) { return name, nil }, - "partial": func(partialName string) (template.HTML, error) { + "partial": func(partialName string, binding interface{}) (template.HTML, error) { fullPartialName := fmt.Sprintf("%s-%s", partialName, name) if s.Templates.Lookup(fullPartialName) != nil { result, err := s.executeTemplateBuf(fullPartialName, binding) @@ -420,7 +392,7 @@ func (s *HTMLEngine) runtimeFuncsFor(t *template.Template, name string, binding // it would be easier for adding pages' style/script inline // for example when using partial_r '.script' in layout.html // templates/users/index.html would load templates/users/index.script.html - "partial_r": func(partialName string) (template.HTML, error) { + "partial_r": func(partialName string, binding interface{}) (template.HTML, error) { ext := filepath.Ext(name) root := name[:len(name)-len(ext)] fullPartialName := fmt.Sprintf("%s%s%s", root, partialName, ext) @@ -430,13 +402,13 @@ func (s *HTMLEngine) runtimeFuncsFor(t *template.Template, name string, binding } return "", nil }, - "render": func(fullPartialName string) (template.HTML, error) { + "render": func(fullPartialName string, binding interface{}) (template.HTML, error) { result, err := s.executeTemplateBuf(fullPartialName, binding) return template.HTML(result), err }, } - t.Funcs(funcs) + return funcs } // ExecuteWriter executes a template and writes its result to the w writer. @@ -455,21 +427,19 @@ func (s *HTMLEngine) ExecuteWriter(w io.Writer, name string, layout string, bind } } - t := s.Templates.Lookup(name) - if t == nil { - return ErrNotExist{Name: name, IsLayout: false, Data: bindingData} - } - s.runtimeFuncsFor(t, name, bindingData) - if layout = getLayout(layout, s.layout); layout != "" { lt := s.Templates.Lookup(layout) if lt == nil { return ErrNotExist{Name: layout, IsLayout: true, Data: bindingData} } - s.layoutFuncsFor(lt, name, bindingData) return lt.Execute(w, bindingData) } + t := s.Templates.Lookup(name) + if t == nil { + return ErrNotExist{Name: name, IsLayout: false, Data: bindingData} + } + return t.Execute(w, bindingData) }