Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git@github.com:tjweir/liftbook

  • Loading branch information...
commit 75b295b040749dd8867ae734e8ff8c51255e242d 2 parents 5f45f19 + d9e342a
@dchenbecker dchenbecker authored
View
42 chap-advanced.lyx
@@ -778,8 +778,16 @@ LiftRules.viewDispatch
,LiftView].
This allows you to either return the function for handling the view directly,
- or delegate to a LiftView subclass.
- LiftView is covered in section
+ or delegate to a
+\family typewriter
+LiftView
+\family default
+ subclass.
+
+\family typewriter
+LiftView
+\family default
+ is covered in section
\begin_inset CommandInset ref
LatexCommand ref
reference "sec:Views"
@@ -799,6 +807,30 @@ getResourceAsStream
\end_layout
\begin_layout Enumerate
+<<<<<<< HEAD:chap-advanced.lyx
+If the template is still not found for classes in
+\family typewriter
+view
+\family default
+ folder fom the paths declared in boot through
+\family typewriter
+LiftRules.addToPackages
+\family default
+.
+ It will look for classes that extend
+\family typewriter
+InsecureLiftView
+\family default
+ and invoke the coresponding function or classes that extend
+\family typewriter
+LiftView
+\family default
+ and invoke the
+\family typewriter
+dispatch
+\family default
+ function.
+=======
If Lift still can't find any templates, it will attempt to locate a View
class whose name matches the first component of the request path under
the
@@ -825,6 +857,7 @@ LiftView
dispatch
\family default
method on the second component of the request path.
+>>>>>>> 6de18ccdf06ac74a9665e4757a66b47e7c7b0b3e:chap-advanced.lyx
\end_layout
\end_deeper
@@ -3234,7 +3267,7 @@ time
\begin_inset Quotes erd
\end_inset
- -> <span>{(new java.util.Date).toString}</span>
+ -> <span>{(new java.util.Date).toString}</span>)
\end_layout
\begin_layout Plain Layout
@@ -3249,7 +3282,10 @@ time
\begin_layout Plain Layout
+<<<<<<< HEAD:chap-advanced.lyx
+=======
/*here the date value*/
+>>>>>>> 6de18ccdf06ac74a9665e4757a66b47e7c7b0b3e:chap-advanced.lyx
\end_layout
\end_inset
View
8 chap-js_commands.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.1 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
\lyxformat 345
\begin_document
\begin_header
@@ -2124,7 +2124,7 @@ name "lst:Jx-trivial-example"
\end_layout
\begin_layout Standard
-This code generates the following HTML:
+This code generates the following JavaScript code:
\end_layout
\begin_layout Standard
@@ -2753,7 +2753,7 @@ name "lst:Ajax-JSON-response"
\begin_layout Plain Layout
- def ajaxFunc : JsCmd = {
+ def ajaxFunc() : JsCmd = {
\end_layout
\begin_layout Plain Layout
@@ -2810,7 +2810,7 @@ Press me
\begin_inset Quotes erd
\end_inset
-), ajaxFunc))
+), ajaxFunc _))
\end_layout
\begin_layout Plain Layout
View
BIN  images/LiftArch.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  images/LiftArch.vsd
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.