Explorar o código

avoid call to SingleFile.getClass() in UI

Former-commit-id: 4ffa45fa3ef8bb40f56111cfa08a40cfc2578329
Gildas %!s(int64=6) %!d(string=hai) anos
pai
achega
3ca45e144d

+ 3 - 4
extension/ui/content/content-ui-main.js

@@ -25,8 +25,7 @@
 
 this.singlefile.extension.ui.content.main = this.singlefile.extension.ui.content.main || (() => {
 
-	const singlefile = this.singlefile;
-	const SingleFile = this.singlefile.lib.SingleFile.getClass({ fetch: singlefile.extension.lib.fetch.content.resources.fetch });
+	const SELECTED_CONTENT_ATTRIBUTE_NAME = this.singlefile.lib.SingleFile.SELECTED_CONTENT_ATTRIBUTE_NAME;
 
 	const MASK_TAGNAME = "singlefile-mask";
 	const PROGRESS_BAR_TAGNAME = "singlefile-progress-bar";
@@ -165,7 +164,7 @@ this.singlefile.extension.ui.content.main = this.singlefile.extension.ui.content
 
 	function markSelectedNode(node) {
 		const element = node.nodeType == Node.ELEMENT_NODE ? node : node.parentElement;
-		element.setAttribute(SingleFile.SELECTED_CONTENT_ATTRIBUTE_NAME, "");
+		element.setAttribute(SELECTED_CONTENT_ATTRIBUTE_NAME, "");
 	}
 
 	function markSelectedParents(node) {
@@ -176,7 +175,7 @@ this.singlefile.extension.ui.content.main = this.singlefile.extension.ui.content
 	}
 
 	function unmarkSelection() {
-		document.querySelectorAll("[" + SingleFile.SELECTED_CONTENT_ATTRIBUTE_NAME + "]").forEach(selectedContent => selectedContent.removeAttribute(SingleFile.SELECTED_CONTENT_ATTRIBUTE_NAME));
+		document.querySelectorAll("[" + SELECTED_CONTENT_ATTRIBUTE_NAME + "]").forEach(selectedContent => selectedContent.removeAttribute(SELECTED_CONTENT_ATTRIBUTE_NAME));
 	}
 
 	function selectArea() {

+ 3 - 4
lib/single-file/single-file-core.js

@@ -23,13 +23,12 @@
 
 this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 
-	const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-single-file-selected-content";
 	const DEBUG = false;
 
-	let util, cssTree, sessionId = 0;
+	let util, cssTree, sessionId = 0, SELECTED_CONTENT_ATTRIBUTE_NAME;
 
 	function getClass(...args) {
-		[util, cssTree] = args;
+		[util, cssTree, SELECTED_CONTENT_ATTRIBUTE_NAME] = args;
 		return SingleFileClass;
 	}
 
@@ -59,7 +58,7 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 		}
 	}
 
-	SingleFileClass.SELECTED_CONTENT_ATTRIBUTE_NAME = SELECTED_CONTENT_ATTRIBUTE_NAME;
+	// SingleFileClass.SELECTED_CONTENT_ATTRIBUTE_NAME = SELECTED_CONTENT_ATTRIBUTE_NAME;
 
 	// -------------
 	// ProgressEvent

+ 4 - 1
lib/single-file/single-file.js

@@ -23,6 +23,8 @@
 
 this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 
+	const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-single-file-selected-content";
+
 	const singlefile = this.singlefile;
 
 	const modules = {
@@ -40,8 +42,9 @@ this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 	};
 
 	return {
+		SELECTED_CONTENT_ATTRIBUTE_NAME,
 		getClass: classOptions => {
-			const SingleFile = singlefile.lib.core.getClass(singlefile.lib.util.getInstance(modules, classOptions), singlefile.lib.vendor.cssTree);
+			const SingleFile = singlefile.lib.core.getClass(singlefile.lib.util.getInstance(modules, classOptions), singlefile.lib.vendor.cssTree, SELECTED_CONTENT_ATTRIBUTE_NAME);
 			return SingleFile;
 		}
 	};