Commit graph

1858 commits

Author SHA1 Message Date
jenkins-bot 2a9562aca5 Merge "MWAceEditorWidget: Fix position of ace tooltip" 2017-03-15 19:23:38 +00:00
Ed Sanders 6fc47dce64 MWAceEditorWidget: Fix position of ace tooltip
The floating tooltip breaks inside OOUI dialogs. In the absence
of an upstream fix, just anchor it to the bottom of the textbox.

Bug: T160245
Change-Id: I9055c4e4947f5581605bd490f076415c1edaf8ec
2017-03-15 12:02:27 -07:00
jenkins-bot 6e14a1eb8e Merge "MWExtensionWindow: Remove pointless zero argument from ve.debounce call" 2017-03-15 18:24:09 +00:00
Ed Sanders 5086b45f15 MWExtensionWindow: Remove pointless zero argument from ve.debounce call
Change-Id: I58a048af0e6397592e84554024aed3a17c5e5977
2017-03-15 17:57:54 +00:00
Ed Sanders 97a8041bf2 MWMediaInfoFieldWidget: Add extra rules for word-break: break-word
We use three rules elsewhere for better browser support

Change-Id: Ic2ecd12c3f78bc3a2d45a10b5305449e7de82b75
2017-03-15 17:56:53 +00:00
Bartosz Dziewoński 49f603c703 Update <pre> support for Parsoid changes
After 79ccfb9372cb57afa569036ef39ead13abfba673, MediaWiki's `<pre>`
tags get rendered as `<pre typeof="mw:Extension/pre">` in Parsoid HTML.
MediaWiki's indent-pre syntax (block indented by a single space) is
still rendered as `<pre>` in Parsoid HTML, however.

Indent-pre is still handled by MWPreformattedNode (no changes).
Introducing MWPreNode, which will handle `<pre>` extension tags,
and MWPreDialog to change its contents (and allow converting
to MWPreformattedNode).

Pieces copied from MWGalleryNode, MWLinkNodeInspector, CommentInspector.

Possible future improvements:
* Add a specific icon for MWPreContextItem
* Avoid API roundtrips for rendering (but rendering wikitext <pre>
  is not as simple as it looks)
* Consider a way to insert these other than '<pre' sequence

Bug: T159900
Change-Id: I5bc4ea6e5d893736f65ef0dd43b08c18cb1a1e85
2017-03-14 14:08:50 -07:00
jenkins-bot 399d03df5f Merge "Update gallery actions in response to changes" 2017-03-14 19:43:22 +00:00
Thalia 586cb06821 Update gallery actions in response to changes
Bug: T62311
Change-Id: Icf51b92cb9a88471c5f11843473523787c177742
2017-03-14 19:10:34 +00:00
jenkins-bot 369ad5ca26 Merge "ve.ui.MWWikitextStringTransferHandler: Avoid API call for magic links" 2017-03-14 16:08:00 +00:00
Bartosz Dziewoński b109c3405f ve.ui.MWWikitextStringTransferHandler: Avoid API call for magic links
Updated tests to stop assuming that MWWikitextStringTransferHandler
always goes through an API request and Parsoid.

Bug: T117165
Change-Id: I24dffaaf3b4051b1b807ec29ac456d24da2f1fe9
2017-03-13 19:54:19 +01:00
Thalia c3650a9c07 Remove line breaks from gallery dialog captions
A gallery tag is parsed line by line, so captions
(and other image data) should not contain line breaks

Bug: T153373
Change-Id: Ib1d1c18216d07c83b2d4358d2dda71c9d17e3e44
2017-03-10 17:27:22 +00:00
jenkins-bot 10857b2d9f Merge "ve.ui.MWMagicLinkNodeContextItem: Do not display 'Clear styling' button in context" 2017-03-09 16:59:28 +00:00
Bartosz Dziewoński 7b618c55aa ve.ui.MWGalleryDialog: Fix 'Display mode' dropdown options' styling
It's actually a bit surprising that the only thing broken by using
OptionWidget instead of MenuOptionWidget is some missing styles.

Change-Id: I3961fedbfc61f2f17d91dc7375d47a3cdff2a257
2017-03-09 16:16:21 +01:00
Bartosz Dziewoński 48f227b263 ve.ui.MWMagicLinkNodeContextItem: Do not display 'Clear styling' button in context
It doesn't work, you can't turn a MWMagicLinkNode into text by
clearing its styling. (You can still do that by clicking 'Edit',
'Convert to simple link', 'Clear styling'.)

`clearable = true` was being inherited from ve.ui.LinkContextItem.

Change-Id: Ib40e952554966fb74b3e72662a6e1e44ad748a57
2017-03-07 16:34:18 +01:00
Ed Sanders 8802aa331b Add external classes to mw:ExtLinks in NWE preview
Bug: T153413
Change-Id: I118d3b1794b99ed2d120dd5c5201c1fd18b6245b
2017-03-03 22:46:21 +00:00
jenkins-bot 5aba0ee22b Merge "Improve NWE new section styles" 2017-03-03 18:06:04 +00:00
Ed Sanders 06fa5166c7 Improve NWE new section styles
* Use <h2> for TextInputWidget to avoid duplicating skin styles
* Fix placeholder colour and font

Change-Id: I36c0b79ec9cbf3fa2ead0541ef5bac4a14a8781b
2017-03-03 11:59:06 +00:00
jenkins-bot ec897c120b Merge "Pass $overlay to FieldsetLayout and FieldLayout in various places" 2017-03-01 00:35:06 +00:00
Volker E 4e4d1da7a3 Transclusion dialog: Add VE specific rules from OOjs UI
Adding VE specific rules from OOjs UI in preparation of removing them
from the library.

Change-Id: I798717b60badb521d28f8f7a7036a99e5a26d61a
2017-02-28 12:24:22 -08:00
jenkins-bot 2e2a5e452c Merge "Use list tool group for editor switching" 2017-02-28 18:33:44 +00:00
Ed Sanders 5ca02bae09 Use ems for mobile surface font sizes, and add top/bottom spacing
Change-Id: Ida827b54a49c427f2fad2de1f634d8c4e4d28154
2017-02-28 15:07:39 +00:00
Ed Sanders cb60db4c7f Use list tool group for editor switching
Bug: T116417
Change-Id: Iadf5a81e2733ab81fe25c686dcd6dad8eac3885c
2017-02-28 15:06:48 +00:00
James D. Forrester 440a73206d For the mode switch tool, show a different tooltip when disabled
Bug: T158723
Change-Id: I8c397e9b10c51d78c0b0f18c494ca9f36400d23e
2017-02-24 08:49:47 -08:00
James D. Forrester dddd2c0180 build: Bump grunt-jsonlint to latest and make pass
grunt-jsonlint       1.0.8  →   1.1.0

