Merge branch 'release/0.7.84' into main

Author: mika

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maoxian-web-clipper",
-  "version": "0.7.83",
+  "version": "0.7.84",
   "description": "A web extension to clip information from web page. Save it to your local machine to avoid information invalidation. Not bored registration, Not charged.",
   "main": "",
   "type": "module",

src/js/env.js

@@ -7,7 +7,7 @@ const mxAssistantRoot = [websiteRoot, 'tmp/assistant'].join('/');
 const env = {
   isDev: true,
   logLevel: "debug",
-  version: '0.7.83',
+  version: '0.7.84',
   minNativeAppVersion: '0.2.8',
   mdnRoot: mdnRoot,
   websiteRoot: websiteRoot,

src/js/env.production.js

@@ -7,7 +7,7 @@ const mxAssistantRoot = [websiteRoot, 'assistant'].join('/');
 const env = {
   isDev: false,
   logLevel: "warn",
-  version: '0.7.83',
+  version: '0.7.84',
   minNativeAppVersion: '0.2.8',
   mdnRoot: mdnRoot,
   websiteRoot: websiteRoot,

src/js/snapshot/css-selector-text.js

@@ -142,9 +142,26 @@ const PSEUDO_ELEMENTS_DICT = {
  *
  * 2. using the universal selector(*) if the edited selector become empty.
  *
+ *
+ * Note that we are not fully parsing the selector text
+ * (css functions in each parts is not processed),
+ * So in the case that the parser throwing an Error,
+ * We just return global selector(*),
+ * These rules will be saved,
+ * it's OK, we just save a unused stylesheet rule, not a big deal.
  */
 function simplify(selectorText) {
-  return editSelectorText(selectorText, attrModifier, pseudoModifier);
+  try {
+    return editSelectorText(selectorText, attrModifier, pseudoModifier);
+  } catch (e) {
+    // something unexped happened
+    // or we can't process this selectorText correctly
+    // just accept this selectorText
+    console.warn("Something went wrong when editSelectorText()")
+    console.warn(e.message);
+    console.warn(e.stack);
+    return "*";
+  }
 }
 
 
@@ -676,7 +693,6 @@ class Matcher {
       selectorTextArgInvalid = true;
     }
 
-    // FIXME adding catch ?
     const simplifiedSelectorText = simplify(selectorText);
 
     if (simplifiedSelectorText === selectorText) {

src/js/snapshot/snapshot.js

@@ -364,14 +364,24 @@ async function takeSnapshotOfCurrNode_HTML(node, params) {
             // There still has a posibility that it's content
             // was generated by JS rather than just blank.
 
-            const children = [node.contentDocument];
-            const newDomParams = Object.assign(
-              {}, domParams,
-              (params.domParams_localFrame || {}),
-              {frameInfo: newFrameInfo}
-            );
-            const childParams = Object.assign({}, params, {domParams: newDomParams});
-            return {snapshot, children, childParams};
+            if (node.contentDocument) {
+              const children = [node.contentDocument];
+              const newDomParams = Object.assign(
+                {}, domParams,
+                (params.domParams_localFrame || {}),
+                {frameInfo: newFrameInfo}
+              );
+              const childParams = Object.assign({}, params, {domParams: newDomParams});
+              return {snapshot, children, childParams};
+            } else {
+              // Some local frames are used to run scripts only (something called iframe jax),
+              // these scripts may cause the contentDocument become null,
+              // for instance: (changing the URL of the document)
+              snapshot.childNodes = [];
+              snapshot.errorMessage = 'can not access contentDocument of iframe';
+              snapshot.render = 'ignore';
+              return {snapshot};
+            }
           }
 
 

src/manifest.json

@@ -3,7 +3,7 @@
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
   "author": "Mika",
-  "version": "0.7.83",
+  "version": "0.7.84",
   "default_locale": "en",
   "permissions": [],
   "optional_permissions": [

src/pages/ui-control.html

@@ -123,6 +123,12 @@
             <div class="op-btn arraw">
               <kbd data-key-code="39">→</kbd>
             </div>
+            <div class="op-btn">
+              <kbd data-key-code="46">Delete</kbd>
+            </div>
+            <div class="op-btn">
+              <kbd data-key-code="13">Enter</kbd>
+            </div>
           </div>
         </div>
       </div>

test/snapshot/test-css-selector-text.js

@@ -80,4 +80,7 @@ describe("CSS selector text", () => {
   changeTo("::unknown-element-name", "*");
   changeTo(":host(#id)[attr=value]:first-child[open]", "[attr=value]:first-child");
 
+  // nested css functions, just keep it
+  changeTo("it[max(3, min(2, *v)]", "*");
+
 });