Merge pull request #436 from McGiverGim/fix_fade_header

Fix fade header

Author: mikeller

css/bootstrap-theme.css

@@ -32,7 +32,7 @@ var nwBuilderOptions = {
     files: './dist/**/*',
     macIcns: './images/bf_icon.icns',
     macPlist: { 'CFBundleDisplayName': 'Betaflight Blackbox Explorer'},
-    winIco: './images/bf_icon.ico'
+    winIco: './images/bf_icon.ico',
 };
 
 //-----------------
@@ -208,12 +208,6 @@ function clean_cache() {
 function dist() {
     var distSources = [
         // CSS files
-        './css/bootstrap-theme.css',
-        './css/bootstrap-theme.css.map',
-        './css/bootstrap-theme.min.css',
-        './css/bootstrap.css',
-        './css/bootstrap.css.map',
-        './css/bootstrap.min.css',
         './css/header_dialog.css',
         './css/jquery.nouislider.min.css',
         './css/keys_dialog.css',
@@ -263,14 +257,11 @@ function dist() {
         './js/csv-exporter.js',
         './js/webworkers/csv-export-worker.js',
         './js/vendor/FileSaver.js',
-        './js/vendor/bootstrap.js',
-        './js/vendor/bootstrap.min.js',
         './js/vendor/jquery-1.11.3.min.js',
         './js/vendor/jquery-ui-1.11.4.min.js',
         './js/vendor/jquery.ba-throttle-debounce.js',
         './js/vendor/jquery.nouislider.all.min.js',
         './js/vendor/modernizr-2.6.2-respond-1.1.0.min.js',
-        './js/vendor/npm.js',
         './js/vendor/semver.js',
         './js/vendor/three.js',
         './js/vendor/three.min.js',
@@ -283,7 +274,6 @@ function dist() {
         './*.html',
         './images/**/*',
         './_locales/**/*',
-        './fonts/*',
     ];
     return gulp.src(distSources, { base: '.' })
         .pipe(gulp.dest(DIST_DIR))

css/bootstrap-theme.css.map

@@ -9,8 +9,8 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="css/jquery.nouislider.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/header_dialog.css">
@@ -2770,7 +2770,7 @@ <h4 class="modal-title">Advanced User Settings</h4>
     <script src="js/real.js"></script>
     <script src="js/vendor/jquery-1.11.3.min.js"></script>
     <script src="js/vendor/jquery-ui-1.11.4.min.js"></script>
-    <script src="js/vendor/bootstrap.min.js"></script>
+    <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="js/vendor/jquery.ba-throttle-debounce.js"></script>
     <script src="js/vendor/three.min.js"></script>
     <script src="js/vendor/jquery.nouislider.all.min.js"></script>

css/bootstrap-theme.min.css

@@ -810,13 +810,23 @@ function HeaderDialog(dialog, onSave) {
 	// Public variables
 
     this.show = function(sysConfig) {
-        dialog.modal('toggle');
-        if (dialog.data('bs.modal').isShown) {
+
+        // Workaround to pressing the shortcut key multiple times
+        // The modal-backdrop isn't removed
+        // Remove it manually
+        dialog.one('hidden.bs.modal', function() {
+            $('.modal-backdrop').remove();
+        });
+
+        dialog.one('show.bs.modal', function() {
             renderSysConfig(sysConfig);
             // Disable changing input and dropdowns
             $('#dlgHeaderDialog input').prop('disabled', 'disabled');
             $('#dlgHeaderDialog select').prop('disabled', 'disabled');
-        }
+        });
+
+        dialog.modal('toggle');
+
     }
 
  	// Buttons