Change-Id: I4a5cdd39f6215cc61a1ef530386a87fdcb0c0088
2017-02-17 16:12:12 -08:00
James D. Forrester cc239a08da build: Bump stylelint and make pass
grunt-stylelint              0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
2017-02-17 15:23:12 -08:00
jenkins-bot 97d689c824 Merge "MWSaveDialog: Switch to save panel when showing message" 2017-02-16 17:14:12 +00:00
jenkins-bot 6b6df0759e Merge "Tables: Add support for editing mw-collapsible/mw-collapsed" 2017-02-16 16:39:36 +00:00
David Lynch 288422cb9e MWSaveDialog: Switch to save panel when showing message
Fixing T107251 made it so that clicking "save" always switched back to the
save panel momentarily, causing a flicker of "maybe I can edit this"
experience. With this change, we can only switch back to the save panel when
saving from other panels if a message is being shown.

Bug: T156891
Change-Id: I8f67693283e61c39cfce40ee12d5c6788dd97932
2017-02-16 10:32:21 -06:00
Ed Sanders 9337e6ecbd Tables: Add support for editing mw-collapsible/mw-collapsed
We don't support editing <div>s right now (as they're BranchNodes) nor
<span>s (as they're annotations), but most of those are inside templates
and so not editable in VE anyway.

Bug: T157989
Change-Id: I647b2a544fd16952696d0de8d07cb72189b27ecb
2017-02-16 17:21:44 +01:00
Bartosz Dziewoński 22df25c108 Pass $overlay to FieldsetLayout and FieldLayout in various places
We now use dialog's overlay in every case where we have a FieldsetLayout
or a FieldLayout with a help popup inside a dialog.

Bug: T100571
Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
2017-02-16 02:56:03 +01:00
Bartosz Dziewoński c3be577216 ve.ui.MWAdvancedSettingsPage: Actually display help for settings about language variants
Follow-up to 712ea472d3.

Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
2017-02-16 02:19:09 +01:00
Ed Sanders 08b3f73f16 MWTableDialog: Extend initial values so 'done' button behaves correctly
Depends-On: I608431365f2a482536affe1dae3fe21bc20e16b4
Change-Id: Idd468caa9417ffd8e0475083c884ef6c554ee152
2017-02-13 08:30:51 -08:00
Ed Sanders 444ed0b7d8 MWTableDialog: Inherit actions from core
Change-Id: Ice7f18ac2e1b7728a52a48482728d1b1278ca66f
2017-02-13 08:30:51 -08:00
Bartosz Dziewoński aa22a8c482 vw.ui.MWTableDialog: Add "Cancel" button
The dialog already supports cancelling by pressing Escape,
but the usual dedicated button was missing.

Change-Id: Ic63b5b59940a43474051466bdbbba0dbeb4342a9
2017-02-10 15:26:33 +01:00
Bartosz Dziewoński 5200f2ef34 ve.ui.MWSaveDialog: Show a hint to use Ctrl+Enter to submit when pressing Enter
Or Cmd+Enter for Mac.

Depends on VisualEditor core changes:
* I93f50e325f993d82a821bf02f5e7f56fe1b9de62
* Id0a357b038fc5730f61bcf3ba730838dcda9b00e

Bug: T153241
Change-Id: I6b0a5e2c4e4ec72016463c8ba6576d33d59be8e5
2017-02-09 16:47:41 +00:00
Ed Sanders 8ab21d2ef5 Move wikitext signature command to correct file
So that signature availability is checked.

Bug: T157286
Change-Id: If1e585ce02e0bc9f5aa93129d315f83f183f5952
2017-02-07 20:21:32 +00:00
Bartosz Dziewoński e8d99c5536 ve.ui.MWSaveDialog: Prettify the 'messages' shown
This is currently used to display a warning about missing edit summary
and to display a CAPTCHA field. They now appear in a separated area at
the bottom of the dialog, which slides into view when a message is
added.

Change-Id: I7541284a92d5fd2fa8f469d479e059098c59c0ac
2017-01-31 17:37:00 +00:00
Bartosz Dziewoński a0cb3029cb ve.ui.MWSaveDialog: Remove unused $saveActions div
Change-Id: I47da48b29d3bddd598946de655cf1e8b086daf45
2017-01-31 13:43:47 +01:00
jenkins-bot 7b46d105b1 Merge "Advanced Settings: improve displaytitle field" 2017-01-30 19:40:13 +00:00
David Lynch 00fb8c8e58 Advanced Settings: improve displaytitle field
* Remove the checkbox; an empty field, or a value exactly equal to the page
  title means no displaytitle.
* Automatically fill the field with the current page title
* The field was mispositioned

Bug: T155818
Bug: T156665
Change-Id: I46db6b14616c9a021e757284972537cac00546a1
2017-01-30 19:29:25 +00:00
jenkins-bot 19c0dd3aa4 Merge "MWSaveDialog: only focus summary if we're on the save panel" 2017-01-27 07:25:31 +00:00
David Lynch 60866eade2 Override ui.CommentInspector so that copying from it sets text/x-wiki
Bug: T154837
Change-Id: I3413c955aa23d34683e1a028a581b1ea34d55d49
2017-01-27 01:13:41 -06:00
David Lynch b976f2cf38 MWSaveDialog: only focus summary if we're on the save panel
Firefox throws exceptions when trying to focus hidden inputs. Using the
"preview" keyboard shortcut entirely bypasses the save panel, but the ready
process assumes it'll always be opened first.

Bug: T153958
Change-Id: Ifb3861116565e77c30b3874fe47889298c3ace6d
2017-01-27 00:51:33 -06:00
jenkins-bot fb1d1cdfaf Merge "Use target=_blank for link in template 'extra description'" 2017-01-25 12:53:03 +00:00
Ed Sanders 133da969ce Use target=_blank for link in template 'extra description'
We already do this for 'missing description'.

Bug: T155879
Change-Id: Iccf48070ab2b5890d6891856be4ee5cce5308d0d
2017-01-23 13:07:53 +00:00
Thalia 43c2865f90 Update actions on live inspectors and preview dialogs
Make inspectors inheriting from MWLiveExtensionInspector
and dialogs inheriting from MWExtensionPreviewDialog
update their 'done' action every time updatePreview is
called. Since both mix in ExtensionWindow, two new methods,
updateActions and isModified are added there.

This should make it more difficult to insert an empty node
accidentally or create a transaction just by opening and
closing an inspector or dialog.

For more complicated dialogs, or inspectors or dialogs
that don't live-update, this behaviour will have to be
implemented separately.

Bug: T155330
Change-Id: Iacafa01fcd419faaec9b112c96be86693a57d561
2017-01-21 18:29:18 +00:00
Ed Sanders e5555d6d85 Remove MWMobileSurface & Context
The hacks contained within context were ancient and no
longer used, and thanks to a typo in mw.MobileArticleTarget
neither of these classes was being used anyway.

Change-Id: I52f2b6d5aa5ddbcc45ac6107eaf9407570b73672
2017-01-20 23:15:11 +00:00
Ed Sanders 1ae5c13cb9 Update VE core submodule to master (f0dcedb)
New changes:
5b448fa [BREAKING CHANGE] Merge Mobile/DesktopSurface into Surface
2d8959b Localisation updates from https://translatewiki.net.
7eee772 Follow-up 2d8959b: Fix build for added language 'io'
f0dcedb ve.dm.TableMatrix: Really indent ASCII-art comments

Change-Id: I62708f7caeb03b16cd318aab0b0ee3c674e75a26
2017-01-20 14:35:39 -08:00
Ed Sanders 96a3d38cf9 Re-order all meta code to put categories first
For consistency.

Change-Id: Ia5e9728ca4f727f4ce30d5f0c88ac9df8c4d21d0
2017-01-17 00:19:38 +00:00
Ed Sanders 1aeec314d5 Fix correct default page for meta dialog in NWE
Bug: T154639
Change-Id: I49d0f2295b071ae667e111562e30d04b0174c251
2017-01-17 00:17:51 +00:00
Thalia fc61fb9be0 Allow AceEditorWidget to accept autocomplete word list
Bug: T155107
Change-Id: I2dd752fb55a4d5596dbc8b8dc69eb55083d7ec66
2017-01-11 17:26:16 -08:00
James D. Forrester 6795430831 MWMetaDialog: Move categories to the top as they're used most
Bug: T74399
Change-Id: I696d8484ed00c92340f178d5c9dcfe978998dce0
2017-01-04 11:18:00 -08:00
Ed Sanders 808de2acea Add "templates used" page to meta dialog
Bug: T149009
Depends-On: Id617f9afbddf094140133f9659efc4b4e746148c
Change-Id: I63e663d05aefb47274f1f28bdcafc5317c2fc4f6
2017-01-04 18:30:11 +01:00
jenkins-bot cbd88e10ed Merge "Use the monospace hack consistently" 2017-01-03 20:41:03 +00:00
jenkins-bot d816492ca1 Merge "rm stray fileRepoPromise property from media dialog" 2017-01-03 20:24:34 +00:00
Alex Monk 17ced451f4 MWSaveDialogAction: Don't break on strange accesskey messages
Quietly return instead.

Bug: T153472
Change-Id: I7c325624734f122c9fd939aee1192187c63d9247
2017-01-03 11:37:09 -08:00
jenkins-bot 78a38ae6ea Merge "Register shortcuts for minoredit/watchlist" 2017-01-03 18:54:26 +00:00
jenkins-bot 9cc4736708 Merge "ve.ui.MWParameterPage: Restructure constructor to reduce needless work" 2017-01-03 18:44:56 +00:00
jenkins-bot ec6509e86b Merge "ve.ui.MWParameterPage: Hide the "Fall back to plain wikitext" button when in wikitext" 2017-01-03 18:44:54 +00:00
jenkins-bot 6599aaf3f4 Merge "Give focus to preview panel for keyboard scrolling" 2017-01-03 17:58:32 +00:00
James D. Forrester 122f49b2dd build: Bump file copyright notices for 2017
Change-Id: I3c20809e71cc0da58123e1b5f29c4f3aac945496
2017-01-03 08:58:33 -08:00
Ed Sanders c853475a1a Give focus to preview panel for keyboard scrolling
Bug: T154334
Change-Id: Ibc093e3111411b6183bf24528a2e0419ba8d40b6
2016-12-31 22:04:19 +00:00
Ed Sanders c625398b78 Use the monospace hack consistently
Change-Id: I6b223e5f0760902c1f34fa5a284703055c763234
2016-12-28 13:36:14 +00:00
Bartosz Dziewoński a811168c2a ve.ui.MWParameterPage: Restructure constructor to reduce needless work
We were constructing a lot of widgets, and never using them all
(they were forever hidden or not even appended to DOM). For large
transclusions this was causing a noticeable performance hit.

I don't think this quite resolves T134814, but it should improve the
situation.

* this.rawFallbackButton is now constructed and appended only when needed.
* this.removeButton is now constructed and appended only when needed.
* this.infoButton can now be a PopupButtonWidget or a disabled ButtonWidget.

Bug: T134814
Change-Id: I2ea00a88a1ea22b73b0c6d10334a94f45734ec3b
2016-12-27 23:54:49 +00:00
Bartosz Dziewoński e0c97ab2f0 ve.ui.MWParameterPage: Hide the "Fall back to plain wikitext" button when in wikitext
We were trying to hide it by detaching, which did not work because it
was getting attached again in later code. Clicking the button just did
nothing.

Change-Id: I027550eb723c43dc85453959159b93e6e802e099
2016-12-27 23:54:42 +00:00
Bartosz Dziewoński 90ff82a035 Use mw.Message#parseDom where appropriate
Avoid turning DOM into HTML markup and parsing it back into DOM.

Change-Id: I34f56ee60b836a7e0556130a153fc95adb4f3467
2016-12-27 23:54:12 +00:00
Alex Monk d7cf29f1c0 rm stray fileRepoPromise property from media dialog
seems to have gone upstream to core's mw.widgets.APIResultsQueue

Change-Id: I3c2a6dbdca60ceadc9e7175e5f8ad83b7fc4b7a0
2016-12-24 18:59:48 +01:00
Ed Sanders 7611ee5a2c Register shortcuts for minoredit/watchlist
Bug: T153925
Change-Id: I3f569a75a66e816d0a5c4ad966344100510a4f2b
2016-12-23 13:36:48 +00:00
jenkins-bot 50da8d8ab9 Merge "Add comments in some places where we really want to treat messages as HTML" 2016-12-22 00:32:23 +00:00
jenkins-bot 477f892423 Merge "Change wikitext link inspector name to avoid conflict" 2016-12-20 13:44:36 +00:00
Bartosz Dziewoński 72569159b8 Add comments in some places where we really want to treat messages as HTML
Change-Id: I439338dabd4b031ed1c4cfc9d89af5a6f2971676
2016-12-20 10:50:15 +00:00
Ed Sanders 323050467f Change wikitext link inspector name to avoid conflict
This was causing the VE link inspector to fail badly if
NWE was enabled.

Bug: T153668
Change-Id: Ie665715a5f5401e59fc6468b81a4122ca5ebd5a3
2016-12-19 12:03:58 +00:00
James D. Forrester d576fac49f MWTemplatePage: Show a link to the template even when there's a description
Bug: T51772
Change-Id: Ia7084dc7dd4e4c092c0d24b123da19721dca54a9
2016-12-18 21:56:12 +00:00
jenkins-bot 57d49550a0 Merge "Add shortcut for show preview and resolve access key conflicts" 2016-12-16 18:14:17 +00:00
Ed Sanders 4d134cfefc Add shortcut for show preview and resolve access key conflicts
Refactor save dialog setup so logic for canPreview/canReview
is external and passed in.

'Show preview' will show in the VE command help dialog until
I56c1036e6 is merged in core.

Bug: T149914
Change-Id: Id718ad622be43c03df61d12b8688d53462c59f36
2016-12-16 13:33:57 +00:00
Ed Sanders 9728d78126 Resolve URLs in show preview against correct base
Bug: T153277
Change-Id: Icaa6de4618de008fb2024d1dd428114688cb1043
2016-12-15 03:19:16 +00:00
Ed Sanders c92418e4da Fix wikitext handling of DataTransferHandlers when IVStore is used
Bug: T153269
Change-Id: Ida6ffffac6e6a65784dc84a388d3702680a79db9
2016-12-14 22:56:18 +00:00
Ed Sanders 1b726dc9bc Fix DataTransferHandlers when loading source editor directly (no etag)
Bug: T153268
Change-Id: I0b43fd651e26c3d74a5f29e8ed80e5dee28ac399
2016-12-14 22:56:00 +00:00
jenkins-bot 56927ad512 Merge "SaveDialog: Align colour palette and ensure sufficient contrast" 2016-12-13 19:38:51 +00:00
Volker E 48db1c16f8 SaveDialog: Align colour palette and ensure sufficient contrast
Align the colors used in the save dialog to OOjs UI's MediaWiki theme,
increasing the contrast of edit summary counter slightly to ensure WCAG
AA accessiblity levels. Also remove unnecessary duplicated CSS
properties, which are already inherited from OOjs UI styles.

Bug: T153086
Change-Id: Iee6b38e0b11f777dd0ffb0f6802d0b3d7349ddee
2016-12-13 19:26:39 +00:00
Ed Sanders 22f4614eee Show save button on show preview page
Bug: T151261
Change-Id: If80bb8e4e9e412572ab88d13d07a3f92dd353b31
2016-12-13 18:10:09 +00:00
jenkins-bot c4dacd9d24 Merge "Don't focus save dialog during setup to avoid scroll jumping" 2016-12-13 15:31:23 +00:00
jenkins-bot a962e7de3b Merge "Support section=new in NWE" 2016-12-13 13:55:33 +00:00
Ed Sanders 4064c91b8e Don't focus save dialog during setup to avoid scroll jumping
Bug: T153010
Change-Id: Ia535cd5d4ebfc01994f4e440bb5cb7efa5c40802
2016-12-13 12:57:34 +00:00
Ed Sanders 5a8106773c Support section=new in NWE
Bug: T150709
Change-Id: I1002b97060d642df0988da15860a36c13712bade
2016-12-13 12:20:55 +00:00
jenkins-bot 669995c8c2 Merge "Follow-up ae8a2750: Stop passing long-dead second parameter" 2016-12-12 21:20:08 +00:00
Ed Sanders a504aba7c5 MWWikitextLinkAnnotationInspector: Select links after creation
Change-Id: If23d90dc695546e7dddb3c04637e54df47c6f528
2016-12-12 20:09:52 +00:00
Alex Monk c843824c97 Batch gallery imageinfo requests via ImageInfoCache subclass
Also get rid of .join( '|' ) for API request parameters per Bartosz

Bug: T147067
Change-Id: If4444cca300d65e28d6fb9003fcac5e076a5129a
2016-12-06 22:10:19 +00:00
jenkins-bot 446a4e40c4 Merge "SaveDialog inherits from plain dialog, not FragmentDialog" 2016-12-06 19:37:41 +00:00
jenkins-bot bdd1a1b78c Merge "Scroll highlighted item into view in gallery dialog" 2016-12-06 18:30:22 +00:00
jenkins-bot 9b4bc7a3f2 Merge "Disable heights option in gallery dialog when mode is slideshow" 2016-12-06 18:28:51 +00:00
jenkins-bot a2e4d9fa82 Merge "Decrease height of gallery search results for better fit" 2016-12-06 18:23:38 +00:00
Ed Sanders 4f7bba4de9 SaveDialog inherits from plain dialog, not FragmentDialog
Change-Id: I934ab41567ea68e58cfa27451faf499febd68bd1
2016-12-04 11:09:56 +00:00
Thalia 2fd30fb7c5 Decrease height of gallery search results for better fit
Bug: T151509
Change-Id: I92c812952457df99251fc0b8f1a17d4e55fe52f7
2016-12-03 16:31:23 +00:00
Thalia 1b4d70324b Disable heights option in gallery dialog when mode is slideshow
Also disable relevant fields the first time the dialog is
opened, not just when the dropdown is changed.

Bug: T151482
Bug: T151512
Change-Id: Ic511e1832a9fcaaeaed71c1d495aecc65fdd1d3b
2016-12-03 16:00:32 +00:00
Thalia 0b9228a926 Scroll highlighted item into view in gallery dialog
Bug: T152053
Change-Id: I6b77f6c27d5629dc18e421f984cf31badfb2ff04
2016-12-03 15:46:58 +00:00
jenkins-bot e1e55aa730 Merge "Correct class/classes typo in gallery dialog" 2016-12-03 15:20:53 +00:00
Thalia 295dd380de Correct class/classes typo in gallery dialog
Bug: T152226
Change-Id: I569df87cf82359c13ad61a3ddffacd83f5f03bae
2016-12-03 13:03:02 +00:00
James D. Forrester f494067dea Follow-up ae8a2750: Stop passing long-dead second parameter
Change-Id: Ifc43d9009c2057b5a189d3cc161b62dc4ca83a2c
2016-12-02 14:31:26 -08:00
Ed Sanders 9b5adb8688 Remove WikitextWindowAction, inherits from core
Depends-On: I2b14cc93bf3c855e157f0b26567337f74992fb96
Change-Id: I3e479c1441f548f62ff8a2f6e7b2ad450262921f
2016-12-02 11:50:43 -08:00
jenkins-bot 36d976c4c0 Merge "Save Dialog: add shortcut for opening to the review panel" 2016-12-02 00:36:40 +00:00
David Lynch 2bd34cebd4 Save Dialog: add shortcut for opening to the review panel
Create a new MWSaveDialogAction, which can be hooked up to triggers. Switch
the existing save dialog accesskey to just use the trigger system.
(Maintaining all the accesskey logic, so we don't change the shortcut on
people.)

Bug: T149914
Change-Id: I9b4ef8504148703556f802b266a517dd5098c06b
2016-12-01 18:16:18 -06:00
Alex Monk 5bd95db994 Use widget.getApi, not this.getApi
Bug: T152154
Change-Id: Id7e77323ffabf4eeee3e73481cf6bcb9a1e649dc
2016-12-01 22:48:45 +00:00
jenkins-bot d254436f57 Merge "Use canonical ve.dm.TransactionBuilder.static.newFrom* methods" 2016-12-01 19:44:05 +00:00
jenkins-bot 2b453295ec Merge "ve.ui.MWWikitextTransferRegistry: Just look for '[[' when detecting links" 2016-12-01 19:35:45 +00:00
Ed Sanders 8bca6cc777 Inherit more functionality from core source mode
Change-Id: Id027681ab5f0c9f4b9ed127b583e45f0fe57ce69
Depends-On: I02f3849027a6652701c2d354d1b77ece9d1a56c1
2016-12-01 18:44:54 +00:00
James D. Forrester a835f4f9d5 Use canonical ve.dm.TransactionBuilder.static.newFrom* methods
Change-Id: I082048a677baa2699d94e21548373952d52db61b
2016-12-01 10:43:10 -08:00
Ed Sanders 218742d806 Update VE core submodule to master (ae30d71)
New changes:
f58ddea DiffElement: Use document slices with full internal lists
83800c0 DebugBar: Remove hard-coded i18n
b4f89e1 Update OOjs UI to v0.18.1
40c7bf6 Factor out active node functionality from SectionNode for captions
2d967be Move 'mode' property to surface, rename target property to 'defaultMode'
5d8c214 wrapAllNodes in sourcefragment
dd3d9e5 Refactor ve.dm.Transaction
9d61aca Use canonical ve.dm.TransactionBuilder.static.newFrom* methods
df4f72a Make table caption node an active node
b79f72d Core source mode
7533ac4 Localisation updates from https://translatewiki.net.
ae30d71 SourceSurfaceFragment: Check range is not collapsed

Local changes:
Get edit mode from surface where possible

Depends-On: Iec758c1892d518ad4bc2c0d1aaf6ca00fa354323
Change-Id: Ifaf6a26078b2731b374aaad2cb40c08928de9c84
2016-12-01 10:40:01 -08:00
Thalia 4b9d1bed4f Fix "Add new image" button in the gallery dialog
Make sure the button is always visible in the
gallery dialog menu by fixing it to the bottom.

Bug: T151506
Change-Id: I560b0dffbaad9e18c6f7f703cb155356470580ee
2016-11-30 22:38:11 +00:00
Ed Sanders 37910b78ec MWTemplateTitleInputWidget: Use new #getApi method from upstream
Depends-On: I81811cdd1a0750a8335432eee8f971ab9e0b8ee7
Change-Id: Ic73213df5ede6f82de85df8b69c60dd31f033792
2016-11-30 19:51:45 +00:00
Bartosz Dziewoński 491ecfe1d6 ve.ui.MWWikitextTransferRegistry: Just look for '[[' when detecting links
Bug: T151646
Change-Id: I693b190f762d93ffae0aa939ffc9550e567e8e24
2016-11-30 19:07:50 +01:00
jenkins-bot 745e919f97 Merge "Update VE core submodule to master (9625e8f)" 2016-11-29 20:46:54 +00:00
jenkins-bot 33db54ef28 Merge "Use upstream media search widget from core" 2016-11-29 20:04:46 +00:00
Ed Sanders aeafa6afca Update VE core submodule to master (9625e8f)
New changes:
f1297b8 [BREAKING CHANGE] Allow target widgets to be re-used

Local changes:
Re-use target widgets

Change-Id: I5decb918f398704d4b6c108a16fbc1cc073ef077
2016-11-29 11:48:15 -08:00
jenkins-bot 28a4b9f362 Merge "Handle missing pipes in Gallery syntax, and remove them when caption is empty" 2016-11-29 19:27:52 +00:00
Ed Sanders 44fee9b61d Wait until search panel is shown before setting a search query
Bug: T151659
Change-Id: I3eb3b903a8df1c7732da2a08e4b46b13b162617e
2016-11-29 11:13:54 -08:00
Ed Sanders 2ee9e62a4d Use upstream media search widget from core
Bug: T140166
Depends-On: If53ef7f4b62c7a5d4da565c14dd2a353778694e5
Change-Id: I28845e9c143e78d3a377f067606c62da212e3bf1
2016-11-29 17:19:14 +00:00
Ed Sanders 240ec23113 Handle missing pipes in Gallery syntax, and remove them when caption is empty
Bug: T146190
Change-Id: I703bcdf68b9631a47d839baf3abb42ff98b36bf2
2016-11-28 17:36:29 +00:00
jenkins-bot 6bcfed97a5 Merge "Separate out ArticleTarget as a module" 2016-11-26 23:22:32 +00:00
Ed Sanders 4fe6be1f34 Separate out ArticleTarget as a module
Also move save button command help registration to ArticleTarget.

Bug: T151096
Change-Id: I941d17254a2e20a82aa46fd538abf887d757c0c3
2016-11-24 12:35:41 +00:00
jenkins-bot 1909c445bb Merge "Allow the gallery dialog to insert duplicate images initially" 2016-11-24 04:13:03 +00:00
Ed Sanders 0334263718 Missing i18n in gallery dialog
Change-Id: I369d5b9d42a5fd6b4d1afc12508632a282591320
2016-11-24 00:09:49 +00:00
jenkins-bot fde5c3c2ff Merge "Follow-up I63ab27cb: Get rid of notices tool when there are no notices" 2016-11-23 01:17:42 +00:00
Thalia 003ec7b653 Allow the gallery dialog to insert duplicate images initially
Change I94f4fadd84cd3e prevents the gallery dialog from inserting
duplicate images into the gallery dialog after one request (e.g.
so double-clicking on an image in the search widget doesn't cause
the image to be inserted twice). However, galleries can
intentionally contain duplicates of the same image, so it is
possible to make a spearate request to insert a duplicate image.

When the dialog is first opened, it requests all the images in
the gallery at once, so the above change was causing the
duplicates in an existing gallery to be dropped. Duplicates
should be allowed to be inserted following this initial request.

Bug: T150894
Change-Id: I34353bc9b8db947488474c4be52292e0a1447705
2016-11-23 01:02:35 +00:00
jenkins-bot 508b4164bd Merge "Let gallery dialog handle unprefixed filenames" 2016-11-23 00:33:39 +00:00
Alex Monk b89a6ee463 Follow-up I63ab27cb: Get rid of notices tool when there are no notices
Bug: T151423
Change-Id: I3dd9d2cbfb1fa536490eb8b4b7d630e9c6cfdd48
2016-11-23 00:30:06 +00:00
Thalia 2364f530a3 Let gallery dialog handle unprefixed filenames
The namespace prefix before image filenames is optional
in galleries, but the API requires it. If the prefix is
omitted, add the file namespace prefix.

Change-Id: I3d126550c2ad2e84454122f92307ba4bc943780b
2016-11-23 00:20:32 +00:00
Alex Monk 16e294fba7 Move around code that sets up edit notices to ensure it runs after we receive the notices to display
Bug: T151236
Change-Id: I63ab27cb236169f300295b2ed4c88e01048092e7
2016-11-22 19:16:09 +00:00
Ed Sanders 6e64fba2f8 Unbreak education popup
Tools only setup once now, and that is during the dummy surface
phase, so we have to setup the education popups then.

Change-Id: Idf46fe42c893c0692dc442226297253074ef9bd7
2016-11-21 15:19:58 +00:00
jenkins-bot 8fd396151c Merge "Migrate DesktopWikitextArticleTarget code upstream" 2016-11-20 03:06:55 +00:00
Ed Sanders e1a887ccf8 Migrate DesktopWikitextArticleTarget code upstream
Change-Id: Icca4715411737a561302b44b127d91d117e7e29b
2016-11-20 02:52:14 +00:00
jenkins-bot 3483055c29 Merge "Remove max-width from save summary" 2016-11-16 17:55:35 +00:00
James D. Forrester f24e34de3c build: Bump eslint-config-wikimedia to v0.3.0 and make pass
Change-Id: I7449c11aa63c50fda667265c32021439cc53471f
2016-11-15 15:05:05 -08:00
jenkins-bot 65604802ac Merge "Fix attribute.style typo in gallery dialog" 2016-11-15 22:09:57 +00:00
Thalia 97af378bb5 Fix attribute.style typo in gallery dialog
Change-Id: I71162652df5e09c4d974e0f863ea661c4bd7902e
2016-11-14 22:26:39 +00:00
Thalia 810202395e Normalise filename after image is chosen in gallery dialog
Bug: T150638
Change-Id: Iead7d0d3f8aa6c864dc6fba7089bab0767035812
2016-11-14 22:04:25 +00:00
Ed Sanders 37ccaca2ec eslint: Re-enable wrap-iife and partially enable dot-notation
Change-Id: I4420d66f528dcb18ebe2b9f63996661b2969f833
2016-11-12 14:43:43 +00:00
Ed Sanders 003c5ac410 Use a blank temp document when selection is empty
shallowCloneFromRange can a broken document if you pass
a collapsed range. That should be fixed upstream but for
now this fixes a major bug (and is faster).

Bug: T150492
Change-Id: I9b539c588d91ef7f22e662c7cae0b3f89b21d33a
2016-11-11 00:08:11 +00:00
jenkins-bot de72f77b1b Merge "Collapse to end after inserting WT signature" 2016-11-09 20:00:05 +00:00
James D. Forrester 79befe3d67 MWExtensionWindow: Use #setDir, not the removed #setRTL
Change-Id: I4090fa0375a93e095a644538b52853fd849b8749
2016-11-09 11:13:09 -08:00
Ed Sanders 1cb4c27378 Collapse to end after inserting WT signature
Bug: T150320
Change-Id: I06a8304499d92d0155c112449678fef34dc98424
2016-11-09 15:26:44 +00:00
Ed Sanders 55fcded32e Replace non-standard whitespace in comments
This is required to pass eslint:recommended.

Change-Id: If8c4876a366e5c021c414e54328ed1913b679969
2016-11-08 14:15:12 +00:00
Ed Sanders 526b2c0656 Remove max-width from save summary
Prevents mis-alignment of textbox and checkbox bar
on mobile.

Change-Id: I33d8a2bd4e30d2ed4d61942a7646299f9935bc32
2016-11-08 10:29:03 +00:00
jenkins-bot 5709e89399 Merge "eslint: Remove unused exception and fix documentation errors" 2016-10-28 19:12:19 +00:00
Ed Sanders e655880d14 eslint: Remove unused exception and fix documentation errors
Don't enable valid-jsdoc yet though, due to @chainable bug.

Change-Id: I4d2a6de19c72c6e4c20733446616d8046419d431
2016-10-28 12:02:36 -07:00
jenkins-bot bce6aeb92a Merge "build: Replace jscs and jshint with eslint" 2016-10-28 18:43:15 +00:00
James D. Forrester 36befda61c build: Replace jscs and jshint with eslint
It's new, it's fresh, it's amazing, it's here.

Change-Id: I5dc784411f704685ed5cc763a2b2b1c5d3e5a610
2016-10-28 18:33:15 +00:00
jenkins-bot 7085796ec3 Merge "Don't allow an image to be inserted into a gallery twice simultaneously" 2016-10-28 02:29:19 +00:00
jenkins-bot db9d2e3cf5 Merge "Make meta dialog tools visibile but disabled in NWE" 2016-10-27 22:14:08 +00:00
Ed Sanders fad3b429c8 Make meta dialog tools visibile but disabled in NWE
Following our unwritten rule of trying to keep the interface
as consistent as possible.

Change-Id: I58668acb5bac12de73b7b8f52e670f68336c399f
2016-10-27 14:48:51 -07:00
Ed Sanders 7bc59cd65c Set mode of save dialog after setting size so footer is correct height
Bug: T149274
Change-Id: Ic88b1c861029495e6098686d847deb181f62288e
2016-10-26 20:09:21 -07:00
Ed Sanders 6358d9ed6d CSS styleguide fixes
These will be enforced in future versions of stylelint-config.

Change-Id: I0689cbeee6586d2d3dcb0021a3f613dc2ac73691
2016-10-25 15:58:10 -07:00
jenkins-bot dd30f86c52 Merge "Make ve-ui-mwGalleryDialog-image-container-highlighted rule more specific to ensure border-color rule takes effect" 2016-10-21 00:01:38 +00:00
Alex Monk 8414490dbf Don't allow an image to be inserted into a gallery twice simultaneously
One after the other is okay though.
Also fix this so that, if the user is fast enough, two images simultaneously
also works.

Bug: T148558
Change-Id: I94f4fadd84cd3ed97d9676043cadc64f0e09f0b9
2016-10-20 02:22:34 +01:00
Alex Monk 77629cd374 Make ve-ui-mwGalleryDialog-image-container-highlighted rule more specific to ensure border-color rule takes effect
Bug: T148041
Change-Id: I39366884d44ea68780c3780042cf82e34408d098
2016-10-20 00:31:55 +01:00
Derk-Jan Hartman 406e9f8e9c Enable conditional loading of ACE language modes
require bypasses Ace's internal loadModule() logic which is capable of
on demand loading of Ace modules. Because unloaded modules are not
defined, they cannot be required, and because we don't use RL to preload
all modes (because it's a lot of bytes), currently only very few of the
available language modes were currently available.

Also validate language mode names passed to Ace.

Bug: T148518
Change-Id: I82d278920695be12aa80a79548abf8b8ce5445fd
2016-10-19 02:23:17 +02:00
jenkins-bot a9240d6f2f Merge "Strip RESTBase IDs from HTML generated when wikitext is pasted" 2016-10-14 00:55:48 +00:00
Alex Monk 25933c09ec Strip RESTBase IDs from HTML generated when wikitext is pasted
Bug: T146054
Change-Id: I0013673a9e41ea191ea64f3208a06288efb2ecd3
2016-10-13 17:42:11 -07:00
Ed Sanders 85f8030053 MWMediaSearchWidget: Fix indentation in var
It is alarming that jscs is not picking this up..

Change-Id: Ibd3b113ebfedede9fa45120c24f00623ec5ea2fb
2016-10-13 23:45:37 +00:00
Thalia 7ec7acf108 Take only the last part of a URL query in media search widget
Quick fix to the problem that searching for the file name or
page title currently returns the image, but searching for the
URL does not.

Bug: T121354
Change-Id: I13e665226e5dc15ba626126dc4806ce8f4e0040b
2016-10-13 21:54:10 +00:00
jenkins-bot 56c5ecb0f1 Merge "Fix sanitizing of query value in media search" 2016-10-13 04:14:10 +00:00
Ed Sanders 972094788c Fix sanitizing of query value in media search
Always use #getQueryValue which trims whitespace, so we
don't pass whitespace to the API.

Also rename some variables for clarity, and remove some
unused arguments.

Change-Id: I0d27f59488295bc1c398d0fd287e3e16a3f5aaec
2016-10-13 04:03:57 +00:00
Thalia 91ca88f6e8 Set gallery dialog to larger size when search panel is focused
Bug: T145246
Change-Id: I49b218f704d31b4f699fe39f414a84abbfffc093
2016-10-12 17:42:54 -07:00
jenkins-bot eafbe8cf8c Merge "Add big/small support to NWE" 2016-10-08 21:00:35 +00:00
Ebrahim Byagowi e55d1b2a3c i18n: Native digits on 'visualeditor-editnotices-tool'
Change-Id: I5a802199a9d736d0082775052d5224cfa9580450
2016-10-08 18:36:36 +00:00
Ed Sanders 2ad4015775 Add big/small support to NWE
Change-Id: Id42cb7563d7f6d14d0f225edb8a283c8b9eaa8db
2016-10-07 22:44:52 -04:00
Ed Sanders 31a3f2f0b6 Move editfont class down to surface view, so it doesn't break DebugBar
Change-Id: I779ab9d581af37ae104acf4ea6a83b86504bb257
2016-10-07 16:10:58 -04:00
jenkins-bot 1321452197 Merge "New wikitext editor: unwrap lists when changing style" 2016-10-05 19:40:01 +00:00
jenkins-bot 26e235211d Merge "Pass excludeCurrentPage option to TitleSearchWidget in link inspector" 2016-10-04 22:45:10 +00:00
jenkins-bot 9da0eaef03 Merge "Pre-load the article title in gallery dialog search" 2016-10-04 16:24:00 +00:00
Ed Sanders 69c332d1ad New wikitext editor: unwrap lists when changing style
Bug: T147227
Change-Id: I1a7f86e2a97855be5c44671d8f5918fb87bc70d0
2016-10-03 16:16:04 -04:00
jenkins-bot 1e89ab7d7a Merge "Remove commented out code" 2016-10-03 19:37:27 +00:00
Ed Sanders 755500b463 Remove commented out code
Change-Id: Ie3edc36c5d51eb7f6363416594a8aab37dec074c
2016-10-03 15:08:47 -04:00
jenkins-bot d415a003cd Merge "Apply user preference 'editfont' to NWE" 2016-10-03 17:01:11 +00:00
Ed Sanders 4d1f8b5928 Pass excludeCurrentPage option to TitleSearchWidget in link inspector
Logically depends on Ieade9d0ff for the actual functionality.

Bug: T147050
Change-Id: I2cc4fc170398c80d7f0103772bc56666685b8baf
2016-09-30 15:41:08 -04:00
Ed Sanders 2ce9979d36 Apply user preference 'editfont' to NWE
Expects I5f0433e9 in core

Bug: T145016
Change-Id: I3b57d566d2846ea284e620d7335c4a3f62df518a
2016-09-28 20:06:43 +00:00
Ed Sanders ba8ca2ab73 Add wikitext sequences for lower heading levels
Bug: T146264
Change-Id: I0f9afad27ab11d4eb487c5a18c667eeead3f1c75
2016-09-28 11:59:55 -07:00
Thalia 1d8d4accff Pre-load the article title in gallery dialog search
Bug: T145243
Change-Id: I4cd04dee4c875524ecdf90027dc878eb15f47ce6
2016-09-27 14:01:31 -07:00
Derk-Jan Hartman fbdad82b99 Use slice instead of substring per code conventions
Change-Id: I5de8b485d287db097f2ad63a7edf75f86a86822d
2016-09-26 21:34:37 +02:00
jenkins-bot 720b97694e Merge "Change mid-upload 'cancel' button to 'back'" 2016-09-26 18:34:38 +00:00
jenkins-bot d9ed33208a Merge "MWAceEditorWidget: Configure Ace with its base path" 2016-09-26 13:50:42 +00:00
Derk-Jan Hartman 148c6b53b4 MWAceEditorWidget: Configure Ace with its base path
Configure the basePath for Ace, so that its own loader knows from where
to lazy-load additional resources. This will enable all known modes and
the worker scripts for linting.

Bug: T124419
Change-Id: Ie71518917ab966743e8397b23ffb050ca47e9ff4
2016-09-26 14:54:42 +02:00
David Lynch d28819f795 ui.MWLinkAnnotationInspector: skip internal link checking if the value has changed
If the value has changed since the event was fired, we're operating on old
data, *and* another event will have been fired for that change anyway. So
abort this check.

Bug: T146306
Change-Id: Ia6682ec0218fd3fbc573582753d815a56963eb71
2016-09-22 11:23:48 -05:00
Matthias Mullie 2b4948b0b6 Change mid-upload 'cancel' button to 'back'
Bug: T114938
Change-Id: I964708e1267223b181630b9bea5b19e2bdf242be
2016-09-22 16:13:57 +02:00
Ed Sanders d8fb7b84d3 Only unregister WT string handler in WT handler factory
Bug: T144653
Change-Id: I91528b56ac3905a05e8da51455055537958e026e
2016-09-21 13:08:10 -07:00
Alex Monk 63fcefcfcd Education popup: Put localStorage check inside try/catch
Bug: T146139
Change-Id: I5faf5f4fce2f3161ad62d3617d1bb1d750a44728
2016-09-20 22:04:53 +01:00
jenkins-bot 80e2b62c69 Merge "Simplify and fix category popup widget checks" 2016-09-20 01:00:17 +00:00
Volker E ecab9df8bb Update progressive color to WCAG 2.0 level AA compliant color palette
Aligning instances of `progressive` color to WCAG 2.0 level AA compliant
color palette similar to changes in
I6fdb90af8b9dc5e5e026eb0c1bd13138c73da4cd

Change-Id: I2eda190f0a68de6dc8aa33724f2c8975327a061f
2016-09-19 15:25:45 -07:00
jenkins-bot f0a819455e Merge "Load icons where we can via RLIM" 2016-09-13 21:21:22 +00:00
Alex Monk 7888c688b7 Simplify and fix category popup widget checks
Bug: T86357
Change-Id: I9a85267f6da0077e2167a92f25a8dc41074e6548
2016-09-13 04:17:20 +01:00
jenkins-bot 645c947359 Merge "Move image-paste blocking to transfer handler match function" 2016-09-12 15:55:19 +00:00
James D. Forrester da422b18d5 Load icons where we can via RLIM
This gets us the variants (which we need for OOUI 0.17.9); note that I've
cheated and used 0.17.9's colour for the MediaWiki theme's progressive flag
rather than 0.17.8's value of 347bff.

Change-Id: Ic436970e9298ea31f48c6cfdd04b80847aaebbee
2016-09-09 18:10:56 -07:00
Ed Sanders 5e22ef30fe Add show preview to save dialog when in NWE
Bug: T142642
Change-Id: I679eaddfe9037dcf258d3ff7d1eaa44214f0e730
2016-09-07 21:35:49 +00:00
Ed Sanders 7a80fa57bc Fix parent constructor call
Got broken in switch to using 'super'.

Change-Id: Icea95b49ad48849af857bfa3b301d3bcf6039036
2016-09-06 19:16:24 -07:00
jenkins-bot b656f3d5f1 Merge "Use super property to call parent methods" 2016-09-01 17:04:39 +00:00
Ed Sanders 56c56e81fe Move image-paste blocking to transfer handler match function
By not matching, we allow other types of paste to happen, e.g. HTML/plain text.

Bug: T142622
Change-Id: I3a2224ab23b5073eb7b031134ecc3170ccc782c0
2016-08-26 00:54:39 +00:00
jenkins-bot f071b0380d Merge "Vary the 'save' labels to 'publish' for public wikis" 2016-08-25 21:36:41 +00:00
jenkins-bot d27863587a Merge "Show a different label for buttons on create vs. modify" 2016-08-25 16:40:21 +00:00
James D. Forrester deef47414a Vary the 'save' labels to 'publish' for public wikis
Bug: T131132
Change-Id: I4a497265661d5ce0f6144988b514509dfa1bddfd
Depends-On: I56634ed223778a0650cf36ac7256151b13c494f1
2016-08-25 09:37:52 -07:00
James D. Forrester b7c7d06968 Show a different label for buttons on create vs. modify
To align with the linked patch in MediaWiki core. Taking advantage of
the opportunity to use core's messages for these, and remove some dead
wood old messages that were never used like "restore" items in mobile.

Bug: T139033
Depends-On: Ie81b5edd275963a965cd44d0fd325cae9ee2f1a6
Change-Id: Ie00e94cc77cb750a7e8d1104366bb3dad65af8a4
2016-08-24 16:01:11 -07:00