Commit graph

275 commits

Author SHA1 Message Date
Bartosz Dziewoński 70ae5ca11d Assume 'redirect=no' for all page views with 'veaction', not just 'veaction=edit'
Bug: T181110
Change-Id: I7e22586d1b9bc02fae6dc0536d2c7efde77632dc
2018-11-02 12:00:22 +01:00
Bartosz Dziewoński a4666b3bea Update VE core submodule to master (caf188be0)
New changes:
a2dff3032 DesktopContext: Don't rely on selection#getDocument
4c1cc1640 Basic test for WindowAction open/close
0ab1e754c Update OOUI to v0.29.3
a8d96b850 Localisation updates from https://translatewiki.net.
b4fa3d230 ResizableNode: Add test for updateSizeLabel
caf188be0 TableNode: Test basic mouse events

Bug: T208228
Bug: T208382
Bug: T208515
Change-Id: I0db7b5e874ad6b23dad1f29bb1a58e126fea7a48
2018-11-02 08:52:57 +01:00
Alangi Derick 4fa5bb7c21 Fix phpDoc reference tags in VisualEditor
Should be "array" instead of "Array".

Change-Id: Ibdd4666e5cbab5a1ef0ceb8d52ffbd36390bba69
2018-10-31 19:05:59 +01:00
Bartosz Dziewoński 9e47873a65 Update VE core submodule to master (236effcd7)
New changes:
0e923fe1b Use initClass in test class
900962720 Add ve.deepFreeze for detecting inadvertent data modification during testing
0761cd90c Localisation updates from https://translatewiki.net.
0e44545b7 Update .gitignore
82b6b80bb Use consistent method for finding nearest cursor offset
0b604de30 ve.ce.TableArrowKeyDownHandler.test: Remove eww gross FIXME

Bug: T202359
Change-Id: I73c46edfbf66a0c76bc719010c017ef71670931b
2018-10-30 00:50:37 +01:00
jenkins-bot a022a27a30 Merge "Simplify handling of messages for section edit links" 2018-10-29 11:02:37 +00:00
jenkins-bot 89b061455d Merge "Use the right localisation message for edit tab on Vector skin" 2018-10-29 11:02:34 +00:00
Bartosz Dziewoński ac45e919ab Update VE core submodule to master (d89186159)
New changes:
d89186159 Add F2 keydown handler

Bug: T172042
Change-Id: I3bc2bb33bec2f5f08f26af49ab8b72e436dbe4cf
2018-10-24 20:51:36 +02:00
Ed Sanders ad3fc3c12d Add missing ce.Selection tests from core
Change-Id: I95f19bbf12e92b7062f3a332dc6c3d68cc6af492
2018-10-23 23:19:09 +01:00
Ed Sanders c895c60907 Add Promise.prototype.finally polyfill and restore failing tests
Change-Id: Ia6cdb85d33d2b3e0e2e868838defaa39ae60572a
2018-10-23 22:56:34 +01:00
James D. Forrester e4724b3f26 Update VE core submodule to master (6c288b44f)
New changes:
7c9fe89b8 Simplify ve.test.utils.runSurfaceHandleSpecialKeyTest API
0e3c75e66 Add more tests to LinearArrowKeyDownHandler
058362830 LinearArrowKeyDownHandler: Test Selection#extend fallback
8c6617d90 Keydown test refactor
91a909d63 Assert defaultPrevented state in KeyDown tests
003dacf3b LinearDeleteKeyDownHandler: Test shift+delete
1872158c5 LinearDeleteKeyDownHandler: Test delete next to link
b2af2a2c3 LinearEnterKeyDownHandler: Add more tests
4e5efa956 KeyDownTests: Remove unused constructor calls for all static classes
1cafb7328 KeyDown tests: Add tests for missing cases to cover tab/escape/enter
58af8d497 Add tests for ve.ce.AnnotationFactory/NodeFactory
617bc24a4 Delete unused ve.ce.modelChangeFromContentChange
50704fa1c Keydown tests: run asynchronously
af9a01b97 Use native promises instead of jQuery promises
df212669a Localisation updates from https://translatewiki.net.
f6af901dc Fix test in Chrome 70
9cc6dae7e Remove broken checks for DM code coverage
ce3a9199a LinearEnterKeyDownHandler: Add test for edge case
0a9dd3636 Remove false coverage of TableNode/TableSelection code
16679a3c0 Remove setupToolbar from DummyTarget to avoid false code coverage
7ac88df77 Basic tests for getClientRects in ve.ce.Selection and FocusableNode
78f14ac1f ve.ce.Selection: Add getDirection tests
7ec7efff0 KeyDown tests: Remove unnecessary setTimeout
26e022d23 KeyDown tests: Un-nest functions
df1e0af6c KeyDown tests: rename defer -> then
f03a9f90b Allow ES6 in tests
0ee55022b ES6 eslint follow-up
6c288b44f ve.ce.Surface tests: Trim when asserting expected text

