diff --git a/Application.cfc b/Application.cfc index 62bc7e5a7..46645dd1b 100644 --- a/Application.cfc +++ b/Application.cfc @@ -13,7 +13,7 @@ component { public boolean function onRequest( required string requestedTemplate ) output=true { var logger = new api.build.Logger(opts:{textOnly: true, console: true}); - + application.assetBundleVersion = variables.assetBundleVersion; include template=arguments.requestedTemplate; diff --git a/api/data/PageReader.cfc b/api/data/PageReader.cfc index 069739aee..4c6c910d8 100644 --- a/api/data/PageReader.cfc +++ b/api/data/PageReader.cfc @@ -46,7 +46,7 @@ component { // hack to restructure recipes as docs content if ( listFirst( page.getPath(), "/" ) eq "recipes" ){ page.setSlug( page.getPageType() ) - + if (page.getPageType() eq "README"){ page.setPath( page.getPath() ); page.setPageType( "listing" ); @@ -179,7 +179,7 @@ component { "related": [ "function-xmlparse" ], - } + } ---> */ var str = trim( arguments.pageContent ); diff --git a/api/reference/FunctionReferenceReader.cfc b/api/reference/FunctionReferenceReader.cfc index fea55fa7e..8be2023ed 100644 --- a/api/reference/FunctionReferenceReader.cfc +++ b/api/reference/FunctionReferenceReader.cfc @@ -123,7 +123,7 @@ component accessors=true { else { bundles = ext.bundles; } - + loop array=bundles item="local.bundle" { if ( bundle.getSymbolicName() == bundleName ) return ext.getMetadata(); } diff --git a/api/reference/TagReferenceReader.cfc b/api/reference/TagReferenceReader.cfc index 1e29ca77b..05bce7a71 100644 --- a/api/reference/TagReferenceReader.cfc +++ b/api/reference/TagReferenceReader.cfc @@ -147,7 +147,7 @@ component accessors=true { else { bundles = ext.bundles; } - + loop array=bundles item="local.bundle" { if ( bundle.getSymbolicName() == bundleName ) return ext.getMetadata(); } diff --git a/api/rendering/Markdown.cfc b/api/rendering/Markdown.cfc index d5107e7df..0055ad530 100644 --- a/api/rendering/Markdown.cfc +++ b/api/rendering/Markdown.cfc @@ -32,7 +32,7 @@ component ]; var parser = Parser::builder().extensions(extensions).build(); // Parse the markdown to a Node - var document = parser.parse( arguments.markdown); + var document = parser.parse( arguments.markdown); // Create a HTML renderer var renderer = HtmlRenderer::builder().extensions(extensions).escapeHtml( arguments.safeMode ).build(); // Render the Node to HTML diff --git a/api/rendering/Pygments.cfc b/api/rendering/Pygments.cfc index c1604728e..91f01aaec 100644 --- a/api/rendering/Pygments.cfc +++ b/api/rendering/Pygments.cfc @@ -26,16 +26,16 @@ component var result = interpreter.get("result", createObject('java', 'java.lang.String').getClass()); var lexer = interpreter.get("lexer"); // dump(var=lexer.toString(), label="#language#"); - + return result; } public string function getCss() { var interpreter = new PythonInterpreter(); - interpreter.set("style", "default"); + interpreter.set("style", "default"); var pythonFile = expandPath( getDirectoryFromPath( getCurrentTemplatePath() ) & "pygmentsCss.py" ); interpreter.execFile( pythonFile ); - var css = interpreter.get("css", createObject('java', 'java.lang.String').getClass()); + var css = interpreter.get("css", createObject('java', 'java.lang.String').getClass()); return css; } } diff --git a/builders/html/assets/js/base.js b/builders/html/assets/js/base.js index 4173c1a80..dad90cc01 100644 --- a/builders/html/assets/js/base.js +++ b/builders/html/assets/js/base.js @@ -15041,7 +15041,7 @@ window.onerror = function(message, url, line, col, err) { var reg = generateRegexForInput( input ) , fulltextitem, matches; - + matches = searchIndex.filter( function( item ) { var srcText = item.desc ? item.desc : item.text; // cdn caching sigh var titleLen = item.text.length diff --git a/builders/html/templates/function.cfm b/builders/html/templates/function.cfm index a1a8a0b0d..ebfe44278 100644 --- a/builders/html/templates/function.cfm +++ b/builders/html/templates/function.cfm @@ -25,7 +25,7 @@

Introduced: #local.fn.getIntroduced()#

-

Requires Extension: +

Requires Extension: #local.fn.getSrcExtension().name# @@ -48,7 +48,7 @@ #_markdownToHtml( local.fn.getReturnTypeDesc() )# - + diff --git a/builders/html/templates/tag.cfm b/builders/html/templates/tag.cfm index 74cf6f607..5d9ecfa2f 100644 --- a/builders/html/templates/tag.cfm +++ b/builders/html/templates/tag.cfm @@ -26,12 +26,12 @@

Introduced: #local.tag.getIntroduced()#

-

Requires Extension: +

Requires Extension: #local.tag.getSrcExtension().name# - +

diff --git a/examples/docker/basic/www/index.cfm b/examples/docker/basic/www/index.cfm index 715a856d0..890fc11c5 100644 --- a/examples/docker/basic/www/index.cfm +++ b/examples/docker/basic/www/index.cfm @@ -107,7 +107,7 @@ config=getConfig();
- +

@@ -142,7 +142,7 @@ config=getConfig();

- +
@@ -152,7 +152,7 @@ config=getConfig();
- +

@@ -166,20 +166,20 @@ config=getConfig();
#fileRead(config.web)#

- +
- + - + - + - + - + - + - + - + @@ -261,37 +261,37 @@ config=getConfig(); - + - +
- + - + - + - + - - - - + + + + @@ -308,5 +308,5 @@ config=getConfig(); - + \ No newline at end of file diff --git a/examples/docker/wip/www/index.cfm b/examples/docker/wip/www/index.cfm index f64edc17c..475421dc2 100644 --- a/examples/docker/wip/www/index.cfm +++ b/examples/docker/wip/www/index.cfm @@ -139,7 +139,7 @@ config=getConfig();
- +
- + - + - + - + - + - + @@ -339,37 +339,37 @@ config=getConfig(); - + - +
- + - + - + - + - - - - + + + + @@ -386,5 +386,5 @@ config=getConfig(); - + \ No newline at end of file diff --git a/examples/docker/wip/www/testx.cfm b/examples/docker/wip/www/testx.cfm index 861cc3300..0de2e788d 100644 --- a/examples/docker/wip/www/testx.cfm +++ b/examples/docker/wip/www/testx.cfm @@ -6,7 +6,7 @@ function getAvailableExtensions() { var extensions=deserializeJson(res.filecontent,false).extensions; return extensions; } - + extensions=getAvailableExtensions(); diff --git a/examples/docker/with-config/www/index.cfm b/examples/docker/with-config/www/index.cfm index 715a856d0..890fc11c5 100644 --- a/examples/docker/with-config/www/index.cfm +++ b/examples/docker/with-config/www/index.cfm @@ -107,7 +107,7 @@ config=getConfig();
- +

@@ -142,7 +142,7 @@ config=getConfig();

- +
@@ -152,7 +152,7 @@ config=getConfig();
- +

@@ -166,20 +166,20 @@ config=getConfig();
#fileRead(config.web)#

- +
- + - + - + - + - + - + - + - + @@ -261,37 +261,37 @@ config=getConfig(); - + - +
- + - + - + - + - - - - + + + + @@ -308,5 +308,5 @@ config=getConfig(); - + \ No newline at end of file diff --git a/examples/docker/with-extension/www/index.cfm b/examples/docker/with-extension/www/index.cfm index 715a856d0..890fc11c5 100644 --- a/examples/docker/with-extension/www/index.cfm +++ b/examples/docker/with-extension/www/index.cfm @@ -107,7 +107,7 @@ config=getConfig();
- +

@@ -142,7 +142,7 @@ config=getConfig();

- +
@@ -152,7 +152,7 @@ config=getConfig();
- +

@@ -166,20 +166,20 @@ config=getConfig();
#fileRead(config.web)#

- +
- + - + - + - + - + - + - + - + @@ -261,37 +261,37 @@ config=getConfig(); - + - +
- + - + - + - + - - - - + + + + @@ -308,5 +308,5 @@ config=getConfig(); - + \ No newline at end of file diff --git a/examples/docker/with-patch/www/index.cfm b/examples/docker/with-patch/www/index.cfm index 715a856d0..890fc11c5 100644 --- a/examples/docker/with-patch/www/index.cfm +++ b/examples/docker/with-patch/www/index.cfm @@ -107,7 +107,7 @@ config=getConfig();
- +

@@ -142,7 +142,7 @@ config=getConfig();

- +
@@ -152,7 +152,7 @@ config=getConfig();
- +

@@ -166,20 +166,20 @@ config=getConfig();
#fileRead(config.web)#

- +
- + - + - + - + - + - + - + - + @@ -261,37 +261,37 @@ config=getConfig(); - + - +
- + - + - + - + - - - - + + + + @@ -308,5 +308,5 @@ config=getConfig(); - + \ No newline at end of file diff --git a/server/Application.cfc b/server/Application.cfc index 0b4752153..45b2c744d 100644 --- a/server/Application.cfc +++ b/server/Application.cfc @@ -14,7 +14,7 @@ component { this.mappings[ "/docs" ] = this.baseDir & "docs"; this.mappings[ "/listener" ] = this.baseDir; this.assetBundleVersion = 36; // see parent application.cfc - + public void function onApplicationStart() { application.assetBundleVersion = 36; @@ -261,7 +261,7 @@ component { opts.spellcheck = { title: "Spellchecking built HTML", menu: "Spell Check HTML" - }; + }; opts.dictionary = { title: "Exporting Dictionary", menu: "Export Dictionary"