Skip to content

Commit 038533b

Browse files
committed
DFL-3371 Make 'configure message filters' more accessible.
The dialog for configuring message filters is moved to the side of the view rather than being a popup dialog. Also store last value entered in the message sending view so that it's not cleared on switching views.
1 parent 67013fa commit 038533b

File tree

6 files changed

+202
-214
lines changed

6 files changed

+202
-214
lines changed

src/client-en.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ window.load_screen_timeout = window.setTimeout(function()
344344
<script src="./build-application/build_document_manager_1_0.js"></script>
345345

346346
<script src="./debug/debug.js"/>
347-
<script src="./debug/configure_message_filter.js"/>
348347
<script src="./debug/po_tester.js"/>
349348
<script src="./debug/test_messages.js"/>
350349
<script src="./debug/build_debug.js"/>

src/debug/build_debug.js

Lines changed: 6 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ cls.debug.create_debug_environment = function(params)
1919
cls.debug.Debug.prototype =
2020
window.cls.debug.TestScopeMessages.prototype =
2121
new window.cls.TestFramework();
22-
window.debug = new cls.debug.Debug('debug', 'Debug', 'scroll debug-container');
23-
new cls.debug.ConfigureMessageFilters(
24-
'configure-message-filters', 'Message Filters', 'scroll filter-container');
22+
window.debug = new cls.debug.Debug('debug', 'Debug', 'scroll debug-container filter-container');
2523
var test_messages = new cls.debug.TestScopeMessages(
2624
'test-messages', 'Test Messages', 'scroll test-messages');
2725

2826
eventHandlers.click['test-messages'] = test_messages.get_bound_click_handler();
2927
eventHandlers.change['test-messages'] = test_messages.get_bound_change_handler();
3028
new CompositeView('debug_new', 'Debug', {
31-
dir: 'v', width: 700, height: 700,
29+
dir: 'h', width: 700, height: 700,
3230
children:
3331
[
34-
{ height: 200, tabs: ['debug', 'test-messages'] }
32+
{
33+
tabs: ['debug', 'test-messages']
34+
}
3535
]
3636
});
3737

@@ -66,11 +66,6 @@ cls.debug.create_debug_environment = function(params)
6666
title: 'Clear debug log',
6767
text: 'Clear'
6868
},
69-
{
70-
handler: 'configure-message-filters',
71-
title: 'Configure Message Filters',
72-
text: 'Configure'
73-
},
7469
{
7570
handler: 'reload-dragonfly',
7671
title: 'Reload Dragonfly',
@@ -87,7 +82,7 @@ cls.debug.create_debug_environment = function(params)
8782
(
8883
'debug',
8984
[
90-
'pretty-print-messages',
85+
'pretty-print-messages'
9186
]
9287
);
9388

@@ -109,59 +104,6 @@ cls.debug.create_debug_environment = function(params)
109104
window.debug.clear_log();
110105
}
111106

112-
eventHandlers.click['configure-message-filters'] = function(event, target)
113-
{
114-
UIWindowBase.showWindow('configure-message-filters');
115-
}
116-
117-
eventHandlers.click['toggle-filter-messages'] = function(event, target)
118-
{
119-
var
120-
parent = event.target.parentNode,
121-
view = window.views['configure-message-filters'],
122-
service = event.target.getAttribute('data-service-name');
123-
unfold_container = parent.getElementsByTagName('div')[0];
124-
125-
view.set_unfold(service, !unfold_container);
126-
if(unfold_container)
127-
{
128-
parent.removeChild(unfold_container);
129-
parent.removeClass('open');
130-
}
131-
else
132-
{
133-
view.show_configuration(parent, service);
134-
parent.addClass('open');
135-
}
136-
}
137-
138-
eventHandlers.change['config-filter-msg'] = function(event, target)
139-
{
140-
var
141-
parent = event.target.parentNode.parentNode.parentNode,
142-
msg = event.target.getAttribute('data-filter-target'),
143-
type = parent.getAttribute('data-filter-type'),
144-
service = parent.getAttribute('data-service-name');
145-
146-
window.debug.set_log_filter(service, type, msg, event.target.checked);
147-
if(msg == 'all')
148-
{
149-
if(service == 'all')
150-
{
151-
window.views['configure-message-filters'].update();
152-
}
153-
else
154-
{
155-
parent = parent.parentNode.parentNode;
156-
var div = parent.getElementsByTagName('div')[0];
157-
parent.removeChild(div);
158-
window.views['configure-message-filters'].show_configuration(parent, service);
159-
}
160-
}
161-
}
162-
163-
164-
165107
/**
166108
* Cookie handling functions
167109
*/

src/debug/configure_message_filter.js

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)