Skip to content

Commit 9453250

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 8f0e8bf + 39aeff0 commit 9453250

19 files changed

+420
-102
lines changed

‎.cfformat.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"array.empty_padding": false,
3+
"array.padding": true,
4+
"array.multiline.min_length": 40,
5+
"array.multiline.element_count": 2,
6+
"array.multiline.leading_comma.padding": true,
7+
"array.multiline.leading_comma": false,
8+
"alignment.consecutive.assignments": true,
9+
"alignment.consecutive.properties": true,
10+
"alignment.consecutive.params": true,
11+
"brackets.padding": true,
12+
"comment.asterisks": "align",
13+
"binary_operators.padding": true,
14+
"for_loop_semicolons.padding": true,
15+
"function_call.empty_padding": false,
16+
"function_call.padding": true,
17+
"function_call.multiline.leading_comma.padding": true,
18+
"function_call.casing.builtin": "cfdocs",
19+
"function_call.casing.userdefined": "camel",
20+
"function_call.multiline.element_count": 3,
21+
"function_call.multiline.leading_comma": false,
22+
"function_call.multiline.min_length": 40,
23+
"function_declaration.padding": true,
24+
"function_declaration.empty_padding": false,
25+
"function_declaration.multiline.leading_comma": false,
26+
"function_declaration.multiline.leading_comma.padding": true,
27+
"function_declaration.multiline.element_count": 3,
28+
"function_declaration.multiline.min_length": 40,
29+
"function_declaration.group_to_block_spacing": "compact",
30+
"function_anonymous.empty_padding": false,
31+
"function_anonymous.group_to_block_spacing": "compact",
32+
"function_anonymous.multiline.element_count": 3,
33+
"function_anonymous.multiline.leading_comma": false,
34+
"function_anonymous.multiline.leading_comma.padding": true,
35+
"function_anonymous.multiline.min_length": 40,
36+
"function_anonymous.padding": true,
37+
"indent_size": 4,
38+
"keywords.block_to_keyword_spacing": "spaced",
39+
"keywords.group_to_block_spacing": "spaced",
40+
"keywords.padding_inside_group": true,
41+
"keywords.spacing_to_block": "spaced",
42+
"keywords.spacing_to_group": true,
43+
"keywords.empty_group_spacing": false,
44+
"max_columns": 120,
45+
"metadata.multiline.element_count": 3,
46+
"metadata.multiline.min_length": 40,
47+
"newline":"\n",
48+
"property.multiline.element_count": 3,
49+
"property.multiline.min_length": 40,
50+
"parentheses.padding": true,
51+
"strings.quote": "double",
52+
"strings.attributes.quote": "double",
53+
"struct.separator": " : ",
54+
"struct.padding": true,
55+
"struct.empty_padding": false,
56+
"struct.multiline.leading_comma": false,
57+
"struct.multiline.leading_comma.padding": true,
58+
"struct.multiline.element_count": 2,
59+
"struct.multiline.min_length": 40,
60+
"tab_indent": true
61+
}

‎.cflintrc‎

