Add command to kill a window

antoyo · antoyo · commit c675d8b7e6fe · 2017-09-15T11:18:23.000-04:00
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -514,6 +514,7 @@ impl App {
             Hover => self.hover(),
             Insert => self.go_in_insert_mode(),
             Inspector => self.webview.emit(ShowInspector),
+            KillWin => self.close_webview(),
             Mark(ref mark) => self.add_mark(mark),
             Normal => self.go_in_normal_mode(),
             Open(ref url) => self.open(url),
diff --git a/src/commands.rs b/src/commands.rs
@@ -72,6 +72,8 @@ pub enum AppCommand {
     Insert,
     #[help(text="Open the web inspector")]
     Inspector,
+    #[help(text="Kill the webview without confirmation")]
+    KillWin,
     #[completion(hidden)]
     Mark(String),
     #[completion(hidden)]
diff --git a/src/main.rs b/src/main.rs
@@ -20,6 +20,9 @@
  */
 
 /*
+ * TODO: rename the quit command to close.
+ * TODO: add a close-all command?
+ *
  * TODO: automatically add new settings in the config files (kind of insertion sort, splitted by
  * the command?).
  *
@@ -48,8 +51,6 @@
  *
  * TODO: might not require the syntax with (relm) if we emit the signal normally.
  *
- * TODO: add a kill command to close a webview without try_close().
- *
  * TODO: remove dependencies like tokio.
  *
  * FIXME: windows opened by JavaScript cannot be claused: probably need to set the settings
diff --git a/tests/infinite_loop.html b/tests/infinite_loop.html
@@ -0,0 +1,17 @@
+<html>
+    <body>
+        <button id="block">Block</button>
+
+        <script>
+let button = document.querySelector("#block");
+button.addEventListener("click", function() {
+    while(true) {
+    }
+}, false);
+
+window.onbeforeunload = function(){
+    return 'Are you sure you want to leave?';
+};
+        </script>
+    </body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`/*`
	`23`	`+ * TODO: rename the quit command to close.`
	`24`	`+ * TODO: add a close-all command?`
	`25`	`+ *`
`23`	`26`	`* TODO: automatically add new settings in the config files (kind of insertion sort, splitted by`
`24`	`27`	`* the command?).`
`25`	`28`	`*`
`@@ -48,8 +51,6 @@`
`48`	`51`	`*`
`49`	`52`	`* TODO: might not require the syntax with (relm) if we emit the signal normally.`
`50`	`53`	`*`
`51`		`- * TODO: add a kill command to close a webview without try_close().`
`52`		`- *`
`53`	`54`	`* TODO: remove dependencies like tokio.`
`54`	`55`	`*`
`55`	`56`	`* FIXME: windows opened by JavaScript cannot be claused: probably need to set the settings`