Merge remote-tracking branch 'origin/develop'

Author: neraliu

Gruntfile.js

@@ -31,7 +31,13 @@ module.exports = function(grunt) {
           args: ['src/y/css-parser.3.y', 'src/l/css.3.l', '--outfile', 'src/css-parser.3.js']
         },
         src: ['node_modules/jison/lib/cli.js']
-      }
+      },
+      targetstrict: {
+        options: {
+          args: ['src/y/css-parser.21.attr.y', 'src/l/css.strict.l', '--outfile', 'src/css-parser.strict.attr.js']
+        },
+        src: ['node_modules/jison/lib/cli.js']
+      },
     },
     mocha_istanbul: {
       target: {
@@ -41,7 +47,8 @@ module.exports = function(grunt) {
             'src/css-parser.21.attr.js',
             'src/css-parser.21.core.js',
             'src/css-parser.21.js',
-            'src/css-parser.3.js'
+            'src/css-parser.3.js',
+            'src/css-parser.strict.attr.js'
           ],
           coverage:true,
           check: {

src/css-parser.js

@@ -11,6 +11,7 @@ Authors: Nera Liu <neraliu@yahoo-inc.com, neraliu@gmail.com>
 var cssParser21 = require('./css-parser.21.js');
 var cssParser21Core = require('./css-parser.21.core.js');
 var cssStringParser21 = require('./css-parser.21.attr.js');
+var cssStrictStringParser = require('./css-parser.strict.attr.js');
 
 var cssParser3 = require('./css-parser.3.js');
 
@@ -28,6 +29,9 @@ function CSSParser(config) {
     config.ver === "3"? this.cssParser = cssParser3 : '';
     config.ver === "3"? this.cssStringParser = cssStringParser21 : '';
 
+    config.ver === "strict"? this.cssParser = '' : ''; // TODO: need to implement
+    config.ver === "strict"? this.cssStringParser = cssStrictStringParser : '';
+
     this.cssParser === null? this.cssParser = cssParser21 : '';
     this.cssStringParser === null? this.cssStringParser = cssStringParser21 : '';