Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for match in stylesheet host and protocol #20673

Merged
merged 2 commits into from
Mar 9, 2020

Conversation

tellthemachines
Copy link
Contributor

Description

Addresses #20632.

How has this been tested?

Tested in several browsers (including IE) and ran automated tests.

Screenshots

Types of changes

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR.

@tellthemachines tellthemachines requested a review from talldan March 6, 2020 00:51
@tellthemachines tellthemachines added the [Type] Bug An existing feature does not function as intended label Mar 6, 2020
@github-actions
Copy link

github-actions bot commented Mar 6, 2020

Size Change: +319 B (0%)

Total Size: 864 kB

Filename Size Change
build/block-editor/index.js 104 kB +27 B (0%)
build/block-editor/style-rtl.css 10.6 kB +51 B (0%)
build/block-editor/style.css 10.6 kB +43 B (0%)
build/block-library/editor-rtl.css 7.36 kB +100 B (1%)
build/block-library/editor.css 7.36 kB +100 B (1%)
build/block-library/index.js 115 kB +9 B (0%)
build/block-library/style-rtl.css 7.52 kB +15 B (0%)
build/block-library/style.css 7.52 kB +15 B (0%)
build/components/index.js 191 kB -14 B (0%)
build/components/style-rtl.css 15.5 kB -17 B (0%)
build/components/style.css 15.5 kB -18 B (0%)
build/edit-post/index.js 91.3 kB +11 B (0%)
build/edit-post/style-rtl.css 8.64 kB -67 B (0%)
build/edit-post/style.css 8.64 kB -68 B (0%)
build/edit-site/style-rtl.css 2.48 kB -1 B
build/edit-site/style.css 2.48 kB -1 B
build/edit-widgets/index.js 4.44 kB +20 B (0%)
build/edit-widgets/style-rtl.css 2.58 kB -6 B (0%)
build/edit-widgets/style.css 2.58 kB -5 B (0%)
build/editor/editor-styles-rtl.css 381 B +56 B (14%) ⚠️
build/editor/editor-styles.css 382 B +55 B (14%) ⚠️
build/editor/index.js 43.8 kB +22 B (0%)
build/editor/style-rtl.css 3.98 kB -4 B (0%)
build/editor/style.css 3.97 kB -4 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.01 kB 0 B
build/annotations/index.js 3.43 kB 0 B
build/api-fetch/index.js 3.39 kB 0 B
build/autop/index.js 2.58 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 6.02 kB 0 B
build/block-directory/style-rtl.css 760 B 0 B
build/block-directory/style.css 760 B 0 B
build/block-library/theme-rtl.css 669 B 0 B
build/block-library/theme.css 671 B 0 B
build/block-serialization-default-parser/index.js 1.65 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 57.7 kB 0 B
build/compose/index.js 5.75 kB 0 B
build/core-data/index.js 10.6 kB 0 B
build/data-controls/index.js 1.03 kB 0 B
build/data/index.js 8.22 kB 0 B
build/date/index.js 5.36 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 569 B 0 B
build/dom/index.js 3.06 kB 0 B
build/edit-site/index.js 4.64 kB 0 B
build/element/index.js 4.45 kB 0 B
build/escape-html/index.js 734 B 0 B
build/format-library/index.js 7.11 kB 0 B
build/format-library/style-rtl.css 502 B 0 B
build/format-library/style.css 502 B 0 B
build/hooks/index.js 1.92 kB 0 B
build/html-entities/index.js 622 B 0 B
build/i18n/index.js 3.48 kB 0 B
build/is-shallow-equal/index.js 710 B 0 B
build/keyboard-shortcuts/index.js 2.3 kB 0 B
build/keycodes/index.js 1.68 kB 0 B
build/list-reusable-blocks/index.js 2.99 kB 0 B
build/list-reusable-blocks/style-rtl.css 226 B 0 B
build/list-reusable-blocks/style.css 226 B 0 B
build/media-utils/index.js 4.85 kB 0 B
build/notices/index.js 1.57 kB 0 B
build/nux/index.js 3.01 kB 0 B
build/nux/style-rtl.css 616 B 0 B
build/nux/style.css 613 B 0 B
build/plugins/index.js 2.54 kB 0 B
build/primitives/index.js 1.49 kB 0 B
build/priority-queue/index.js 780 B 0 B
build/redux-routine/index.js 2.84 kB 0 B
build/rich-text/index.js 14.3 kB 0 B
build/server-side-render/index.js 2.55 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 4 kB 0 B
build/viewport/index.js 1.61 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.18 kB 0 B

compressed-size-action

Copy link
Contributor

@talldan talldan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I think it might be nice to use the url package functions as they're unit tested. Having said that, i threw a few things at the regex in this PR and didn't spot any issues.

styleSheet.href.includes( window.location.hostname )
matcheableUrl &&
matcheableUrl.length > 2 &&
matcheableUrl[ 1 ] === window.location.protocol &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The url package has a getProtocol function that might be useful as this could be simplified to getProtocol( styleSheet.href ) === window.location.protocol.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooh great tip, thanks! Updated.

matcheableUrl &&
matcheableUrl.length > 2 &&
matcheableUrl[ 1 ] === window.location.protocol &&
matcheableUrl[ 2 ] === window.location.host
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The url package also has getAuthority function, which seems like it returns the same url part as the window.location.host (subdomain.domain:port).

@aduth aduth linked an issue Mar 6, 2020 that may be closed by this pull request
@tellthemachines tellthemachines merged commit 099929b into master Mar 9, 2020
@tellthemachines tellthemachines deleted the fix/refine-hostname-match branch March 9, 2020 05:22
@github-actions github-actions bot added this to the Gutenberg 7.7 milestone Mar 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lastest Version: Cant create/edit post with Block editor, Chrome
2 participants