head-script-disabled(fule): No head not result error

htmlhint · Oct 7, 2015 · 96abbe2 · 96abbe2
1 parent 8576cd4
commit 96abbe2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/.jshintrc1 → .jshintrc-browser b/.jshintrc1 → .jshintrc-browser
diff --git a/.jshintrc2 → .jshintrc-node b/.jshintrc2 → .jshintrc-node
diff --git a/CHANGE.md b/CHANGE.md
@@ -17,6 +17,7 @@ fix:
 
 1. Fix issue: #77 `<link rel=icon><link rel=icon>`
 2. Made the descriptions and error messages of rules more clear to people
+3. head-script-disabled(fule): No head not result error
 
 ## ver 0.9.7 (2015-3-8)
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -16,13 +16,13 @@ module.exports = function(grunt) {
             browser: {
                 src: ['src/**/*.js'],
                 options: {
-                    jshintrc: ".jshintrc1"
+                    jshintrc: ".jshintrc-browser"
                 }
             },
             node: {
                 src: ['Gruntfile.js', 'test/**/*.js', 'bin/*'],
                 options: {
-                    jshintrc: ".jshintrc2"
+                    jshintrc: ".jshintrc-node"
                 }
             }
         },

diff --git a/lib/htmlhint.js b/lib/htmlhint.js
diff --git a/src/rules/head-script-disabled.js b/src/rules/head-script-disabled.js
@@ -8,10 +8,16 @@ HTMLHint.addRule({
     init: function(parser, reporter){
         var self = this;
         var reScript = /^(text\/javascript|application\/javascript)$/i;
+        var isInHead = false;
         function onTagStart(event){
             var mapAttrs = parser.getMapAttrs(event.attrs);
             var type = mapAttrs.type;
-            if(event.tagName.toLowerCase() === 'script' &&
+            var tagName = event.tagName.toLowerCase();
+            if(tagName === 'head'){
+                isInHead = true;
+            }
+            if(isInHead === true &&
+                tagName === 'script' &&
                 (!type || reScript.test(type) === true)){
                 reporter.warn('The <script> tag cannot be used in a <head> tag.', event.line, event.col, self, event.raw);
             }
@@ -25,4 +31,4 @@ HTMLHint.addRule({
         parser.addListener('tagstart', onTagStart);
         parser.addListener('tagend', onTagEnd);
     }
-});
+});
diff --git a/test/rules/head-script-disabled.spec.js b/test/rules/head-script-disabled.spec.js
@@ -54,4 +54,10 @@ describe('Rules: '+ruldId, function(){
         expect(messages.length).to.be(0);
     });
 
-});
+    it('No head not result in an error', function(){
+        var code = '<html><script src="test.js"></script></html>';
+        var messages = HTMLHint.verify(code, ruleOptions);
+        expect(messages.length).to.be(0);
+    });
+
+});