Skip to content

Commit

Permalink
viewport.js の実行タイミングを修正
Browse files Browse the repository at this point in the history
  • Loading branch information
chalkygames123 committed Jun 23, 2020
1 parent 5bd0daa commit 58b80c7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
20 changes: 9 additions & 11 deletions assets/scripts/viewport.js
@@ -1,14 +1,12 @@
const minWidth = 375
const viewportEl = document.querySelector('meta[name="viewport"]')
const mediaQueryList = window.matchMedia(`(min-device-width: ${minWidth}px)`)

function handleChange() {
const viewportContent = mediaQueryList.matches
? 'width=device-width, initial-scale=1'
: `width=${minWidth}`

viewportEl.setAttribute('content', viewportContent)
const el = document.querySelector('meta[name="viewport"]')
const mql = window.matchMedia('(min-device-width: 375px)')
const handleChange = () => {
el.setAttribute(
'content',
mql.matches ? 'width=device-width, initial-scale=1' : 'width=375'
)
}

mediaQueryList.addListener(handleChange)
handleChange()

mql.addListener(handleChange)
6 changes: 3 additions & 3 deletions templates/_includes/layouts/base.njk
Expand Up @@ -15,7 +15,7 @@
<meta property="og:site_name" content="{{ site.name }}">
<meta name="twitter:card" content="summary_large_image">

<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport">

{% include 'pages/common/gtm-head.njk' %}

Expand All @@ -26,9 +26,9 @@
{% endblock %}

{% block scripts %}
<script src="{{ '/assets/scripts/runtime.js' | url }}" defer></script>
<script src="{{ '/assets/scripts/vendors.js' | url }}" defer></script>
<script src="{{ '/assets/scripts/runtime.js' | url }}"></script>
<script src="{{ '/assets/scripts/viewport.js' | url }}"></script>
<script src="{{ '/assets/scripts/vendors.js' | url }}" defer></script>
<script src="{{ '/assets/scripts/pages/common.js' | url }}" defer></script>
{% endblock %}
</head>
Expand Down

0 comments on commit 58b80c7

Please sign in to comment.