修改脚本正则

mipengine · Jan 10, 2018 · a7a4d7f · a7a4d7f
1 parent e9c1ce0
commit a7a4d7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/rules.json b/rules.json
@@ -184,7 +184,7 @@
             "srcset": "/^\\S+$/"
         }],
         "attrs": {
-            "href": {
+            "src": {
                 "value": "/^\\S+$/"
             },
             "srcset": {

diff --git a/src/matcher.js b/src/matcher.js
@@ -25,7 +25,6 @@ function stringToRegex(str) {
  */
 function matchValue(src, target) {
     var re
-    if (!target || !src) return false
     if ((re = stringToRegex(target))) {
         var result = re.test(src)
         return re.negate ? (!result) : result

diff --git a/src/validators/mandatory_attr_or_missing.js b/src/validators/mandatory_attr_or_missing.js
@@ -25,10 +25,18 @@ exports.onBegin = function(error, html, rules) {
 
 exports.onNode = function(node, rule, error) {
     if (!rule.attrs_or) return
+    var attrOccurrence = _.keyBy(node.attrs, 'name')
 
     var matched = false
 	_.map(rule.attrs_or, pattern => {
-        if (!matcher.matchAttrs(node, pattern)) return
+        var isExisted = true
+        _.forOwn(pattern, (rules, attrName) => {
+            if (!attrOccurrence[attrName]) {
+                isExisted = false
+                return
+            }
+        })
+        if (!isExisted || !matcher.matchAttrs(node, pattern)) return
         matched = true
     })
     if (!matched) {