Skip to content

Commit 6b7c1dd

Browse files
committed
Merge pull request #15 from jcberquist/source
minor documentation updates
2 parents ee475eb + 3ff6fca commit 6b7c1dd

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

source/documentation/3.5/developing-applications.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ The keys in the structure have the following meanings:
628628
* `controllersFolder` - The name used for the controllers folder. Must be plural. Defaults to `"controllers"` but could be `"handlers"` for example. _New in 3.5._
629629
* `layoutsFolder` - The name used for the layouts folder. Must be plural. Defaults to `"layouts"` but could be `"wrappers"` for example. _New in 3.5._
630630
* `subsystemsFolder` - The name used for the subsystems folder. Must be plural. Defaults to `"subsystems"` but could be `"plugins"` for example. _New in 3.5._
631-
* `viewssFolder` - The name used for the views folder. Must be plural. Defaults to `"views"` but could be `"pages"` for example. _New in 3.5._
631+
* `viewsFolder` - The name used for the views folder. Must be plural. Defaults to `"views"` but could be `"pages"` for example. _New in 3.5._
632632
* `diOverrideAllowed` - If `true`, FW/1 will throw an exception if you attempt to call `setBeanFactory()` twice. If `false`, FW/1 will allow you to call `setBeanFactory()` twice and override the previous Dependency Injection setting, but it will log a warning to the console. If you want FW/1 to manage your bean factory, use the `di*` settings above to configure it -- and do not call `setBeanFactory()` yourself. If you want to manage your bean factory directly, set `diEngine` to `"none"` so FW/1 doesn't also attempt to do this. _New in 3.5._
633633
* `diEngine` - The Dependency Injection framework that FW/1 should use.
634634
* `diLocations` - The list of folders to check for CFCs to manage; defaults to `[ "model", "controllers" ]`.

source/documentation/3.5/reference-manual.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,11 +449,11 @@ Will generate:
449449

450450
If `header` is provided (as a non-empty string), instead of performing an actual redirect, FW/1 will set the named HTTP header to the target URL and then abort the controller lifecycle. This allows custom handling of "redirects" in AJAX-based applications.
451451

452-
### Public void function redirectCustomURL( string uri, string preserve = 'none', string statusCode = '302', string header = '' )
452+
### public void function redirectCustomURL( string uri, string preserve = 'none', string statusCode = '302', string header = '' )
453453

454454
This is to `redirect()` as `buildCustomURL()` is to `buildURL()`.
455455

456-
### public void function renderData( string type, any data, numeric statusCode = 200, jsonpCallback = "" )
456+
### public void function renderData( string type, any data, numeric statusCode = 200, string jsonpCallback = "" )
457457

458458
Call this from your controller to tell FW/1 to skip views and layouts
459459
and instead render `data` in the specified content `type` format. `type`

source/documentation/3.5/using-di-one.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ When you create the bean factory, you can optionally supply a second argument th
171171
* `exclude` - array - defaults to `[]`. DI/1 will ignore any CFCs whose file path contains the strings in this array. DI/1 always excludes paths containing `/WEB-INF` and `/Application.cfc`, as well as various FW/1 and DI/1 framework files. The strings are not case-sensitive.
172172
* `initMethod` - string - If specified, identifies a method name on beans that DI/1 will attempt to call (with no arguments) on each bean after its dependencies have been injected.
173173
* `liberal` - boolean - default to `false`. If `true`, treat folder names ending in `ies` as plurals (of names ending in `y`, e.g., `libraries` would be treated as the plural of `librarie` by default, but with `liberal : true`, it would be treated as the plural of `library`).
174+
* `loadListener` - any - If specified, DI/1 will register it as a load listener by calling `this.onLoad( loadListener )`. It can be a CFC instance, the name of a bean, or a function or closure.
174175
* `omitDirectoryAliases` - boolean - defaults to `false`. If `true`, use CFC names as bean names directly, without appending the singular directory name as a suffix. If your CFC names are not unique, you will get an exception.
175176
* `omitTypedProperties` - boolean - defaults to `false`. If `true`, property declarations that specify a type will be ignored for injection. That is useful if you are working with the ORM (since those property declarations will have types and should not be treated as dependencies).
176177
* `recurse` - boolean - defaults to `true`. Controls whether DI/1 searches subfolders recursively or not.

0 commit comments

Comments
 (0)