Local changes.

Bug: T207077
Bug: T207078
Bug: T207079
Bug: T207080
Bug: T207083
Bug: T207654
Change-Id: I2e1f664d6f657e2ac26a271f401dc790c2a8b193
2018-10-23 11:49:34 -07:00
Bartosz Dziewoński 62273183a8 Simplify handling of messages for section edit links
Change-Id: I5b84fc3863747b4d092a7025475730bb28efeff2
2018-10-13 03:16:53 +02:00
Bartosz Dziewoński e048c3e188 Use the right localisation message for edit tab on Vector skin
Bug: T206892
Change-Id: If9494be10c684c1d8892a990dd7ba9c68caa4b69
2018-10-13 03:16:53 +02:00
Nasty 124addddaf Fix parse wikitext fragment in paction wikitext.
Whenever wikitext content is inserted by the hook `EditFormPreloadText`,
it is always parsed to visual editor markup even when in wikitext mode.

Bug: T206838
Change-Id: I56f0fb9d4e1519af01155c35d4d0068076de4600
2018-10-12 19:17:29 +00:00
Bartosz Dziewoński e354092417 Update VE core submodule to master (f9afaa3e4)
New changes:
3931cc33a Update OOUI to v0.29.1
5bcab0073 Move node-specific code into rebaser/
8aa80d88b Remove ES6 support for async/await
2536870f9 Separate files for protocol and transport server
b443b7a4f Update OOUI to v0.29.2
70b3ec210 Minor cleanup of ve.ui.MediaSizeWidget

Bug: T206236
Change-Id: Id3bbcd1a9ccb1563e4feb3572aa8f51932677693
2018-10-09 11:06:23 +01:00
jenkins-bot 542004dcb9 Merge "Require Parsoid HTML 2.0.0, and handle its <audio> tags" 2018-10-02 20:47:59 +00:00
Ed Sanders d5d23ee4be Require Parsoid HTML 2.0.0, and handle its <audio> tags
Bug: T201081
Depends-On: I6514b9b0a85588c7eaae5e6989789656cfc3253a
Change-Id: I6052dcf3e414d9506ff7ec7a6b5d8f4eeb4a703a
2018-10-02 12:15:45 -07:00
Ed Sanders 327f600ca1 Fix special page override
Bug: T204873
Change-Id: I463cbbbc5b6f284aa2794ceb2652911ef7053c2e
2018-09-19 21:26:49 +01:00
Ed Sanders 164ccecf4d CollabPad: Show current sub-page as separate tab
Change-Id: I15da5a3122e7a0dfeb5131e528efa498a7cd1356
2018-09-17 16:25:42 +00:00
Ed Sanders 7eb836adbc Update VE core submodule to master (7420443fe)
New changes:
a273ba69c [BREAKING CHANGE] Implement a SourceConverter

Local changes:
* Use SourceConverter
* Handle `this.doc` being a string in source mode now

Bug: T203114
Bug: T203156
Change-Id: I7bce7b57668e0c1dd511803a54178ae69694a86d
2018-09-14 11:42:34 +01:00
libraryupgrader fec1e679fd build: Updating mediawiki/mediawiki-codesniffer to 22.0.0
Change-Id: Idfe6493936b621cd244723e802c272def8916f08
2018-09-02 21:52:54 +00:00
James D. Forrester 1f452626d6 ApiVisualEditor: Use MediaWikiServices rather than $wgContLang
Change-Id: Ie0a5deaa17db91f0866e35bd51e1e7067345d796
2018-08-14 17:10:40 +00:00
Bartosz Dziewoński 39208b7d40 Update VE core submodule to master (2859146e5)
New changes:
fa5d35054 Only re-use session token if docname matches
58d7cd280 Localisation updates from https://translatewiki.net.
d0716d8e7 Update files generated with new l10n language 'my'
2cc7a4423 Create unit tests for sequences
873fdd01e Upstream horizontalRule sequence and fix command

