Skip to content

fix #26 - BraceWrapping #27

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.

Sign up for GitHub

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
dvirtz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #26 - BraceWrapping #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions client/configurator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,13 @@ function load_config(evt){
_.each(data, function(value, key){
var clang_option = clang_options[clang_version][key];
if(clang_option){
$('#' + key).val(value);
if (key == 'BraceWrapping') {
_.each(value, function(value, key) {
$(`#${key}`).prop('checked', value);
})
} else {
$('#' + key).val(value);
}
}
else
{
Expand Down Expand Up @@ -122,7 +128,16 @@ function save_config(clang_options, version){
function get_config(options, version){
var result = {};
$.each(options[version], function(key, value){
var option_value = $('#' + key).val();
var option_value = {};
if (key == 'BraceWrapping') {
if ($('#BreakBeforeBraces').val() == 'Custom') {
$.each(value.options, function(key, value) {
option_value[value] = $(`#${value}`).is(':checked');
});
}
} else {
option_value = $(`#${key}`).val();
}
if(option_value && option_value !== 'Default')
result[key] = option_value;
});
Expand Down Expand Up @@ -154,7 +169,7 @@ function create_inputs(options){
$(input).appendTo(container);
});

$('.form-control').on('change', function(evt){
$('.form-control, .flags_input').on('change', function(evt){
request_update(clang_options, clang_version);
});

Expand Down Expand Up @@ -240,7 +255,7 @@ function flags_input(option_name, options){
'<fieldset>' +
'<legend><%= option_name %></legend>' +
' <% _.forEach(options, function(option){%>' +
' <input type="checkbox" value="<%= option %>" /><label for="cb1"><%= option %></label><br/>'+
' <input type="checkbox" id="<%= option %>" class="flags_input" /><label for="cb1"><%= option %></label><br/>'+
' <%});%>' +
'</ul>'+
'</fieldset>';
Expand Down