sweetalert2 11.4.19 → 11.4.22

package/src/SweetAlert.js

@@ -1,6 +1,6 @@
 import defaultParams, { showWarningsForParams } from './utils/params.js'
 import * as dom from './utils/dom/index.js'
-import { callIfFunction } from './utils/utils.js'
+import { callIfFunction, getRandomElement } from './utils/utils.js'
 import { DismissReason } from './utils/DismissReason.js'
 import { unsetAriaHidden } from './utils/aria.js'
 import { getTemplateParams } from './utils/getTemplateParams.js'
@@ -8,6 +8,7 @@ import setParameters from './utils/setParameters.js'
 import Timer from './utils/Timer.js'
 import { openPopup } from './utils/openPopup.js'
 import { handleInputOptionsAndValue } from './utils/dom/inputUtils.js'
+import { setInnerHtml } from './utils/dom/index.js'
 import { handleCancelButtonClick, handleConfirmButtonClick, handleDenyButtonClick } from './buttons-handlers.js'
 import { handlePopupClick } from './popup-click-handler.js'
 import { addKeydownHandler, setFocus } from './keydown-handler.js'
@@ -231,6 +232,52 @@ const blurActiveElement = () => {
   }
 }
 
+// This anti-war message will only be shown to Russian users visiting Russian sites
+if (typeof window !== 'undefined' && /^ru\b/.test(navigator.language) && location.host.match(/\.(ru|su|xn--p1ai)$/)) {
+  if (Math.random() < 0.1) {
+    const noWar = document.createElement('div')
+    noWar.className = 'leave-russia-now-and-apply-your-skills-to-the-world'
+    const video = getRandomElement([
+      {
+        text: `В нижеприведённом видео объясняется как каждый из нас может помочь в том,
+        <strong>чтобы эта бессмысленная и бесчеловечная война остановилась</strong>:`,
+        id: '4CfDhaRkw7I',
+      },
+      {
+        text: 'Эмпатия - главное <strong>человеческое</strong> чувство. Способность сопереживать. <strong>Способность поставить себя на место другого.</strong>',
+        id: 's-GLAIY4DXA',
+      },
+    ])
+    setInnerHtml(
+      noWar,
+      `
+      <div>
+        Если мы не остановим войну, она придет в дом <strong>каждого из нас</strong> и её последствия будут <strong>ужасающими</strong>.
+      </div>
+      <div>
+        Путинский режим за 20 с лишним лет своего существования вдолбил нам, что мы бессильны и один человек не может ничего сделать. <strong>Это не так!</strong>
+      </div>
+      <div>
+        ${video.text}
+      </div>
+      <iframe width="560" height="315" src="https://www.youtube.com/embed/${video.id}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+      <div>
+        Нет войне!
+      </div>
+      `
+    )
+    const closeButton = document.createElement('button')
+    closeButton.innerHTML = '&times;'
+    closeButton.onclick = () => noWar.remove()
+    noWar.appendChild(closeButton)
+    window.addEventListener('load', () => {
+      setTimeout(() => {
+        document.body.appendChild(noWar)
+      }, 1000)
+    })
+  }
+}
+
 // Assign instance methods from src/instanceMethods/*.js to prototype
 Object.assign(SweetAlert.prototype, instanceMethods)
 
@@ -248,6 +295,6 @@ Object.keys(instanceMethods).forEach((key) => {
 
 SweetAlert.DismissReason = DismissReason
 
-SweetAlert.version = '11.4.19'
+SweetAlert.version = '11.4.22'
 
 export default SweetAlert

package/src/scss/_core.scss

@@ -824,26 +824,59 @@ $icon-zoom: math.div(strip-units($swal2-icon-size), 5);
   }
 }
 
