Sfoglia il codice sorgente

disable the previous incompatible mode instead of blocking the user

Gildas 5 anni fa
parent
commit
452c36da35
2 ha cambiato i file con 32 aggiunte e 29 eliminazioni
  1. 32 23
      extension/ui/bg/ui-editor.js
  2. 0 6
      extension/ui/pages/editor.css

+ 32 - 23
extension/ui/bg/ui-editor.js

@@ -74,15 +74,19 @@ singlefile.extension.ui.bg.editor = (() => {
 	addGreenNoteButton.onclick = () => editorElement.contentWindow.postMessage(JSON.stringify({ method: "addNote", color: "note-green" }), "*");
 	highlightButtons.forEach(highlightButton => {
 		highlightButton.onclick = () => {
-			if (!toolbarElement.classList.contains("cut-mode") && !toolbarElement.classList.contains("remove-highlight-mode")) {
-				const disabled = highlightButton.classList.contains("highlight-disabled");
-				resetHighlightButtons();
-				if (disabled) {
-					highlightButton.classList.remove("highlight-disabled");
-					editorElement.contentWindow.postMessage(JSON.stringify({ method: "enableHighlight", color: "single-file-highlight-" + highlightButton.dataset.color }), "*");
-				} else {
-					highlightButton.classList.add("highlight-disabled");
-				}
+			if (toolbarElement.classList.contains("cut-mode")) {
+				disableCuteMode();
+			}
+			if (toolbarElement.classList.contains("remove-highlight-mode")) {
+				disableRemoveHighlights();
+			}
+			const disabled = highlightButton.classList.contains("highlight-disabled");
+			resetHighlightButtons();
+			if (disabled) {
+				highlightButton.classList.remove("highlight-disabled");
+				editorElement.contentWindow.postMessage(JSON.stringify({ method: "enableHighlight", color: "single-file-highlight-" + highlightButton.dataset.color }), "*");
+			} else {
+				highlightButton.classList.add("highlight-disabled");
 			}
 		};
 	});
@@ -104,17 +108,18 @@ singlefile.extension.ui.bg.editor = (() => {
 		}
 	};
 	removeHighlightButton.onclick = () => {
-		if (!toolbarElement.classList.contains("cut-mode")) {
-			if (removeHighlightButton.classList.contains("remove-highlight-disabled")) {
-				removeHighlightButton.classList.remove("remove-highlight-disabled");
-				toolbarElement.classList.add("remove-highlight-mode");
-				resetHighlightButtons();
-				displayHighlights();
-				editorElement.contentWindow.postMessage(JSON.stringify({ method: "enableRemoveHighlights" }), "*");
-				editorElement.contentWindow.postMessage(JSON.stringify({ method: "displayHighlights" }), "*");
-			} else {
-				disableRemoveHighlights();
-			}
+		if (toolbarElement.classList.contains("cut-mode")) {
+			disableCuteMode();
+		}
+		if (removeHighlightButton.classList.contains("remove-highlight-disabled")) {
+			removeHighlightButton.classList.remove("remove-highlight-disabled");
+			toolbarElement.classList.add("remove-highlight-mode");
+			resetHighlightButtons();
+			displayHighlights();
+			editorElement.contentWindow.postMessage(JSON.stringify({ method: "enableRemoveHighlights" }), "*");
+			editorElement.contentWindow.postMessage(JSON.stringify({ method: "displayHighlights" }), "*");
+		} else {
+			disableRemoveHighlights();
 		}
 	};
 	editPageButton.onclick = () => {
@@ -133,9 +138,7 @@ singlefile.extension.ui.bg.editor = (() => {
 			enableCutPage();
 			editorElement.contentWindow.focus();
 		} else {
-			cutPageButton.classList.add("cut-disabled");
-			toolbarElement.classList.remove("cut-mode");
-			editorElement.contentWindow.postMessage(JSON.stringify({ method: "disableCutPage" }), "*");
+			disableCuteMode();
 		}
 	};
 	undoCutPageButton.onclick = () => {
@@ -234,6 +237,12 @@ singlefile.extension.ui.bg.editor = (() => {
 		}
 	};
 
+	function disableCuteMode() {
+		cutPageButton.classList.add("cut-disabled");
+		toolbarElement.classList.remove("cut-mode");
+		editorElement.contentWindow.postMessage(JSON.stringify({ method: "disableCutPage" }), "*");
+	}
+
 	function resetHighlightButtons() {
 		highlightButtons.forEach(highlightButton => highlightButton.classList.add("highlight-disabled"));
 		editorElement.contentWindow.postMessage(JSON.stringify({ method: "disableHighlight" }), "*");

+ 0 - 6
extension/ui/pages/editor.css

@@ -55,12 +55,6 @@ img[type=button].cut-disabled:hover,
     filter: brightness(0.875);
 }
 
-.cut-mode img[type=button].highlight-disabled:hover,
-.cut-mode img[type=button].remove-highlight-disabled:hover,
-.remove-highlight-mode img[type=button].highlight-disabled:hover {
-    cursor: not-allowed;
-}
-
 .format-page-button:not(.format-disabled):hover {
     cursor: default;
     filter: brightness(1);