Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 08:15:22 +03:00
Code Issues Wiki Activity

Merge branch 'development' into thenickdude-private-development

Browse source 
Conflicts:
	js/data_storage.js
	js/gui.js
	js/msp.js
	main.html
	tabs/dataflash.css
	tabs/dataflash.js
This commit is contained in:
Dominic Clifton 2015-12-15 12:35:52 +01:00
commit 55a2677a2b
42 changed files with 2185 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

60
js/gui.js
View file

@ -18,20 +18,21 @@ var GUI_control = function () {
'help'
];
this.defaultAllowedTabsWhenConnected = [
'failsafe',
'adjustments',
'auxiliary',
'cli',
'configuration',
'gps',
'led_strip',
'logging',
'logging',
'onboard_logging',
'modes',
'motors',
'pid_tuning',
'ports',
'receiver',
'sensors',
'sensors',
'servos',
'setup'
];
@ -238,39 +239,42 @@ GUI_control.prototype.tab_switch_cleanup = function (callback) {
};
GUI_control.prototype.content_ready = function (callback) {
$('.togglesmall').each(function(index, html) {
var switchery = new Switchery(html,
{
$('.togglesmall').each(function(index, elem) {
var switchery = new Switchery(elem, {
size: 'small',
color: '#59aa29',
secondaryColor: '#c4c4c4'
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('togglesmall');
$(elem).on("change", function (evt) {
switchery.setPosition();
});
$(elem).removeClass('togglesmall');
});
$('.toggle').each(function(index, html) {
var switchery = new Switchery(html,
{
color: '#59aa29',
secondaryColor: '#c4c4c4'
$('.toggle').each(function(index, elem) {
var switchery = new Switchery(elem, {
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('toggle');
$(elem).on("change", function (evt) {
switchery.setPosition();
});
$(elem).removeClass('toggle');
});
$('.togglemedium').each(function(index, html) {
var switchery = new Switchery(html,
{
$('.togglemedium').each(function(index, elem) {
var switchery = new Switchery(elem, {
className: 'switcherymid',
color: '#59aa29',
secondaryColor: '#c4c4c4'
color: '#59aa29',
secondaryColor: '#c4c4c4'
});
$(html).removeClass('togglemedium');
$(elem).on("change", function (evt) {
switchery.setPosition();
});
$(elem).removeClass('togglemedium');
});
// Build link to in-use CF version documentation
var documentationButton = $('div#content #button-documentation');
documentationButton.html("Documentation for "+CONFIG.flightControllerVersion);
@ -279,12 +283,12 @@ GUI_control.prototype.content_ready = function (callback) {
// 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
log(this); // ...print out "this", which now refers to each ".cf_tip" DOM element
});
$('.cf_tip').each(function() {
$('.cf_tip').each(function() {
$(this).jBox('Tooltip', {
content: $(this).children('.cf_tooltiptext'),
content: $(this).children('.cf_tooltiptext'),
delayOpen: 100,
delayClose: 100,
position: {