jenkins-bot has submitted this change and it was merged.

Change subject: Re-enable jshint warnings
......................................................................


Re-enable jshint warnings

This syntax isn't function scoped like the other one.

Change-Id: I33592296a167795b9b17ba7aa2a46c608a3f54cb
---
M js/lib/mediawiki.TokenTransformManager.js
M js/lib/pegTokenizer.pegjs.txt
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  GWicke: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/lib/mediawiki.TokenTransformManager.js 
b/js/lib/mediawiki.TokenTransformManager.js
index 9182405..1003e2c 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -1489,9 +1489,10 @@
        // options.type to specify source type
        // options.phase to specify source expansion stage
        if ( source.constructor === String ) {
-               /* jshint -W053 */
+               /*jshint -W053 */
                // we need to make a non-primitive string in order to add 
properties
                source = new String( source );
+               /*jshint +W053 */
                source.get = this._getID;
                return source;
        } else {
diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index d7b79dc..ab5dabc 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -519,9 +519,10 @@
         b = flattenIfArray(b);
         var bs = b[0];
         if ( bs.constructor === String && bs.attribs === undefined ) {
-            /* jshint -W053 */
+            /*jshint -W053 */
             // we need to make a non-primitive string in order to add 
properties
             b[0] = new String( bs );
+            /*jshint +W053 */
             bs = b[0];
         }
         if (bs.dataAttribs === undefined) {

-- 
To view, visit https://gerrit.wikimedia.org/r/79348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I33592296a167795b9b17ba7aa2a46c608a3f54cb
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to