Skip to content

Fix errors exposed by strict and also improve js #20221

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

Merged
merged 4 commits into from
Aug 9, 2018
Merged

Fix errors exposed by strict and also improve js #20221

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4d01b8
Don't need a closure, jQuery ready function is enough. Use strict.
okonomiyaki3000 Oct 25, 2016
477d520
Radio buttons and tooltips work in subforms.
okonomiyaki3000 Apr 24, 2018
9cf6a76
Make chose colors work in dynamically added Chosen (in new subform ro…
okonomiyaki3000 Apr 24, 2018
1a09ee9
Combine the two init functions as one. No reason to call two function…
okonomiyaki3000 Apr 25, 2018
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
153 changes: 58 additions & 95 deletions administrator/templates/isis/js/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,112 +12,77 @@ jQuery(function($)

var $w = $(window);

$('*[rel=tooltip]').tooltip();

// Turn radios into btn-group
$('.radio.btn-group label').addClass('btn');
$(document.body)
// add color classes to chosen field based on value
.on('liszt:ready', 'select[class^="chzn-color"], select[class*=" chzn-color"]', function() {
var $select = $(this);
var cls = this.className.replace(/^.(chzn-color[a-z0-9-_]*)$.*/, '$1');
var $container = $select.next('.chzn-container').find('.chzn-single');

$container.addClass(cls).attr('rel', 'value_' + $select.val());
$select.on('change click', function() {
$container.attr('rel', 'value_' + $select.val());
});
})
// Handle clicks to button groups
.on('click', '.btn-group label:not(.active)', function() {
var $label = $(this);
var $input = $('#' + $label.attr('for'));

$('fieldset.btn-group').each(function() {
// Handle disabled, prevent clicks on the container, and add disabled style to each button
if ($(this).prop('disabled')) {
$(this).css('pointer-events', 'none').off('click');
$(this).find('.btn').addClass('disabled');
}
});
if ($input.prop('checked'))
{
return;
}

$('.btn-group label:not(.active)').click(function()
{
var label = $(this);
var input = $('#' + label.attr('for'));
$label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');

if (!input.prop('checked'))
{
label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');
var btnClass = 'primary';

if (label.closest('.btn-group').hasClass('btn-group-reversed'))
if ($input.val() != '')
{
if (input.val() == '')
{
label.addClass('active btn-primary');
}
else if (input.val() == 0)
{
label.addClass('active btn-success');
}
else
{
label.addClass('active btn-danger');
}
var reversed = $label.closest('.btn-group').hasClass('btn-group-reversed');
btnClass = ($input.val() == 0 ? !reversed : reversed) ? 'danger' : 'success';
}
else
{
if (input.val() == '')
{
label.addClass('active btn-primary');
}
else if (input.val() == 0)
{
label.addClass('active btn-danger');
}
else
{
label.addClass('active btn-success');
}

}
input.prop('checked', true);
input.trigger('change');
}
});
$('.btn-group input[checked=checked]').each(function()
$label.addClass('active btn-' + btnClass);
$input.prop('checked', true).trigger('change');
})
.on('subform-row-add', initTemplate);

initTemplate();

// Called once on domready, again when a subform row is added
function initTemplate(event, container)
{
var $self = $(this);
var attrId = $self.attr('id');
var $container = $(container || document);

if ($self.parent().hasClass('btn-group-reversed'))
{
if ($self.val() == '')
{
$('label[for=' + attrId + ']').addClass('active btn-primary');
}
else if ($self.val() == 0)
{
$('label[for=' + attrId + ']').addClass('active btn-success');
}
else
{
$('label[for=' + attrId + ']').addClass('active btn-danger');
}
}
else
{
if ($self.val() == '')
{
$('label[for=' + attrId + ']').addClass('active btn-primary');
}
else if ($self.val() == 0)
{
$('label[for=' + attrId + ']').addClass('active btn-danger');
}
else
// Create tooltips
$container.find('*[rel=tooltip]').tooltip();

// Turn radios into btn-group
$container.find('.radio.btn-group label').addClass('btn');

// Handle disabled, prevent clicks on the container, and add disabled style to each button
$container.find('fieldset.btn-group:disabled').each(function() {
$(this).css('pointer-events', 'none').off('click').find('.btn').addClass('disabled');
});

// Setup coloring for buttons
$container.find('.btn-group input:checked').each(function() {
var $input = $(this);
var $label = $('label[for=' + $input.attr('id') + ']');
var btnClass = 'primary';

if ($input.val() != '')
{
$('label[for=' + attrId + ']').addClass('active btn-success');
var reversed = $input.parent().hasClass('btn-group-reversed');
btnClass = ($input.val() == 0 ? !reversed : reversed) ? 'danger' : 'success';
}
}
});

// add color classes to chosen field based on value
$('select[class^="chzn-color"], select[class*=" chzn-color"]').on('liszt:ready', function(){
var select = $(this);
var cls = this.className.replace(/^.(chzn-color[a-z0-9-_]*)$.*/, '$1');
var container = select.next('.chzn-container').find('.chzn-single');
container.addClass(cls).attr('rel', 'value_' + select.val());
select.on('change click', function()
{
container.attr('rel', 'value_' + select.val());

$label.addClass('active btn-' + btnClass);
});
}

});

/**
* Append submenu items to empty UL on hover allowing a scrollable dropdown
Expand Down Expand Up @@ -249,14 +214,12 @@ jQuery(function($)

}


/**
* USED IN: All views with toolbar and sticky bar enabled
*/
var navTop;
var isFixed = false;


if (document.getElementById('isisJsData') && document.getElementById('isisJsData').getAttribute('data-tmpl-sticky') == "true") {
processScrollInit();
processScroll();
Expand Down