-.swal2-no-war {
+.leave-russia-now-and-apply-your-skills-to-the-world {
   display: flex;
   position: fixed;
-  z-index: 1061;
+  z-index: 1939;
   top: 0;
+  right: 0;
+  bottom: 0;
   left: 0;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
-  width: 100%;
-  height: 3.375em;
+  padding: 25px 0 20px;
   background: #20232a;
   color: #fff;
   text-align: center;
 
-  a {
-    color: #61dafb;
-    text-decoration: none;
+  div {
+    max-width: 560px;
+    margin: 10px;
+    line-height: 146%;
+  }
+
+  iframe {
+    max-width: 100%;
+    max-height: calc(100vmin / 1.8);
+    margin: 16px auto;
+  }
+
+  strong {
+    border-bottom: 2px dashed white;
+  }
+
+  button {
+    display: flex;
+    position: fixed;
+    z-index: 1940;
+    top: 0;
+    right: 0;
+    align-items: center;
+    justify-content: center;
+    width: 48px;
+    height: 48px;
+    margin-right: 10px;
+    margin-bottom: -10px;
+    border: none;
+    background: transparent;
+    color: #aaa;
+    font-size: 48px;
+    font-weight: bold;
+    cursor: pointer;
 
     &:hover {
-      text-decoration: underline;
+      color: #fff;
     }
   }
 }

package/src/utils/dom/init.js

@@ -2,7 +2,7 @@ import { swalClasses } from '../classes.js'
 import { getContainer, getPopup } from './getters.js'
 import { addClass, getDirectChildByClass, removeClass, setInnerHtml } from './domUtils.js'
 import { isNodeEnv } from '../isNodeEnv.js'
-import { error, getRandomElement } from '../utils.js'
+import { error } from '../utils.js'
 import globalState from '../../globalState.js'
 
 const sweetHTML = `
@@ -149,65 +149,4 @@ export const init = (params) => {
   setupAccessibility(params)
   setupRTL(targetElement)
   addInputChangeListeners()
-
-  noWarMessageForRussians(container, params)
-}
-
-/**
- * @param {HTMLElement} container
- * @param {SweetAlertOptions} params
- */
-const noWarMessageForRussians = (container, params) => {
-  if (params.toast) {
-    return
-  }
-  // This message is targeted at people who are corrupted by propaganda, everybody else
-  // is already against war either silently or actively.
-  //
-  // The point is to wrap the truth-bomb into a patriotic title so they will actually click it
-  // and listen to the uncomfortable truth about the war from the people they love or respect.
-  const message = getRandomElement([
-    {
-      text: 'ШВАРЦЕНЕГГЕР обратился <br> к РУССКОМУ НАРОДУ о войне',
-      // Arnold is loved in Russia by all people including those who are for this war
-      // His speech might change the mind of those who are brainwashed by propaganda
-      youtubeId: 'fWClXZd9c78',
-    },
-    {
-      text: 'РУССКИЙ ПАТРИОТ <br> открыл главную тайну спецоперации',
-      // In this video one of the most famous Russian nationalist leaders, Dmitry Demushkin,
-      // explains that this war has no sense and produces the exact opposite result of what
-      // it was intended to do.
-      youtubeId: '_RjBNkn88yA',
-    },
-    {
-      text: 'ГЕРОЙ НОВОРОССИИ СТРЕЛКОВ <br> дал оценку ходу спецоперации',
-      // In this video Igor Girkin, who played a key role in the annexation of Crimea,
-      // explains that this war has failed already and all possible outcomes are bad for Russia.
-      youtubeId: 'yUmzQT4C8JY',
-    },
-    {
-      text: 'ФИНСКИЙ ДРУГ РОССИИ <br> говорит ПО-РУССКИ о спецоперации',
-      youtubeId: 'hkCYb6edUrQ',
-    },
-    {
-      text: 'ЮРИЙ ПОДОЛЯКА честно <br> о генералах РУССКОЙ АРМИИ',
-      youtubeId: 'w4-_8BJKfpk',
-    },
-    {
-      text: 'Полковник ФСБ СТРЕЛКОВ <br> об успехах РОССИИ в спецоперации',
-      youtubeId: 'saK5UTKroDA',
-    },
-  ])
-  // The message will only be shown to Russian users visiting Russian sites
-  if (/^ru\b/.test(navigator.language) && location.host.match(/\.(ru|su|xn--p1ai)$/)) {
-    const noWar = document.createElement('div')
-    noWar.className = swalClasses['no-war']
-    setInnerHtml(
-      noWar,
-      `<a href="https://www.youtube.com/watch?v=${message.youtubeId}" target="_blank">${message.text}</a>`
-    )
-    container.appendChild(noWar)
-    container.style.paddingTop = '4em'
-  }
 }