Skip to content

Commit 44bf1b5

Browse files
authored
Merge branch 'master' into patch-8
2 parents b2f44a5 + b994d27 commit 44bf1b5

File tree

648 files changed

+1499
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

648 files changed

+1499
-791
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This makes the documentation super easy to edit and allows developers to run a l
2121
The cfdocs.org site can run locally very easily thanks to CommandBox.
2222

2323
1. Go download [CommandBox](https://www.ortussolutions.com/products/commandbox) if you do not have it already.
24-
2. Download this repository and extract it to a folder, or clone it from this repository.
24+
2. Download this repository and extract it to a folder, or clone it from this repository.
2525
3. Make a copy of `.env.example` and name it `.env`. This contains required environment variables. [learn more](https://github.com/commandbox-modules/commandbox-dotenv)
2626
4. Run `box server start` from Command Prompt or Terminal in the root directory.
2727

@@ -41,7 +41,7 @@ CFDocs.org is meant to be a quick reference so keep it short and sweet. E.g. att
4141

4242
1. Browse the [data/en/](https://github.com/foundeo/cfdocs/tree/master/data/en) folder of this repository on GitHub and find the tag or function you want to edit.
4343
2. Click the edit button (pencil)
44-
3. Commit
44+
3. Commit
4545
4. Send a pull request to merge your change with this repository.
4646

4747
#### The better way to edit the docs

assets/code-editor.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ angular.module('code.editor', [])
106106
' <label class="control-label">Change CFML Engine</label>'+
107107
' <div>'+
108108
' <select id="engine" class="form-control">'+
109+
' <option value="lucee6">Lucee 6.LATEST</option>'+
109110
' <option value="lucee5">Lucee 5.LATEST</option>'+
110111
' <option value="lucee">Lucee 4.5.LATEST</option>'+
111112
' <option value="railo">Railo 4.2</option>'+
@@ -176,7 +177,7 @@ angular.module('code.editor', [])
176177
scope.setupCodeGist = attrs.setupCodeGist;
177178
scope.asserts = attrs.asserts;
178179
scope.fullscreen = attrs.fullscreen;
179-
scope.engines = {'acf2023':'Adobe ColdFusion 2023','acf2021':'Adobe ColdFusion 2021','acf2018':'Adobe ColdFusion 2018','acf2016':'Adobe ColdFusion 2016','acf11':'Adobe ColdFusion 11', 'acf':'Adobe ColdFusion 10', 'railo':'Railo 4.2', 'lucee':'Lucee 4.5', 'lucee5':'Lucee 5', 'lucee5.0.0.45':'Lucee 5.0.0.45'};
180+
scope.engines = {'acf2023':'Adobe ColdFusion 2023','acf2021':'Adobe ColdFusion 2021','acf2018':'Adobe ColdFusion 2018','acf2016':'Adobe ColdFusion 2016','acf11':'Adobe ColdFusion 11', 'acf':'Adobe ColdFusion 10', 'railo':'Railo 4.2', 'lucee':'Lucee 4.5', 'lucee5':'Lucee 5', 'lucee6':'Lucee 6', 'lucee5.0.0.45':'Lucee 5.0.0.45'};
180181
scope.engine = attrs.engine || 'lucee';
181182
scope.basepath = attrs.basepath || '/gist/';
182183

@@ -207,19 +208,20 @@ angular.module('code.editor', [])
207208
asserts = attrs.asserts || "",
208209
showOptions = typeof attrs.showOptions !== 'undefined' ? attrs.showOptions === "true" || attrs.showOptions === "1" : true,
209210
showResults = typeof attrs.showResults !== 'undefined' ? attrs.showResults === "true" || attrs.showResults === "1" : true,
210-
urlPool = {
211-
"railo" : [ "https://railo-sbx.trycf.com/getremote.cfm" ],
212-
"lucee" : [ "https://lucee4-sbx.trycf.com/lucee4/getremote.cfm" ],
213-
"lucee5" : [ "https://lucee5-sbx.trycf.com/lucee5/getremote.cfm" ],
214-
"lucee5.0.0.45" : [ "https://lucee5-sbx.trycf.com/lucee5/getremote.cfm" ],
215-
"acf" : [ "https://acf10-sbx.trycf.com/cfusion/getremote.cfm" ],
211+
urlPool = {
212+
"railo" : [ "https://railo-sbx.trycf.com/getremote.cfm" ],
213+
"lucee" : [ "https://lucee4-sbx.trycf.com/lucee4/getremote.cfm" ],
214+
"lucee5" : [ "https://lucee5-sbx.trycf.com/lucee5/getremote.cfm" ],
215+
"lucee6" : [ "https://lucee6-sbx.trycf.com/getremote.cfm" ],
216+
"lucee5.0.0.45" : [ "https://lucee5-sbx.trycf.com/lucee5/getremote.cfm" ],
217+
"acf" : [ "https://acf10-sbx.trycf.com/cfusion/getremote.cfm" ],
216218
"acf11" : [ "https://acf11-sbx.trycf.com/cfusion/getremote.cfm" ],
217219
"acf2016" : [ "https://acf12-sbx.trycf.com/getremote.cfm" ],
218220
"acf2018" : [ "https://acf13-sbx.trycf.com/getremote.cfm" ],
219221
"acf2021" : [ "https://acf14-sbx.trycf.com/getremote.cfm" ],
220222
"acf2023" : [ "https://acf2023-sbx.trycf.com/getremote.cfm" ]
221-
},
222-
url = attrs.url || urlPool[scope.engine][Math.floor(Math.random()*urlPool[scope.engine].length)];
223+
},
224+
url = attrs.url || urlPool[scope.engine][Math.floor(Math.random()*urlPool[scope.engine].length)];
223225

224226
displayEngine();
225227
theme = theme.toLowerCase();

assets/style.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,13 @@ footer { text-align: center; margin-top: 10px; font-size:smaller; }
222222
.label-openbd:focus {
223223
background-color: #1b6c8f;
224224
}
225+
.label-boxlang {
226+
background-color: #04CD70;
227+
}
228+
.label-boxlang:hover,
229+
.label-boxlang:focus {
230+
background-color: #08834C;
231+
}
225232
.syntax-highlight {
226233
color: #c7254e;
227234
font-weight:bold;

data/cfdocs.schema.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
"description": "Engine details for OpenBD",
7070
"type": "object",
7171
"$ref": "#/definitions/engineDetail"
72+
},
73+
"boxlang": {
74+
"title": "BoxLang",
75+
"description": "Engine details for BoxLang",
76+
"type": "object",
77+
"$ref": "#/definitions/engineDetail"
7278
}
7379
}
7480
},

data/en/abs.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"coldfusion": {"minimum_version":"", "notes":"", "docs":"https://helpx.adobe.com/coldfusion/cfml-reference/coldfusion-functions/functions-a-b/abs.html"},
1313
"lucee": {"minimum_version":"", "notes":"", "docs":"https://docs.lucee.org/reference/functions/abs.html"},
1414
"railo": {"minimum_version":"", "notes":"", "docs":"http://railodocs.org/index.cfm/function/abs"},
15-
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/function/abs"}
15+
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/function/abs"},
16+
"boxlang": {"minimum_version":"1.0.0", "notes":"", "docs":"https://boxlang.ortusbooks.com/boxlang-language/reference/built-in-functions/math/abs"}
1617
},
1718
"links": [],
1819
"examples": [

data/en/acos.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"coldfusion": {"minimum_version":"4", "notes":"", "docs":"https://helpx.adobe.com/coldfusion/cfml-reference/coldfusion-functions/functions-a-b/acos.html"},
1414
"lucee": {"minimum_version":"", "notes":"", "docs":"https://docs.lucee.org/reference/functions/acos.html"},
1515
"railo": {"minimum_version":"", "notes":"", "docs":"http://railodocs.org/index.cfm/function/acos"},
16-
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/function/acos"}
16+
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/function/acos"},
17+
"boxlang": {"minimum_version":"1.0.0", "notes":"", "docs":"https://boxlang.ortusbooks.com/boxlang-language/reference/built-in-functions/math/acos"}
1718
},
1819
"links": [
1920

data/en/application-cfc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
"engines": {
7272
"coldfusion": {"minimum_version":"7", "notes":"", "docs":"https://helpx.adobe.com/coldfusion/cfml-reference/application-cfc-reference.html"},
7373
"lucee": {"minimum_version":"", "notes":"", "docs":"https://docs.lucee.org/reference/tags/application.html"},
74-
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/tag/cfapplication"}
74+
"openbd": {"minimum_version":"", "notes":"", "docs":"http://openbd.org/manual/?/tag/cfapplication"},
75+
"boxlang": {"minimum_version":"1.0.0", "notes":"", "docs":"https://boxlang.ortusbooks.com/boxlang-framework/applicationbx"}
7576
},
7677
"links": [
7778
{

data/en/applicationstarttime.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"description": "Provides information about the time when the current application scope was created.",
88
"params": [],
99
"engines": {
10-
"lucee": {"minimum_version": "", "notes": "", "docs": "https://docs.lucee.org/reference/functions/applicationstarttime.html"}
10+
"lucee": {"minimum_version": "", "notes": "", "docs": "https://docs.lucee.org/reference/functions/applicationstarttime.html"},
11+
"boxlang": {"minimum_version": "1.0.0", "notes": "", "docs": "https://boxlang.ortusbooks.com/boxlang-language/reference/built-in-functions/system/applicationstarttime"}
1112
},
1213
"examples": [],
1314
"links": []

data/en/applicationstop.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"engines": {
1010
"coldfusion": {"minimum_version":"9", "notes":"", "docs":"https://helpx.adobe.com/coldfusion/cfml-reference/coldfusion-functions/functions-a-b/applicationstop.html"},
1111
"lucee": {"minimum_version":"", "notes":"", "docs":"https://docs.lucee.org/reference/functions/applicationstop.html"},
12-
"railo": {"minimum_version":"", "notes":"", "docs":"http://railodocs.org/index.cfm/function/applicationstop"}
12+
"railo": {"minimum_version":"", "notes":"", "docs":"http://railodocs.org/index.cfm/function/applicationstop"},
13+
"boxlang": {"minimum_version":"1.0.0", "notes":"", "docs":"https://boxlang.ortusbooks.com/boxlang-language/reference/built-in-functions/system/applicationstop"}
1314
},
1415
"links": [
1516
{

data/en/argon2checkhash.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
{"name": "variant", "description": "", "required": false, "default": "Argon2i", "type": "string", "values": ["Argon2i", "Argon2d", "Argon2id"]}
1212
],
1313
"engines": {
14-
"lucee": {"minimum_version": "5.3.8", "notes": "", "docs": "https://docs.lucee.org/reference/functions/argon2checkhash.html"}
14+
"lucee": {"minimum_version": "5.3.8", "notes": "", "docs": "https://docs.lucee.org/reference/functions/argon2checkhash.html"},
15+
"boxlang": {"minimum_version": "1.0.0", "notes": "Requires the bx-password-encrypt module", "docs": "https://github.com/ortus-boxlang/bx-password-encrypt"}
1516
},
1617
"examples": [{
1718
"title":"Show a passing and failing Argon2 hash check",

0 commit comments

Comments
 (0)