Skip to content

Remove unneeded trailing whitespace #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions api/data/PageReader.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down Expand Up @@ -179,7 +179,7 @@ component {
"related": [
"function-xmlparse"
],
}
}
--->
*/
var str = trim( arguments.pageContent );
Expand Down
2 changes: 1 addition & 1 deletion api/reference/FunctionReferenceReader.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ component accessors=true {
else {
bundles = ext.bundles;
}

loop array=bundles item="local.bundle" {
if ( bundle.getSymbolicName() == bundleName ) return ext.getMetadata();
}
Expand Down
2 changes: 1 addition & 1 deletion api/reference/TagReferenceReader.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ component accessors=true {
else {
bundles = ext.bundles;
}

loop array=bundles item="local.bundle" {
if ( bundle.getSymbolicName() == bundleName ) return ext.getMetadata();
}
Expand Down
2 changes: 1 addition & 1 deletion api/rendering/Markdown.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions api/rendering/Pygments.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion builders/html/assets/js/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions builders/html/templates/function.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<p><strong>Introduced:</strong> #local.fn.getIntroduced()#</p>
</cfif>
<cfif len(local.fn.getSrcExtension()) gt 0>
<p><strong>Requires Extension: </strong>
<p><strong>Requires Extension: </strong>
<span translate="no">
<a href="https://download.lucee.org/###local.fn.getSrcExtension().id#">
#local.fn.getSrcExtension().name#
Expand All @@ -48,7 +48,7 @@
</div>
<cfif Len( Trim( local.fn.getReturnTypeDesc() ) )>
#_markdownToHtml( local.fn.getReturnTypeDesc() )#
</cfif>
</cfif>
</cfif>
</div>

Expand Down
4 changes: 2 additions & 2 deletions builders/html/templates/tag.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<p><strong>Introduced:</strong> #local.tag.getIntroduced()#</p>
</cfif>
<cfif len(local.tag.getSrcExtension()) gt 0>
<p><strong>Requires Extension: </strong>
<p><strong>Requires Extension: </strong>
<span translate="no">
<a href="https://download.lucee.org/###local.tag.getSrcExtension().id#">
#local.tag.getSrcExtension().name#
</a>
</span>
</span>
</p>
</cfif>

Expand Down
62 changes: 31 additions & 31 deletions examples/docker/basic/www/index.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ config=getConfig();
<div class="container">
<div class="banner-content">
<cfoutput>
<img src="assets/img/lucee-white.png" alt="Lucee" width="300">
<img src="assets/img/lucee-white.png" alt="Lucee" width="300">
<h1>Welcome to your Lucee Docker Installation!</h1>
<p class="lead-text">You are now successfully running Lucee #server.lucee.version# in Docker!</p>
</cfoutput>
Expand All @@ -130,7 +130,7 @@ config=getConfig();
<img src="assets/img/img-ext.png" alt="">
</a>
</div>


<div class="listing-content">
<h2 class="title">
Expand All @@ -142,7 +142,7 @@ config=getConfig();
</cfloop>
</ul>
</div>

<div class="clearfix"></div>
</li>

Expand All @@ -152,7 +152,7 @@ config=getConfig();
<img src="assets/img/img-config.png" alt="">
</a>
</div>


<div class="listing-content">
<h2 class="title">
Expand All @@ -166,20 +166,20 @@ config=getConfig();
<pre class="json-display" id="jsonw">#fileRead(config.web)#</pre>
<button class="copy-button" onclick="copyJson('jsonw',this)">copy</button></cfif>
</div>

<div class="clearfix"></div>
</li>




</cfoutput>
</ul>
</div>


</div>


<div class="col-md-4 sidebar">

Expand All @@ -194,24 +194,24 @@ config=getConfig();
Java: #server.java.version?:""# (#server.java.vendor?:""#)<br>
Time Zone: #getTimeZone()#<br>
Locale: #ucFirst(GetLocale())#</p>


<h3 class="widget-title">Related Websites</h3>

<!--- lucee.org --->
<p class="file-link"><a href="http://www.lucee.org">Lucee Association Switzerland</a></p>
<p>Non-profit custodians and maintainers of the Lucee Project</p>


<!--- lucee.org --->
<p class="file-link"><a href="https://github.com/lucee/lucee-dockerfiles">Lucee Docker Files</a></p>
<p>A project that provides the code needed to build and run Lucee Docker instances for your CFML applications.</p>


<!--- Bitbucket
<!--- Bitbucket
<p class="file-link">Lucee Bitbucket</a></p>
<p>Access the source code and builds</p> --->

<!--- Mailinglist --->
<p class="file-link"><a href="##">Get Involved</a></p>
<p>
Expand All @@ -221,9 +221,9 @@ config=getConfig();
- <a href="#gitURL#">Contribute</a> to the code<br />
- <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKLC7KH4JRQ8J&">Support</a> the project<br />
</p>






<!--- Prof Services --->
<p class="file-link"><a href="#profURL#">Professional Services</a></p>
Expand All @@ -236,18 +236,18 @@ config=getConfig();
</div>
</cfoutput>
</div>

</div>


</div>


</div>


</section>




Expand All @@ -261,37 +261,37 @@ config=getConfig();
<a href="/" class="footer-logo">
<img src="assets/img/lucee-white.png" alt="Lucee">
</a>


</div>


<div class="col-md-5 col-sm-4">
<p class="copyright-text">Copyright &copy; #year(now())# by the Lucee Association Switzerland</p>
</div>




</div>


</div>


</div>


</footer><!-- End of footer -->

</div> <!-- End of .main-wrapper -->












<script src="#cgi.context_path#/assets/js/lib/jquery-1.10.1.min.js"></script>
<script src="#cgi.context_path#/assets/js/lib/bootstrap.min.js"></script>
Expand All @@ -308,5 +308,5 @@ config=getConfig();
</cfif>
</script>
</body>

</html></cfoutput>
Loading
Loading