diff --git a/js/gui.js b/js/gui.js index bf7c142b..21ecbb66 100644 --- a/js/gui.js +++ b/js/gui.js @@ -237,5 +237,35 @@ 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, + { + 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'); + }); + + // 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)); + + if (callback) callback(); +} + // initialize object into GUI variable var GUI = new GUI_control(); diff --git a/main.js b/main.js index c91dd86a..a1181f49 100644 --- a/main.js +++ b/main.js @@ -101,32 +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'); - }); - - // 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) { diff --git a/tabs/adjustments.js b/tabs/adjustments.js index 6a934751..4182055f 100644 --- a/tabs/adjustments.js +++ b/tabs/adjustments.js @@ -277,7 +277,7 @@ TABS.adjustments.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js index 42568ed2..33641154 100644 --- a/tabs/auxiliary.js +++ b/tabs/auxiliary.js @@ -283,7 +283,7 @@ TABS.auxiliary.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/cli.js b/tabs/cli.js index 8b2c77e3..6e5708d2 100644 --- a/tabs/cli.js +++ b/tabs/cli.js @@ -62,7 +62,7 @@ TABS.cli.initialize = function (callback) { // give input element user focus textarea.focus(); - if (callback) callback(); + GUI.content_ready(callback); }); }; diff --git a/tabs/configuration.js b/tabs/configuration.js index 3c481afb..83f2bc8a 100644 --- a/tabs/configuration.js +++ b/tabs/configuration.js @@ -469,7 +469,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/dataflash.js b/tabs/dataflash.js index 3576c658..60e9214e 100644 --- a/tabs/dataflash.js +++ b/tabs/dataflash.js @@ -113,7 +113,7 @@ TABS.dataflash.initialize = function (callback) { } - if (callback) callback(); + GUI.content_ready(callback); } // IO related methods diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js index 156b6784..8922c145 100755 --- a/tabs/firmware_flasher.js +++ b/tabs/firmware_flasher.js @@ -516,7 +516,7 @@ TABS.firmware_flasher.initialize = function (callback) { } }); - if (callback) callback(); + GUI.content_ready(callback); }); }; diff --git a/tabs/gps.js b/tabs/gps.js index 251c88a8..b6657f61 100644 --- a/tabs/gps.js +++ b/tabs/gps.js @@ -71,7 +71,7 @@ TABS.gps.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/help.js b/tabs/help.js index 53236897..6c499d79 100644 --- a/tabs/help.js +++ b/tabs/help.js @@ -12,7 +12,7 @@ TABS.help.initialize = function (callback) { $('#content').load("./tabs/help.html", function () { localize(); - if (callback) callback(); + GUI.content_ready(callback); }); }; diff --git a/tabs/landing.js b/tabs/landing.js index b350d0f1..8f12f93e 100644 --- a/tabs/landing.js +++ b/tabs/landing.js @@ -45,7 +45,7 @@ $("#changelog_button").on('click', function() { - if (callback) callback(); + GUI.content_ready(callback); }); }; diff --git a/tabs/led_strip.js b/tabs/led_strip.js index 16d65345..aa87bda9 100644 --- a/tabs/led_strip.js +++ b/tabs/led_strip.js @@ -288,7 +288,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { }); - if (callback) callback(); + GUI.content_ready(callback); } function findLed(x, y) { diff --git a/tabs/logging.js b/tabs/logging.js index 62b71fee..1a28e60b 100644 --- a/tabs/logging.js +++ b/tabs/logging.js @@ -110,7 +110,7 @@ TABS.logging.initialize = function (callback) { } }); - if (callback) callback(); + GUI.content_ready(callback); } function print_head() { diff --git a/tabs/modes.js b/tabs/modes.js index a9a428f2..ce57b792 100644 --- a/tabs/modes.js +++ b/tabs/modes.js @@ -149,7 +149,7 @@ TABS.modes.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/motors.js b/tabs/motors.js index d3a118c7..74c99079 100644 --- a/tabs/motors.js +++ b/tabs/motors.js @@ -450,7 +450,7 @@ TABS.motors.initialize = function (callback) { // enable Status and Motor data pulling GUI.interval_add('motor_and_status_pull', get_status, 50, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js index 8743c87b..5eb93025 100755 --- a/tabs/pid_tuning.js +++ b/tabs/pid_tuning.js @@ -402,9 +402,7 @@ TABS.pid_tuning.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) { - callback(); - } + GUI.content_ready(callback); } }; diff --git a/tabs/ports.js b/tabs/ports.js index 2463f3de..9031375a 100644 --- a/tabs/ports.js +++ b/tabs/ports.js @@ -208,7 +208,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } function on_save_handler() { diff --git a/tabs/receiver.js b/tabs/receiver.js index 7dff28d6..35a7cac4 100644 --- a/tabs/receiver.js +++ b/tabs/receiver.js @@ -458,7 +458,7 @@ TABS.receiver.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/sensors.js b/tabs/sensors.js index 6ebcaea0..389dbc43 100644 --- a/tabs/sensors.js +++ b/tabs/sensors.js @@ -448,7 +448,7 @@ TABS.sensors.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); }); }; diff --git a/tabs/servos.js b/tabs/servos.js index 655e79d3..6f269165 100755 --- a/tabs/servos.js +++ b/tabs/servos.js @@ -192,7 +192,7 @@ TABS.servos.initialize = function (callback) { MSP.send_message(MSP_codes.MSP_STATUS); }, 250, true); - if (callback) callback(); + GUI.content_ready(callback); } }; diff --git a/tabs/setup.js b/tabs/setup.js index 9a9244d6..2868454f 100755 --- a/tabs/setup.js +++ b/tabs/setup.js @@ -193,7 +193,7 @@ TABS.setup.initialize = function (callback) { GUI.interval_add('setup_data_pull_fast', get_fast_data, 33, true); // 30 fps GUI.interval_add('setup_data_pull_slow', get_slow_data, 250, true); // 4 fps - if (callback) callback(); + GUI.content_ready(callback); } };