Local changes:
* Register unit test file for sequences
* Remove duplicate horizontal rule sequence

Change-Id: Ibc65cf5c086428bb0d13c8e2f2de5819e1e23d43
2018-08-14 09:20:07 +02:00
Kunal Mehta 8ca03768a1 API: Check whether content is deflated before trying to inflate it
Bug: T201083
Change-Id: I5cad1848b19460ba86043d4627413f939b6d3a5f
2018-08-02 12:38:55 -07:00
Ed Sanders 36d15222bf rebaser: Make create/edit button primary+progressive
Change-Id: I4dc5225ae691a9f8b11d2c7c4a980a2bbc169fd4
2018-08-01 15:34:43 -04:00
jenkins-bot 7c215c4ca3 Merge "ApiVisualEditor: warn of deleted pages in edit notices" 2018-07-31 22:36:14 +00:00
Ed Sanders a6ea005f15 Remove EasyDeflate libs, upstreamed to core
Change-Id: I70ac6669038238b91eba8484792b75b09e7355d4
Depends-On: I12a5879188f46f17dc4c33bdad52317d218d4172
Depends-On: I0fa382c2828ff2644ed308dc1ccca85735d0a80d
2018-07-26 18:18:52 +00:00
Kunal Mehta 53f8f32895 Don't use PAGE_IMAGES_INSTALLED
Bug: T200381
Change-Id: I0b9725fa4b3c4ce4fbb1004cfd3570ba39865fc1
2018-07-25 16:19:09 -07:00
James D. Forrester f08eb6028a Update VE core submodule to master (8d0ab0587)
New changes:
cd6932096 Fix rebaser dependecies
bdcbf8f81 Rebaser: make the server synchronous again
52e6873b1 Cleanup rebaser
31ef4c5ec Handle authentication and reconnection
22d6feea3 Squash Changes to use fewer transactions
4d93f0819 Fix confusion between #getSetupProcess and #getReadyProcess
8d0ab0587 Localisation updates from https://translatewiki.net.

Bug: T185745
Bug: T185944
Bug: T188026
Change-Id: Ie33d3dd4746c9c91fe676f140f416af72ac218b0
2018-07-18 02:54:07 +02:00
David Lynch 54e9de44c3 ApiVisualEditor: warn of deleted pages in edit notices
Replicate the EditPage#showIntro segment which shows a warning and the
deletion log if attempting to recreate an already-deleted page.

Bug: T199087
Change-Id: I3c680e712c010dc614710b3aa9f41c8ec17999a7
2018-07-12 11:34:22 -05:00
James D. Forrester dfe27be40c Update VE core submodule to master (bbe825690)
New changes:
e761c7e80 Localisation updates from https://translatewiki.net.
7ffaf8c86 Change clear styling label in contexts
8727b8823 Localisation updates from https://translatewiki.net.
903fe9a6e Localisation updates from https://translatewiki.net.
2d0db8666 Change transaction manipulation functions into methods
198b35a70 Handle ctrl+click events on links
90ea4832e Fix cleanup of PreviewElement after render
3f888e8b2 ve.ui.TableLineContext: Use automatic width
37d42880e Create basic tests for PreviewElement

Bug: T145850
Bug: T195707
Bug: T198064
Bug: T198826
Bug: T198871
Change-Id: Id02adf9f5d85574ee9c7d3ef7c32c19bfcb06a45
2018-07-05 16:09:49 -07:00
Jack Phoenix d9066c829c Replace wfMemcKey with $wgMemc->makeKey
Change-Id: I959edd0816917bc49deb40d6990517afdcbeae15
2018-07-02 14:43:06 +00:00
Ed Sanders bb1d7271cd Pass content language in Accept-Language header to RESTBase
Bug: T198186
Change-Id: I2176f68f76fa462de0c1c2c47365de62fda4abe0
2018-06-26 16:42:35 +01:00
Ed Sanders 1b116394cf Correct documentation of $title Title object and add type hints
Change-Id: I8108161e2330d54e9e3f9969ead9352cc5810fb0
2018-06-26 16:35:46 +01:00
jenkins-bot 5d9f90ea46 Merge "Follow-up I213bd946f: Correct URL of Parsoid HTML profile" 2018-06-22 17:49:17 +00:00
C. Scott Ananian 83918e735a Follow-up I213bd946f: Correct URL of Parsoid HTML profile
The URL for the HTML profile used by Parsoid changed after 1.2.x, but
it was never updated in VE.

