Merge pull request CSSLint#712 from Aaronius/master

frvge · web-flow · commit 6b1d39545ba6 · 2017-11-11T02:07:47.000+01:00
Removed reliance on "this" being the api object.
diff --git a/dist/csslint-node.js b/dist/csslint-node.js
@@ -162,7 +162,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -255,7 +255,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {
diff --git a/dist/csslint-rhino.js b/dist/csslint-rhino.js
@@ -7720,7 +7720,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -7813,7 +7813,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {
diff --git a/dist/csslint-worker.js b/dist/csslint-worker.js
@@ -7716,7 +7716,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -7809,7 +7809,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {
diff --git a/dist/csslint-wsh.js b/dist/csslint-wsh.js
@@ -7720,7 +7720,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -7813,7 +7813,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {
diff --git a/dist/csslint.js b/dist/csslint.js
@@ -7720,7 +7720,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -7813,7 +7813,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {
diff --git a/src/core/CSSLint.js b/src/core/CSSLint.js
@@ -137,7 +137,7 @@ var CSSLint = (function() {
      * @method format
      */
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
         if (formatter) {
@@ -230,7 +230,7 @@ var CSSLint = (function() {
         }
 
         if (!ruleset) {
-            ruleset = this.getRuleset();
+            ruleset = api.getRuleset();
         }
 
         if (embeddedRuleset.test(text)) {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ var CSSLint = (function() {`
`162`	`162`	`* @method format`
`163`	`163`	`*/`
`164`	`164`	`api.format = function(results, filename, formatId, options) {`
`165`		`- var formatter = this.getFormatter(formatId),`
	`165`	`+ var formatter = api.getFormatter(formatId),`
`166`	`166`	`result = null;`
`167`	`167`
`168`	`168`	`if (formatter) {`
`@@ -255,7 +255,7 @@ var CSSLint = (function() {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`if (!ruleset) {`
`258`		`- ruleset = this.getRuleset();`
	`258`	`+ ruleset = api.getRuleset();`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`if (embeddedRuleset.test(text)) {`
Original file line number	Diff line number	Diff line change
`@@ -7720,7 +7720,7 @@ var CSSLint = (function() {`
`7720`	`7720`	`* @method format`
`7721`	`7721`	`*/`
`7722`	`7722`	`api.format = function(results, filename, formatId, options) {`
`7723`		`- var formatter = this.getFormatter(formatId),`
	`7723`	`+ var formatter = api.getFormatter(formatId),`
`7724`	`7724`	`result = null;`
`7725`	`7725`
`7726`	`7726`	`if (formatter) {`
`@@ -7813,7 +7813,7 @@ var CSSLint = (function() {`
`7813`	`7813`	`}`
`7814`	`7814`
`7815`	`7815`	`if (!ruleset) {`
`7816`		`- ruleset = this.getRuleset();`
	`7816`	`+ ruleset = api.getRuleset();`
`7817`	`7817`	`}`
`7818`	`7818`
`7819`	`7819`	`if (embeddedRuleset.test(text)) {`
Original file line number	Diff line number	Diff line change
`@@ -7716,7 +7716,7 @@ var CSSLint = (function() {`
`7716`	`7716`	`* @method format`
`7717`	`7717`	`*/`
`7718`	`7718`	`api.format = function(results, filename, formatId, options) {`
`7719`		`- var formatter = this.getFormatter(formatId),`
	`7719`	`+ var formatter = api.getFormatter(formatId),`
`7720`	`7720`	`result = null;`
`7721`	`7721`
`7722`	`7722`	`if (formatter) {`
`@@ -7809,7 +7809,7 @@ var CSSLint = (function() {`
`7809`	`7809`	`}`
`7810`	`7810`
`7811`	`7811`	`if (!ruleset) {`
`7812`		`- ruleset = this.getRuleset();`
	`7812`	`+ ruleset = api.getRuleset();`
`7813`	`7813`	`}`
`7814`	`7814`
`7815`	`7815`	`if (embeddedRuleset.test(text)) {`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ var CSSLint = (function() {`
`137`	`137`	`* @method format`
`138`	`138`	`*/`
`139`	`139`	`api.format = function(results, filename, formatId, options) {`
`140`		`- var formatter = this.getFormatter(formatId),`
	`140`	`+ var formatter = api.getFormatter(formatId),`
`141`	`141`	`result = null;`
`142`	`142`
`143`	`143`	`if (formatter) {`
`@@ -230,7 +230,7 @@ var CSSLint = (function() {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`if (!ruleset) {`
`233`		`- ruleset = this.getRuleset();`
	`233`	`+ ruleset = api.getRuleset();`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if (embeddedRuleset.test(text)) {`