jenkins-bot has submitted this change and it was merged.
Change subject: Fix new lint warnings previously uncaught by jshint
......................................................................
Fix new lint warnings previously uncaught by jshint
The new jshint (0.9.1 > 1.1.0) is smarter about detecting trailing
whitespace (which enabled in our jshintrc file).
Looks like we did indeed let it slip through a few times in ve.Document.
Also cleaning up comment from * to - for consistency and avoiding
block-comment characters.
Change-Id: Ie1621816d608b5c42028ee945346d872a747c6a4
---
M modules/ve/ve.Document.js
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ve.Document.js b/modules/ve/ve.Document.js
index 2448367..937027a 100644
--- a/modules/ve/ve.Document.js
+++ b/modules/ve/ve.Document.js
@@ -181,11 +181,11 @@
} else if ( startBetween ) {
// start is between the previous sibling and node
// so the selection covers all or part of node
-
+
// Descend if
- // * we are in leaves mode, OR
- // * we are in covered mode and the end is inside node
OR
- // * we are in branches mode and node is a branch (can
have grandchildren)
+ // - we are in leaves mode, OR
+ // - we are in covered mode and the end is inside node
OR
+ // - we are in branches mode and node is a branch (can
have grandchildren)
if ( ( mode === 'leaves' ||
( mode === 'covered' && endInside ) ||
( mode === 'branches' &&
node.canHaveGrandchildren() ) ) &&
@@ -300,7 +300,7 @@
// end is between node and the next sibling
// start is not inside node, so the selection covers
// all of node, then ends
-
+
if (
( mode === 'leaves' || ( mode === 'branches' &&
node.canHaveGrandchildren() ) ) &&
node.children && node.children.length
@@ -403,7 +403,7 @@
} );
}
}
-
+
// Move to the next node
if ( nextNode ) {
// The next node exists
@@ -458,7 +458,7 @@
// (this is present for sure, because the
parent has children)
left++;
}
-
+
// Skip over nextNode's opening if present
if ( nextNode.isWrapped() ) {
left++;
--
To view, visit https://gerrit.wikimedia.org/r/53504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1621816d608b5c42028ee945346d872a747c6a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