Change-Id: Id4ab8567dc907b71e790a04ab10044c1e081c8ce
2018-06-22 10:27:00 -07:00
jenkins-bot fbb83cc391 Merge "Update VE to request Parsoid HTML v1.7.0" 2018-06-21 22:31:25 +00:00
C. Scott Ananian a13b8ae178 Update VE to request Parsoid HTML v1.7.0
The seasons change, and so do Parsoid HTML specifications...

Change-Id: I213bd946f6f1547f76a4ea352c7cb083ebadd602
2018-06-21 16:41:02 -04:00
Ed Sanders b6d03da278 Add MW-specific DiffElement tests
Change-Id: If3dfa660b49bceef2da8dc7ec113225aaa7f59f5
Depends-On: Ib4ad16858e4241d33d018830dbcfded63ff703af
2018-06-19 16:04:08 +01:00
jenkins-bot c9f3f45b9d Merge "ApiVisualEditor: Defensively check that query prop revisions returns arrays" 2018-05-30 22:03:35 +00:00
libraryupgrader 54f9335232 build: Updating mediawiki/mediawiki-codesniffer to 20.0.0
Change-Id: Idfc004c9439d9b8421f378fdd559990b09ad851c
2018-05-25 23:18:11 +00:00
James D. Forrester d4841abbb6 ApiVisualEditor: Defensively check that query prop revisions returns arrays
I can't see where this would return a string, but users are reporting that
they're getting that at times…

Bug: T193718
Change-Id: I6b635bacdd59431568bc5c679e455f67cb764df0
2018-05-25 21:04:38 +00:00
Ed Sanders ab59f3d06f Update VE core submodule to master (d214a66aa)
New changes:
aa8b2d3da rebaser: Clarify document name is optional
eb4955b84 $.isEmptyObject -> ve.isEmptyObject
681fa50e1 Don't use $.isNumeric in DM
0c8483d8a Avoid more jQuery in DM
a9f6bef78 Replace $.extend with ve.extendObject
34eb4311d Initialise socketIO twice to avoid query cache
b70cb7520 Teardown synchronizer
8f829895f Use passive event listeners
f9e84fa8b Localisation updates from https://translatewiki.net.
db24bb81c ve.ce.FocusableNode: Fix minor code issues
ae981404e Rebaser: show connect/disconnect in the server console
0118e89c2 Show progress bar while connecting to rebase server
160bbe5fd Use new name for 'comment' icon, 'speechBubble'
fb549248a Remove unused APIResults* objects
5daa71d7e Remove IE9 support comment

Bug: T178371
Bug: T195111
Depends-On: I186ebd9d63299d828692a745b62fbc4314a4ed4e
Change-Id: Ie0fee3d4cc069383b8cb48e7d6c2ff520fedb590
2018-05-23 09:01:07 -07:00
Ed Sanders 0fe6c53b2e Import button for CollabPad
Change-Id: I1f454fb7914b2de0cb5f393aeed9001b6a5a2e40
2018-05-19 19:42:35 +08:00
Ed Sanders 2fac1cc985 Fix ActionFieldLayout in monobook
Change-Id: Iae2c707c13369f16ee8f55fc12adde4139b3ab09
2018-05-13 20:19:06 +01:00
Ed Sanders c059082a8f Rebase: Use i18n for subpage title
Change-Id: Ibea75035cc1af0c1c215f6038435ca9657c44984
2018-05-01 10:29:51 +01:00
Bartosz Dziewoński 4efc2f876d VisualEditorDataModule: Remove origin restriction
"ORIGIN_USER_SITEWIDE" indicates "sitewide module generated from
user-editable files, like MediaWiki:Common.js". In this case the
JavaScript generated by this module is not directly editably by wiki
users. It includes localisation messages editable by users, but that
is considered safe because we correctly escape them when including
them in the JavaScript code.

Without this change, VisualEditor would no longer load in safe mode
(T185303) because this module would be missing.

