Skip to content

Commit 15311fb

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents d01d155 + 05f7654 commit 15311fb

File tree

36 files changed

+877
-877
lines changed

36 files changed

+877
-877
lines changed

Angular/AngularJS-API/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Setup example:
3636
The example will include a module built for lift 3.0.x.
3737
If you are using maven observe that the artifact id also needs the Scala version.
3838
39-
For more information on the AngularJS API module see [FoBo AngularJS ToolKit Module](https://github.com/karma4u101/Angular/AngularJS).
39+
For more information on the AngularJS API module see [FoBo AngularJS Toolkit Module](https://github.com/karma4u101/Angular/AngularJS).
4040
4141
## Contributions
4242
Improvements, contributions and suggestions are welcome! Clone the project and start working on a PR. You can also leave a issue report or drop a question/suggestion to the [Lift's mailing list](http://groups.google.com/group/liftweb/)

Angular/AngularJS-Res/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ or
4444

4545
### Lift FoBo Template hooks
4646

47-
See [FoBo AngularJS ToolKit Module](https://github.com/karma4u101/Angular/AngularJS)
47+
See [FoBo AngularJS Toolkit Module](https://github.com/karma4u101/Angular/AngularJS)
4848

4949
### Dependency settings
5050

Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ package object FoBoAJSRes {
341341
* {{{
342342
* import net.liftmodules.{FoBoAJSRes => FoBo}
343343
* :
344-
* FoBo.InitParam.Resource.Init=FoBo.Resource.AJSUIBootstrap070
344+
* FoBo.Resource.Init=FoBo.Resource.AJSUIBootstrap070
345345
* }}}
346346
*
347347
*/

Angular/AngularJS/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ If you are using maven observe that the artifact id also needs the Scala version
6565
```scala
6666
import net.liftmodules.FoBo
6767
:
68-
FoBo.ToolKit.Init=FoBo.ToolKit.AngularJS153 //access to core files
69-
FoBo.ToolKit.Init=FoBo.ToolKit.AngularJS153i18n //access to angular i18n files
70-
FoBo.ToolKit.Init=FoBo.ToolKit.AJSUIBootstrap0100 //Angular UI Bootstrap
71-
FoBo.ToolKit.Init=FoBo.ToolKit.AJSMaterial108 //Angular Material
72-
FoBo.ToolKit.Init=FoBo.ToolKit.AJSUIGrid307 //Angular UI-Grid
73-
//FoBo.ToolKit.Init=FoBo.ToolKit.AJSNGGrid207 //Angular NG-Grid
68+
FoBo.Toolkit.Init=FoBo.Toolkit.AngularJS153 //access to core files
69+
FoBo.Toolkit.Init=FoBo.Toolkit.AngularJS153i18n //access to angular i18n files
70+
FoBo.Toolkit.Init=FoBo.Toolkit.AJSUIBootstrap0100 //Angular UI Bootstrap
71+
FoBo.Toolkit.Init=FoBo.Toolkit.AJSMaterial108 //Angular Material
72+
FoBo.Toolkit.Init=FoBo.Toolkit.AJSUIGrid307 //Angular UI-Grid
73+
//FoBo.Toolkit.Init=FoBo.Toolkit.AJSNGGrid207 //Angular NG-Grid
7474
```
7575
### Lift FoBo boot hooks (when used as stand alone module)
7676
```scala
7777
import net.liftmodules.{FoBoAJS => FoBo}
7878
:
79-
FoBo.ToolKit.Init=FoBo.ToolKit.AngularJS153 //The core files
79+
FoBo.Toolkit.Init=FoBo.Toolkit.AngularJS153 //The core files
8080
:
8181
```
8282
### Lift FoBo Template hooks

0 commit comments

Comments
 (0)