Added tab swtich hotkey

z1pti3 · Oct 17, 2020 · e04c6b2 · e04c6b2
1 parent 37ae4da
commit e04c6b2
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 10 deletions.
diff --git a/web/static/javascript/hotkeys.js b/web/static/javascript/hotkeys.js
@@ -0,0 +1,10 @@
+
+$(document).ready(function () {
+    $(window).bind("keydown", function (event) { 
+        if (event.ctrlKey || event.metaKey) {
+            if (event.keyCode == 223) {
+                window.top.swtichTab();
+            }
+        }
+    })
+});
diff --git a/web/templates/audit.html b/web/templates/audit.html
@@ -13,6 +13,9 @@
 
 <script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
 
+
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 <link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
 
@@ -71,4 +74,4 @@
         }
         table.draw();
     });
-</script>
+</script>
diff --git a/web/templates/backups.html b/web/templates/backups.html
@@ -7,6 +7,8 @@
 <link rel="stylesheet" href="{{ url_for('static', filename='includes/bootstrap-3.3.7/css/bootstrap.min.css') }}">
 <script src="{{ url_for('static', filename='includes/bootstrap-3.3.7/js/bootstrap.min.js') }}"></script>
 
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 <link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
 
@@ -23,4 +25,4 @@
             <input class='btn btn-primary theme-panelButton' type="submit" value="Restore System">
         </form>
     </body>
-</html>
+</html>
diff --git a/web/templates/blank.html b/web/templates/blank.html
@@ -1,8 +1,10 @@
 <html>
     <head>
         <link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
+        <script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
     </head>
     <body class="theme-panelContainer">
         <pre class="theme-panelContainer">{{ content }}</pre>
     </body>
-</html>
+</html>
+
diff --git a/web/templates/codify.html b/web/templates/codify.html
@@ -17,7 +17,9 @@
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 
 		<script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
-		<script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
+    <script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
+
+    <script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
 
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/codify.css') }}">
@@ -73,4 +75,4 @@
     }
 });
 
-</script>
+</script>
diff --git a/web/templates/conductEditor.html b/web/templates/conductEditor.html
@@ -28,6 +28,8 @@
 		<script src="{{ url_for('static', filename='javascript/triggerObject.js') }}"></script>
 		<script src="{{ url_for('static', filename='javascript/aclProperties.js') }}"></script>
 
+		<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/conductEditor.css') }}">
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/objectProperties.css') }}">
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">

diff --git a/web/templates/debug.html b/web/templates/debug.html
@@ -9,6 +9,8 @@
 <script src="{{ url_for('static', filename='includes/visjs/js/moment.js') }}"></script>
 <script src="{{ url_for('static', filename='includes/datatables/js/datetime.moment.js') }}"></script>
 
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 
 <html>

diff --git a/web/templates/import.html b/web/templates/import.html
@@ -19,6 +19,8 @@
 		<script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
 		<script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
 
+		<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 		<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/codify.css') }}">
 
@@ -50,4 +52,4 @@
       } 
     });
   });
-</script>
+</script>
diff --git a/web/templates/main.html b/web/templates/main.html
@@ -96,6 +96,9 @@ <h1 class="nav-header" >Jimi</h1>
 </html>
 
 <script>
+    var currentTab = null
+    var lastTab = null
+
     function generateUUID() {
         var d = new Date().getTime();
         var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
@@ -110,17 +113,40 @@ <h1 class="nav-header" >Jimi</h1>
         var id = generateUUID();
 		$('ul#tabs li:last-child').before('<li id="li' + id + '"><a href="#tab' + id + '" role="tab" data-toggle="tab">' + name + ' <button type="button" class="btn theme-navButton" onclick="removeTab(\'' + id + '\');">X</button></a>');
         $('div.tab-content div:last-child').after('<div class="tab-pane" id="tab' + id + '"><iframe name="content-frame" class="content-frame" focus() src="'+ url +'"></iframe></div>');
+        $('ul#tabs > li').click(function() { 
+            if (currentTab != null) {
+                lastTab = currentTab;
+            }
+            currentTab = id
+        });
         $('ul#tabs > li').removeClass("active");
         $('div.tab-content div').removeClass("active");
         $('ul#tabs > li#li' + id).addClass("active");
         $('div.tab-content div#tab' + id).addClass("active");
+        if (currentTab != null) {
+            lastTab = currentTab;
+        }
+        currentTab = id
     }
 
 
     function removeTab(liElem) { 
         $('ul#tabs > li#li' + liElem).remove();
         $('div.tab-content div#tab' + liElem).remove();
     }
+
+    function swtichTab() {
+        if ( currentTab != null ) {
+            $('ul#tabs > li').removeClass("active");
+            $('div.tab-content div').removeClass("active");
+            $('ul#tabs > li#li' + lastTab).addClass("active");
+            $('div.tab-content div#tab' + lastTab).addClass("active");
+            changeTab = currentTab;
+            currentTab = lastTab;
+            lastTab = changeTab;
+        }
+    }
+
 </script>
 
 <script>
@@ -195,3 +221,16 @@ <h1 class="nav-header" >Jimi</h1>
     });
 
 </script>
+
+<script>
+    $(document).ready(function () {
+        $(window).bind("keydown", function (event) { 
+            if (event.ctrlKey || event.metaKey) {
+                console.log(event.keyCode)
+                if (event.keyCode == 223) {
+                    swtichTab();
+                }
+            }
+        })
+    });
+</script>
diff --git a/web/templates/modelEditorList.html b/web/templates/modelEditorList.html
@@ -13,6 +13,8 @@
 
 <script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
 
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 
@@ -279,4 +281,5 @@
         var alert = $(".alert-container");
         locationHandler();
     });
-</script>
+</script>
+
diff --git a/web/templates/myAccount.html b/web/templates/myAccount.html
@@ -9,6 +9,8 @@
 <script src="{{ url_for('static', filename='includes/visjs/js/moment.js') }}"></script>
 <script src="{{ url_for('static', filename='includes/datatables/js/datetime.moment.js') }}"></script>
 
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 
 <link rel="stylesheet" href="{{ url_for('static', filename='css/modelEditor.css') }}">
@@ -116,4 +118,4 @@
         var alert = $(".alert-container");
         getAccount();
     });
-</script>
+</script>
diff --git a/web/templates/status.html b/web/templates/status.html
@@ -12,6 +12,8 @@
 <script src="{{ url_for('static', filename='includes/visjs/js/moment.js') }}"></script>
 <script src="{{ url_for('static', filename='includes/datatables/js/datetime.moment.js') }}"></script>
 
+<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
+
 <link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
 
 <link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
@@ -60,4 +62,4 @@
         }
         table.draw();
     });
-</script>
+</script>
diff --git a/web/templates/workers.html b/web/templates/workers.html
@@ -2,8 +2,9 @@
     <head>
     <title>JIMI - Workers</title>    
     <link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">    
+    <script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
     </head>
     <body class="theme-panelContainer">
         {{ content|safe }}
     </body>
-</html>
+</html>