Bug: T185303
Change-Id: I6d097ccbf1dc2462843219adcf96bf8313e30289
2018-04-30 21:58:18 +02:00
Ed Sanders 185c94087f Rebaser: Use site language on special page
Change-Id: I3a07083bb64e9b398cd403a1a0458b40f054672b
2018-04-22 22:18:45 +01:00
Fomafix 30f7728a71 Fix typo in comment
Change-Id: If19045e432d6de8e6c8352518b5dacd70eda41ce
2018-04-15 14:30:31 +02:00
jenkins-bot f5b0d655cf Merge "FeedbackTool: Add the ability to vary feedback page for source mode" 2018-04-04 21:24:09 +00:00
James D. Forrester 31730cc5b3 FeedbackTool: Add the ability to vary feedback page for source mode
Wikis with a local link over-ride configured will need to do so here
for the new message `visualeditor-sourcefeedback-link`; wikis with a
remote link configured will need to update their configuration ahead
of this being deployed, setting $wgVisualEditorSourceFeedbackTitle.

Bug: T157953
Change-Id: Iea7ad8328b03f69e01d7c67ca1ddbb7ae7906288
2018-04-04 18:11:10 +00:00
jenkins-bot 459f35924c Merge "DiffPage: Remember chosen diff mode" 2018-04-04 16:34:54 +00:00
jenkins-bot 5904c25e83 Merge "ApiVisualEditor: Remove unused variable and add some type hints" 2018-04-03 19:33:32 +00:00
jenkins-bot 690c7c4280 Merge "doc: Document all public and protected PHP functions" 2018-04-03 19:29:41 +00:00
Kunal Mehta 3d48221600 ApiVisualEditor: Remove unused variable and add some type hints
Change-Id: Ic16d223a6bbdb4b80474d7749f6b4e6c4df8b65b
2018-04-03 11:21:11 -07:00
Kunal Mehta a087e447ae Avoid unnecessary use of RequestContext::getMain()
Change-Id: I4d226a0543e16aa22b28a6a403ce5c6892dc5924
2018-04-02 19:33:25 -07:00
James D. Forrester 31f667ccf7 doc: Document all public and protected PHP functions
Also move the maintenane script to a name that makes
MediaWiki.Files.ClassMatchesFilename.NotMatch not error,
and use the more restrictive licence tag usage for
MediaWiki.Commenting.LicenseComment.InvalidLicenseTag.

Change-Id: Ifa5518cd590ae83c6fd76f1dbb5a2ce40de4b119
2018-03-28 12:50:44 -07:00
Aryeh Gregor 6ebb3dad65 Required API parameters cannot have defaults
It doesn't make sense to have a default action here, per Esanders.

Blocks I4a2505cfc8e86e73e46d40acffbf3cd8803458e2.

Change-Id: I02259a5117f3539593ccd09cfd4c8271e8464388
2018-03-28 16:49:19 +03:00
David Lynch 75af29b57d DiffPage: Remember chosen diff mode
Use a new preference: visualeditor-diffmode-historical.

Bug: T189896
Change-Id: I0575cc0a86dc0683758d24c0f597834e38cf1095
2018-03-22 01:41:14 -05:00
Brad Jorsch 391c30da67 Update for the actor table change
Core change I8d825eb0 begins the process of changing core database
tables from using xx_user and xx_user_text fields to using xx_actor.
This updates the extension to continue to function during and after the
transition.

Bug: T167246
Change-Id: Iccbd9ee2edaae5d779077dddc6fe449ec8428e99
2018-03-21 12:39:26 -07:00
Bartosz Dziewoński faa0bfb0f7 VisualEditorDataModule: Remove 'minoredit' and 'watchthis' messages
These messages are used for the checkboxes when saving the page.
But we don't actually use the data from this module; we get them
from the 'action=visualeditor' API in the 'checkboxesMessages'
property. This is necessary because MediaWiki extensions can add
extra checkboxes (e.g. FlaggedRevs), so a static list won't do.
These are unused since 393807462e
(2013) and it is confusing to keep them here.

