mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-24 16:55:24 +03:00
Merge remote-tracking branch 'cleanflight/development' into GUI-rework
# Conflicts: # main.js # tabs/landing.js
This commit is contained in:
commit
0880343488
24 changed files with 52 additions and 90 deletions
65
main.js
65
main.js
|
@ -101,66 +101,6 @@ $(document).ready(function () {
|
|||
|
||||
function content_ready() {
|
||||
GUI.tab_switch_in_progress = false;
|
||||
|
||||
$('.togglesmall').each(function(index, html) {
|
||||
var switchery = new Switchery(html,
|
||||
{
|
||||
size: 'small',
|
||||
color: '#59aa29',
|
||||
secondaryColor: '#c4c4c4'
|
||||
});
|
||||
|
||||
$(html).removeClass('togglesmall');
|
||||
});
|
||||
|
||||
$('.toggle').each(function(index, html) {
|
||||
var switchery = new Switchery(html,
|
||||
{
|
||||
color: '#59aa29',
|
||||
secondaryColor: '#c4c4c4'
|
||||
});
|
||||
|
||||
$(html).removeClass('toggle');
|
||||
});
|
||||
|
||||
$('.togglemedium').each(function(index, html) {
|
||||
var switchery = new Switchery(html,
|
||||
{
|
||||
className: 'switcherymid',
|
||||
color: '#59aa29',
|
||||
secondaryColor: '#c4c4c4'
|
||||
});
|
||||
|
||||
$(html).removeClass('togglemedium');
|
||||
});
|
||||
|
||||
|
||||
// loading tooltip
|
||||
jQuery(document).ready(function($) {
|
||||
$('cf_tip').each(function() { // Grab all ".cf_tip" elements, and for each...
|
||||
log(this); // ...print out "this", which now refers to each ".cf_tip" DOM element
|
||||
});
|
||||
|
||||
$('.cf_tip').each(function() {
|
||||
$(this).jBox('Tooltip', {
|
||||
content: $(this).children('.cf_tooltiptext'),
|
||||
delayOpen: 100,
|
||||
delayClose: 100,
|
||||
position: {
|
||||
x: 'right',
|
||||
y: 'center'
|
||||
},
|
||||
outside: 'x'
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
// Build link to in-use CF version documentation
|
||||
var documentationButton = $('div#content #button-documentation');
|
||||
documentationButton.html("Documentation for "+CONFIG.flightControllerVersion);
|
||||
documentationButton.attr("href","https://github.com/cleanflight/cleanflight/tree/v{0}/docs".format(CONFIG.flightControllerVersion));
|
||||
}
|
||||
|
||||
switch (tab) {
|
||||
|
@ -449,8 +389,3 @@ $("#showlog").on('click', function() {
|
|||
});
|
||||
|
||||
|
||||
|
||||
|
||||
// loading tooltip PLACEHOLDER
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue