Skip to content

Commit 147a597

Browse files
committed
Fix ability to set progressbar color
1 parent be3105e commit 147a597

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

ModuleConfig.cfc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ component {
3838
/**
3939
* Trims string properties if set to true
4040
*/
41-
"trimStringValues" : false
41+
"trimStringValues" : false,
42+
/**
43+
* Enables or disables the progress bar when using wire:navigate
44+
*/
45+
"showProgressBar": true,
46+
/**
47+
* The color of the progress bar when using wire:navigate
48+
*/
49+
"progressBarColor": "##2299dd"
4250
};
4351

4452
routes = [

models/CBWIREController.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ component singleton {
354354
*
355355
* @return string
356356
*/
357-
function getStyles() {
358-
if (structKeyExists(variables, "styles")) {
357+
function getStyles( cache=true ) {
358+
if (structKeyExists(variables, "styles") && arguments.cache ) {
359359
return variables.styles;
360360
}
361361

models/styles.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<cfoutput>
22
<!-- CBWIRE Styles -->
3-
<style >[wire\:loading][wire\:loading], [wire\:loading\.delay][wire\:loading\.delay], [wire\:loading\.inline-block][wire\:loading\.inline-block], [wire\:loading\.inline][wire\:loading\.inline], [wire\:loading\.block][wire\:loading\.block], [wire\:loading\.flex][wire\:loading\.flex], [wire\:loading\.table][wire\:loading\.table], [wire\:loading\.grid][wire\:loading\.grid], [wire\:loading\.inline-flex][wire\:loading\.inline-flex] {display: none;}[wire\:loading\.delay\.none][wire\:loading\.delay\.none], [wire\:loading\.delay\.shortest][wire\:loading\.delay\.shortest], [wire\:loading\.delay\.shorter][wire\:loading\.delay\.shorter], [wire\:loading\.delay\.short][wire\:loading\.delay\.short], [wire\:loading\.delay\.default][wire\:loading\.delay\.default], [wire\:loading\.delay\.long][wire\:loading\.delay\.long], [wire\:loading\.delay\.longer][wire\:loading\.delay\.longer], [wire\:loading\.delay\.longest][wire\:loading\.delay\.longest] {display: none;}[wire\:offline][wire\:offline] {display: none;}[wire\:dirty]:not(textarea):not(input):not(select) {display: none;}:root {--livewire-progress-bar-color: ##2299dd;}[x-cloak] {display: none !important;}</style>
3+
<style >[wire\:loading][wire\:loading], [wire\:loading\.delay][wire\:loading\.delay], [wire\:loading\.inline-block][wire\:loading\.inline-block], [wire\:loading\.inline][wire\:loading\.inline], [wire\:loading\.block][wire\:loading\.block], [wire\:loading\.flex][wire\:loading\.flex], [wire\:loading\.table][wire\:loading\.table], [wire\:loading\.grid][wire\:loading\.grid], [wire\:loading\.inline-flex][wire\:loading\.inline-flex] {display: none;}[wire\:loading\.delay\.none][wire\:loading\.delay\.none], [wire\:loading\.delay\.shortest][wire\:loading\.delay\.shortest], [wire\:loading\.delay\.shorter][wire\:loading\.delay\.shorter], [wire\:loading\.delay\.short][wire\:loading\.delay\.short], [wire\:loading\.delay\.default][wire\:loading\.delay\.default], [wire\:loading\.delay\.long][wire\:loading\.delay\.long], [wire\:loading\.delay\.longer][wire\:loading\.delay\.longer], [wire\:loading\.delay\.longest][wire\:loading\.delay\.longest] {display: none;}[wire\:offline][wire\:offline] {display: none;}[wire\:dirty]:not(textarea):not(input):not(select) {display: none;}:root {--livewire-progress-bar-color: #moduleSettings.progressBarColor#;}[x-cloak] {display: none !important;}</style>
44
</cfoutput>

test-harness/tests/specs/CBWIRESpec.cfc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ component extends="coldbox.system.testing.BaseTestCase" {
4141
expect( reMatchNoCase( "CBWIRE Scripts", html ).len() ).toBe( 0 );
4242
} );
4343

44+
it( "should use default display bar color", function() {
45+
var CBWIREController = getInstance( "CBWIREController@cbwire" );
46+
var html = CBWIREController.getStyles( cache=false );
47+
expect( html ).toInclude( "--livewire-progress-bar-color: ##2299dd;" );
48+
} );
49+
50+
it( "should be able to change the display bar color", function() {
51+
var CBWIREController = getInstance( "CBWIREController@cbwire" );
52+
var settings = getInstance( "coldbox:modulesettings:cbwire" );
53+
settings.progressBarColor = "##cc0000";
54+
var html = CBWIREController.getStyles( cache=false );
55+
expect( html ).toInclude( "--livewire-progress-bar-color: ##cc0000;" );
56+
} );
57+
4458
it( "should have default updateEndpoint", function() {
4559
var CBWIREController = getInstance( "CBWIREController@cbwire" );
4660
var settings = getInstance( "coldbox:modulesettings:cbwire" );

0 commit comments

Comments
 (0)