Lines changed: 75 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,81 @@
11
{
2+
"output": [],
23
"rule": [],
34
"includes": [
4-
{ "code": "AVOID_USING_CFINCLUDE_TAG" },
5-
{ "code": "AVOID_USING_CFABORT_TAG" },
6-
{ "code": "AVOID_USING_CFEXECUTE_TAG" },
7-
{ "code": "AVOID_USING_DEBUG_ATTR" },
8-
{ "code": "AVOID_USING_ABORT" },
9-
{ "code": "AVOID_USING_ISDATE" },
10-
{ "code": "AVOID_USING_ISDEBUGMODE" },
11-
{ "code": "AVOID_USING_CFINSERT_TAG" },
12-
{ "code": "AVOID_USING_CFUPDATE_TAG" },
13-
{ "code": "ARG_VAR_CONFLICT" },
14-
{ "code": "ARG_HINT_MISSING" },
15-
{ "code": "ARG_HINT_MISSING_SCRIPT" },
16-
{ "code" : "ARGUMENT_INVALID_NAME" },
17-
{ "code" : "ARGUMENT_ALLCAPS_NAME" },
18-
{ "code" : "ARGUMENT_TOO_WORDY" },
19-
{ "code" : "ARGUMENT_IS_TEMPORARY" },
20-
{ "code": "CFQUERYPARAM_REQ" },
21-
{ "code": "COMPARE_INSTEAD_OF_ASSIGN" },
22-
{ "code": "COMPONENT_HINT_MISSING" },
23-
{ "code" : "COMPONENT_INVALID_NAME" },
24-
{ "code" : "COMPONENT_ALLCAPS_NAME" },
25-
{ "code" : "COMPONENT_TOO_SHORT" },
26-
{ "code" : "COMPONENT_TOO_LONG" },
27-
{ "code" : "COMPONENT_TOO_WORDY" },
28-
{ "code" : "COMPONENT_IS_TEMPORARY" },
29-
{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
30-
{ "code": "COMPLEX_BOOLEAN_CHECK" },
31-
{ "code": "EXCESSIVE_FUNCTION_LENGTH" },
32-
{ "code": "EXCESSIVE_COMPONENT_LENGTH" },
33-
{ "code": "EXCESSIVE_ARGUMENTS" },
34-
{ "code": "EXCESSIVE_FUNCTIONS" },
35-
{ "code": "EXPLICIT_BOOLEAN_CHECK" },
36-
{ "code": "FUNCTION_TOO_COMPLEX" },
37-
{ "code": "FUNCTION_HINT_MISSING" },
38-
{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
39-
{ "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
40-
{ "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
41-
{ "code": "MISSING_VAR" },
42-
{ "code" : "METHOD_INVALID_NAME" },
43-
{ "code" : "METHOD_ALLCAPS_NAME" },
44-
{ "code" : "METHOD_IS_TEMPORARY" },
45-
{ "code": "NESTED_CFOUTPUT" },
46-
{ "code": "NEVER_USE_QUERY_IN_CFM" },
47-
{ "code": "OUTPUT_ATTR" },
48-
{ "code" : "QUERYPARAM_REQ" },
49-
{ "code": "UNUSED_LOCAL_VARIABLE" },
50-
{ "code": "UNUSED_METHOD_ARGUMENT" },
51-
{ "code": "SQL_SELECT_STAR" },
52-
{ "code": "SCOPE_ALLCAPS_NAME" },
53-
{ "code": "VAR_ALLCAPS_NAME" },
54-
{ "code": "VAR_INVALID_NAME" },
55-
{ "code": "VAR_TOO_WORDY" }
5+
{
6+
"code": "AVOID_USING_STRUCTNEW"
7+
},
8+
{
9+
"code": "AVOID_USING_ARRAYNEW"
10+
},
11+
{
12+
"code": "AVOID_USING_CFINCLUDE_TAG"
13+
},
14+
{
15+
"code": "AVOID_USING_CFABORT_TAG"
16+
},
17+
{
18+
"code": "AVOID_USING_ABORT"
19+
},
20+
{
21+
"code": "ARG_VAR_CONFLICT"
22+
},
23+
{
24+
"code": "ARG_VAR_MIXED"
25+
},
26+
{
27+
"code": "CFQUERYPARAM_REQ"
28+
},
29+
{
30+
"code": "COMPARE_INSTEAD_OF_ASSIGN"
31+
},
32+
{
33+
"code": "COMPONENT_HINT_MISSING"
34+
},
35+
{
36+
"code": "EXCESSIVE_FUNCTION_LENGTH"
37+
},
38+
{
39+
"code": "EXCESSIVE_COMPONENT_LENGTH"
40+
},
41+
{
42+
"code": "EXCESSIVE_ARGUMENTS"
43+
},
44+
{
45+
"code": "EXCESSIVE_FUNCTIONS"
46+
},
47+
{
48+
"code": "FUNCTION_TOO_COMPLEX"
49+
},
50+
{
51+
"code": "FUNCTION_HINT_MISSING"
52+
},
53+
{
54+
"code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"
55+
},
56+
{
57+
"code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"
58+
},
59+
{
60+
"code": "MISSING_VAR"
61+
},
62+
{
63+
"code": "OUTPUT_ATTR"
64+
},
65+
{
66+
"code": "UNUSED_LOCAL_VARIABLE"
67+
},
68+
{
69+
"code": "UNUSED_METHOD_ARGUMENT"
70+
},
71+
{
72+
"code": "SQL_SELECT_STAR"
73+
},
74+
{
75+
"code": "VAR_ALLCAPS_NAME"
76+
}
5677
],
5778
"inheritParent": false,
58-
"parameters": {
59-
"TooManyFunctionsChecker.maximum" : 20
60-
}
79+
"inheritPlugins": true,
80+
"parameters": {}
6181
}

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env:
1010
- MODULE_ID=cbdebugger
1111
matrix:
1212
- ENGINE=lucee@5
13-
- ENGINE=adobe@11
1413
- ENGINE=adobe@2016
1514
- ENGINE=adobe@2018
1615

‎ModuleConfig.cfc‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,28 @@ component {
6464
// Register the interceptor, it has to be here due to loading of configuration files.
6565
controller
6666
.getInterceptorService()
67-
.registerInterceptor(
67+
.registerInterceptor(
6868
interceptorClass = "#moduleMapping#.interceptors.Debugger",
6969
interceptorName = "debugger@cbdebugger"
7070
);
71+
72+
if ( settings.debugger.showQBPanel && controller.getModuleService().isModuleRegistered( "qb" ) ) {
73+
controller
74+
.getInterceptorService()
75+
.registerInterceptor(
76+
interceptorClass = "#moduleMapping#.interceptors.QBCollector",
77+
interceptorName = "QBCollector@cbdebugger"
78+
);
79+
}
80+
81+
if ( settings.debugger.showQBPanel && controller.getModuleService().isModuleRegistered( "quick" ) ) {
82+
controller
83+
.getInterceptorService()
84+
.registerInterceptor(
85+
interceptorClass = "#moduleMapping#.interceptors.QuickCollector",
86+
interceptorName = "QuickCollector@cbdebugger"
87+
);
88+
}
7189
}
7290

7391
/**
@@ -76,12 +94,12 @@ component {
7694
function onUnload(){
7795
// unregister interceptor
7896
controller.getInterceptorService().unregister( interceptorName="debugger@cbdebugger" );
79-
97+
8098
// Remove application helper
8199
var appHelperArray = controller.getSetting( "ApplicationHelper" );
82100
var mixinToRemove = "#moduleMapping#/models/Mixins.cfm";
83101
var mixinIndex = arrayFindNoCase( appHelperArray, mixinToRemove );
84-
102+
85103
// If the mixin is in the array
86104
if( mixinIndex ) {
87105
// Remove it
@@ -117,14 +135,16 @@ component {
117135
expandedRCPanel = false,
118136
showModulesPanel = true,
119137
expandedModulesPanel = false,
138+
showQBPanel = true,
139+
expandedQBPanel = false,
120140
showRCSnapshots = false,
121141
wireboxCreationProfiler=false
122142
};
123143

124144
// incorporate settings
125145
structAppend( configStruct.debugger, debuggerDSL, true );
126146
}
127-
147+
128148
// This appender is part of a module, so we need to register it after the modules have been loaded.
129149
function afterConfigurationLoad() {
130150
var logBox = controller.getLogBox();
@@ -139,6 +159,6 @@ component {
139159
root.addAppender( appenders[ 'tracer' ] );
140160
root.setLevelMax( 4 );
141161
root.setLevelMin( 0 );
142-
162+
143163
}
144164
}

‎box.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"ColdBox Debugger",
33
"author":"Ortus Solutions <[email protected]",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
5-
"version":"1.8.0",
5+
"version":"2.0.0",
66
"slug":"cbdebugger",
77
"type":"modules",
88
"homepage":"https://github.com/coldbox-modules/cbdebugger",

‎build/toMaster.boxr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Check out master
44
!git checkout -f master
5+
!git pull
56
# Merge development into it
67
!git merge --no-ff development
78
# Tag the master repo with the version in box.json

‎changelog.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## 2.0.0
4+
5+
* Dropped ACF 11 support
6+
* Formatting updates
7+
* Quick/QB Panels
8+
39
## 1.7.1
410

511
* Updated location protocol

‎includes/css/cbox-debugger.css‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727
cursor: pointer;
2828
color: black;
2929
}
30+
.fw_subtitles{
31+
font-size: 10px;
32+
font-weight: bold;
33+
color: black;
34+
border:1px solid #D3D3D3;
35+
background: #D7EBF9;
36+
padding:5px 5px 5px 5px;
37+
margin-bottom: 2px;
38+
-moz-border-radius: 5px;
39+
-webkit-border-radius: 5px;
40+
-khtml-border-radius: 5px;
41+
}
3042
.fw_profilers{
3143
font-size: 10px;
3244
font-weight:bold;
@@ -209,3 +221,30 @@
209221
background-color: #FFF6CC;
210222
border: 1px solid #999999;
211223
}
224+
.fw_badge_light{
225+
display: inline-block;
226+
padding: .25em .4em;
227+
font-weight: 700;
228+
line-height: 1;
229+
text-align: center;
230+
white-space: nowrap;
231+
vertical-align: baseline;
232+
border-radius: .25rem;
233+
color: black;
234+
background: #D7EBF9;
235+
border:1px solid #D3D3D3;
236+
}
237+
238+
.fw_badge_dark{
239+
display: inline-block;
240+
padding: .25em .4em;
241+
font-weight: 700;
242+
line-height: 1;
243+
text-align: center;
244+
white-space: nowrap;
245+
vertical-align: baseline;
246+
border-radius: .25rem;
247+
color: white;
248+
border: 1px solid #2694E8;
249+
background: #3BAAE3;
250+
}

‎includes/css/cbox-debugger.pack.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎includes/debug.cfm‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,15 @@ Description :
302302
</div>
303303
</cfif>
304304

305+
<!--- **************************************************************--->
306+
<!--- qb debug --->
307+
<!--- **************************************************************--->
308+
<cfif instance.debuggerConfig.showQBPanel>
309+
<cfinclude template="panels/qbPanel.cfm">
310+
</cfif>
311+
305312
<div class="fw_renderTime">Approximate Debug Rendering Time: #GetTickCount()-DebugStartTime# ms</div>
306313

307314
</div>
308315
</cfoutput>
309-
<cfsetting enablecfoutputonly=false>
316+
<cfsetting enablecfoutputonly=false>

0 commit comments

Comments
 (0)