Change-Id: Ia4ed2142292c3a22623f498c7f43ce590f167709
2018-03-16 01:33:28 +01:00
jenkins-bot 98d240334d Merge "Use action=compare for wikitext diffs" 2018-03-14 19:19:14 +00:00
James D. Forrester f9ab5fa6fe ApiVisualEditor: Replace use of ApiBase::dieUsage() with ::dieWithError()
Bug: T189205
Change-Id: Ic75594c0a9388814b4ecc887c4262cbbe858d7f9
2018-03-14 10:21:03 +01:00
Ed Sanders 2b033f6ee0 Use action=compare for wikitext diffs
Diffing in action=query is deprecated since 1.30.

Bug: T189397
Change-Id: Ic1fecd4517a1410e3c8e3593a031ad7b8ffb57d4
2018-03-10 22:32:02 +00:00
James D. Forrester 285254979a Hooks: Don't register beta features if they're enabled for all
Change-Id: I8a618a8ce76f48b143955dd7a5877b68d8e1205d
2018-03-08 14:41:40 +00:00
James D. Forrester d144599cea Update VE core submodule to master (ca771b8bc)
New changes:
7551f6c66 [BREAKING CHANGE] Rename class ve.dm.IndexValueStore->ve.dm.HashValueStore

Local changes:
Follow-through rename of IndexValueStore->HashValueStore

Bug: T188900
Change-Id: If60d0c637fe92f0e7afe916c064fafb17980d063
2018-03-06 12:55:30 +00:00
James D. Forrester 1f38e7f87b Revert "Follow-up e19092240: During the config cut-over, don't graduate 2017WTE"
For Monday.

This reverts commit 89c0fb9d25.

Change-Id: I9140d4bf8113741f08fdfc3ec5de918930468598
2018-02-26 14:58:39 -08:00
James D. Forrester 4dfacbbca7 Follow-up 89c0fb9d2: Consistency, consistency
Change-Id: I4e1efe4570cdd9595c2480309d771e036362bdb9
2018-02-26 14:57:36 -08:00
James D. Forrester 89c0fb9d25 Follow-up e19092240: During the config cut-over, don't graduate 2017WTE
In e19092240 the ability to configure the 2017WTE to be "graduated" out of
beta and available to all. However, for a week of config cut-over, this is
re-using a config switch which previously gated the beta feature, and so
will be immediately available to all users until we put it back under beta
when Ie13215bd is deployed. Oops.

Change-Id: I1bc556849a6eb1e895f03412a9cb78002c8a0aee
2018-02-26 14:00:20 -08:00
James D. Forrester e190922403 Make it possible for wikis to have the 2017 wikitext editor by default
Bug: T150578
Change-Id: I1cb47a044c9c8ee58229d83ee98dbdd1f07af9de
2018-02-26 20:23:14 +00:00
James D. Forrester 4ede488647 Simplify 2017 wikitext editor config when Beta Features is enabled
Depends-On: Id12e08f9dca0a6676488a255480670e9badeb300
Change-Id: Ibe031f0ce5a7b06aa4b8f6d59c2a85b873b8e35b
2018-02-26 12:27:19 +00:00
Ed Sanders ec8208d125 Follow-up Idbcb76f: Only apply /includes folder fix to local path
Also use dirname(__DIR__) instead of appending ../

Change-Id: Ie88fb03617b25a675e1f4af97f8cb7c29c2fb8b3
2018-02-12 21:59:22 +00:00
Jayprakash12345 936dbda876 Update at-ease calls in extensions
Bug: T187037
Change-Id: Ifbba289cc78eb005fa974cdb941b17335974ec78
2018-02-12 19:20:59 +00:00
David Lynch 468c913cb9 ApiVisualEditor: Update getPreloadContent's parseWikitextFragment call
9770c806 missed updating this call; update it to include bodyOnly parameter.

Bug: T186884
Bug: T186934
Change-Id: I616101f6bf3bd0b3af2236207c2ac217988d1724
2018-02-10 17:07:55 +00:00
James D. Forrester 7bd26fb361 Follow-up fa9438e5f: Fix path to back-up data source for non-ULS installs
Bug: T186903
Change-Id: Idbcb76f54eb57b0a56b46188526858038d698627
2018-02-09 10:32:41 -08:00
James D. Forrester fa9438e5fa build: Move PHP files to expected paths
Principal code is in includes/*.php with the file named the same as the class it
contains. The maintenance script is moved to maintenance/ for clarity.

Change-Id: Icb4cdffb1bd4716e14f883d667def96671b42992
2018-02-07 12:31:08 -08:00