Skip to content

K
kpp
Commit b17b97ac authored by Nikolay Gromov's avatar Nikolay Gromov
Browse files
Options

Начал добавление модальных окон BS

parent cee0e4ed
Show whitespace changes
Inline Side-by-side
Showing with 539 additions and 1 deletion
.yaspellerrc
View file @ b17b97ac
......@@ -48,6 +48,7 @@
"tfoot",
"thead",
"noUiSlider",
"dropdown",
"cleancss"
]
}
projectConfig.json
View file @ b17b97ac
......@@ -50,7 +50,8 @@
"off-canvas": [],
"burger": [],
"progress": [],
"media": []
"media": [],
"modal": []
},
"addCssBefore": [
"./src/scss/variables.scss",
......
src/blocks-demo.html
View file @ b17b97ac
......@@ -1492,6 +1492,8 @@
<h2 class="blocks-library__item-title">Выпадающий блок</h2>
<p>Основан на dropdown.js из Bootstrap. Изменения минимальны.</p>
<p class="alert alert--warning">Зависит от <a href="https://jquery.com/">jQuery</a> (включен в сборку по умолчанию).</p>
<div class="dropdown">
......@@ -1789,6 +1791,27 @@
</section>
<section class="blocks-library__item" id="modal-demo" data-name=".modal">
<h2 class="blocks-library__item-title">Модальные окна</h2>
<p>Основан на modal.js из Bootstrap. Изменения минимальны (имена классов, пространство имен событий).</p>
<p class="alert alert--warning">Зависит от <a href="https://jquery.com/">jQuery</a> (включен в сборку по умолчанию).</p>
<button class="btn" type="button" data-toggle="modal" data-target="#modal-demo-01">Показать модальное окно 1</button>
<a href="#modal-demo-02" data-toggle="modal">Показать модальное окно 2</a>
<span data-toggle="modal" data-target="#modal-demo-03">Показать модальное окно 3</span>
<div class="blocks-library__code-wrapper">
<span class="blocks-library__code-show-trigger" title="Показать код"><i class="blocks-library__code-icon"></i></span>
<div class="blocks-library__code">
<pre class="code">111</pre>
</div>
</div>
</section>
<div class="burger blocks-library__menu-toggler" data-toggle="off-canvas"><span data-toggle="off-canvas"></span></div>
</main>
......@@ -1861,5 +1884,57 @@
});
</script>
<div id="modal-demo-01" class="modal" tabindex="-1" role="dialog">
<div class="modal__dialog" role="document">
<div class="modal__content">
<div class="modal__header">
<button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span aria-hidden="true">&times;</span></button>
<h4 class="modal__title">Modal 01 title</h4>
</div>
<div class="modal__body">
<p>Далеко-далеко за словесными горами...</p>
</div>
<div class="modal__footer">
<button type="button" class="btn" data-dismiss="modal">Закрыть</button>
</div>
</div>
</div>
</div>
<div id="modal-demo-02" class="modal" tabindex="-1" role="dialog">
<div class="modal__dialog" role="document">
<div class="modal__content">
<div class="modal__header">
<button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span aria-hidden="true">&times;</span></button>
<h4 class="modal__title">Modal 02 title</h4>
</div>
<div class="modal__body">
<p>Далеко-далеко за словесными горами...</p>
</div>
<div class="modal__footer">
<button type="button" class="btn" data-dismiss="modal">Закрыть</button>
</div>
</div>
</div>
</div>
<div id="modal-demo-03" class="modal" tabindex="-1" role="dialog">
<div class="modal__dialog" role="document">
<div class="modal__content">
<div class="modal__header">
<button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span aria-hidden="true">&times;</span></button>
<h4 class="modal__title">Modal 03 title</h4>
</div>
<div class="modal__body">
<p>Далеко-далеко за словесными горами...</p>
</div>
<div class="modal__footer">
<button type="button" class="btn" data-dismiss="modal">Закрыть</button>
</div>
</div>
</div>
</div>
</body>
</html>
src/blocks/modal/modal.html 0 → 100644
View file @ b17b97ac
<!--DEV
Для использования этого файла как шаблона:
@ @include('blocks/modal/modal.html')
(Нужно убрать пробел между символами @)
Подробнее: https://www.npmjs.com/package/gulp-file-include
-->
<div class="modal">content</div>
src/blocks/modal/modal.js 0 → 100644
View file @ b17b97ac
/* ========================================================================
* Основано на Bootstrap: modal.js v3.3.7
* Изменения минимальны: имена классов, событий, методов...
* ========================================================================
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
+function ($) {
'use strict';
// MODAL CLASS DEFINITION
// ======================
var Modal = function (element, options) {
this.options = options
this.$body = $(document.body)
this.$element = $(element)
// this.$dialog = this.$element.find('.modal-dialog')
this.$dialog = this.$element.find('.modal__dialog')
this.$backdrop = null
this.isShown = null
this.originalBodyPad = null
this.scrollbarWidth = 0
this.ignoreBackdropClick = false
if (this.options.remote) {
this.$element
// .find('.modal-content')
.find('.modal__content')
.load(this.options.remote, $.proxy(function () {
// this.$element.trigger('loaded.bs.modal')
this.$element.trigger('loaded.nth.modal')
}, this))
}
}
Modal.VERSION = '3.3.7'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
Modal.DEFAULTS = {
backdrop: true,
keyboard: true,
show: true
}
Modal.prototype.toggle = function (_relatedTarget) {
return this.isShown ? this.hide() : this.show(_relatedTarget)
}
Modal.prototype.show = function (_relatedTarget) {
var that = this
// var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
var e = $.Event('show.nth.modal', { relatedTarget: _relatedTarget })
this.$element.trigger(e)
if (this.isShown || e.isDefaultPrevented()) return
this.isShown = true
this.checkScrollbar()
this.setScrollbar()
// this.$body.addClass('modal-open')
this.$body.addClass('js-modal-open')
this.escape()
this.resize()
// this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
this.$element.on('click.dismiss.nth.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
// this.$dialog.on('mousedown.dismiss.bs.modal', function () {
this.$dialog.on('mousedown.dismiss.nth.modal', function () {
// that.$element.one('mouseup.dismiss.bs.modal', function (e) {
that.$element.one('mouseup.dismiss.nth.modal', function (e) {
if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
})
})
this.backdrop(function () {
// var transition = $.support.transition && that.$element.hasClass('fade')
if (!that.$element.parent().length) {
that.$element.appendTo(that.$body) // don't move modals dom position
}
that.$element
.show()
.scrollTop(0)
that.adjustDialog()
// if (transition) {
that.$element[0].offsetWidth // force reflow
// }
that.$element.addClass('modal--open')
that.enforceFocus()
// var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
var e = $.Event('shown.nth.modal', { relatedTarget: _relatedTarget })
// transition ?
// that.$dialog // wait for modal to slide in
// .one('bsTransitionEnd', function () {
// that.$element.trigger('focus').trigger(e)
// })
// .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
that.$element.trigger('focus').trigger(e)
})
}
Modal.prototype.hide = function (e) {
if (e) e.preventDefault()
// e = $.Event('hide.bs.modal')
e = $.Event('hide.nth.modal')
this.$element.trigger(e)
if (!this.isShown || e.isDefaultPrevented()) return
this.isShown = false
this.escape()
this.resize()
// $(document).off('focusin.bs.modal')
$(document).off('focusin.nth.modal')
this.$element
.removeClass('modal--open')
// .off('click.dismiss.bs.modal')
.off('click.dismiss.nth.modal')
// .off('mouseup.dismiss.bs.modal')
.off('mouseup.dismiss.nth.modal')
// this.$dialog.off('mousedown.dismiss.bs.modal')
this.$dialog.off('mousedown.dismiss.nth.modal')
// $.support.transition && this.$element.hasClass('fade') ?
// this.$element
// .one('bsTransitionEnd', $.proxy(this.hideModal, this))
// .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
this.hideModal()
}
Modal.prototype.enforceFocus = function () {
$(document)
// .off('focusin.bs.modal') // guard against infinite focus loop
.off('focusin.nth.modal') // guard against infinite focus loop
// .on('focusin.bs.modal', $.proxy(function (e) {
.on('focusin.nth.modal', $.proxy(function (e) {
if (document !== e.target &&
this.$element[0] !== e.target &&
!this.$element.has(e.target).length) {
this.$element.trigger('focus')
}
}, this))
}
Modal.prototype.escape = function () {
if (this.isShown && this.options.keyboard) {
// this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
this.$element.on('keydown.dismiss.nth.modal', $.proxy(function (e) {
e.which == 27 && this.hide()
}, this))
} else if (!this.isShown) {
// this.$element.off('keydown.dismiss.bs.modal')
this.$element.off('keydown.dismiss.nth.modal')
}
}
Modal.prototype.resize = function () {
if (this.isShown) {
// $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
$(window).on('resize.nth.modal', $.proxy(this.handleUpdate, this))
} else {
// $(window).off('resize.bs.modal')
$(window).off('resize.nth.modal')
}
}
Modal.prototype.hideModal = function () {
var that = this
this.$element.hide()
this.backdrop(function () {
that.$body.removeClass('modal-open')
that.resetAdjustments()
that.resetScrollbar()
// that.$element.trigger('hidden.bs.modal')
that.$element.trigger('hidden.nth.modal')
})
}
Modal.prototype.removeBackdrop = function () {
this.$backdrop && this.$backdrop.remove()
this.$backdrop = null
}
Modal.prototype.backdrop = function (callback) {
var that = this
// var animate = this.$element.hasClass('fade') ? 'fade' : ''
if (this.isShown && this.options.backdrop) {
// var doAnimate = $.support.transition && animate
this.$backdrop = $(document.createElement('div'))
// .addClass('modal-backdrop ' + animate)
.addClass('modal__backdrop ')
.appendTo(this.$body)
// this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
this.$element.on('click.dismiss.nth.modal', $.proxy(function (e) {
if (this.ignoreBackdropClick) {
this.ignoreBackdropClick = false
return
}
if (e.target !== e.currentTarget) return
this.options.backdrop == 'static'
? this.$element[0].focus()
: this.hide()
}, this))
// if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
// this.$backdrop.addClass('modal__backdrop--shown')
if (!callback) return
// doAnimate ?
// this.$backdrop
// .one('bsTransitionEnd', callback)
// .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
callback()
} else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('modal--open')
var callbackRemove = function () {
that.removeBackdrop()
callback && callback()
}
// $.support.transition && this.$element.hasClass('fade') ?
// this.$backdrop
// .one('bsTransitionEnd', callbackRemove)
// .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
callbackRemove()
} else if (callback) {
callback()
}
}
// these following methods are used to handle overflowing modals
Modal.prototype.handleUpdate = function () {
this.adjustDialog()
}
Modal.prototype.adjustDialog = function () {
var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
this.$element.css({
paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
})
}
Modal.prototype.resetAdjustments = function () {
this.$element.css({
paddingLeft: '',
paddingRight: ''
})
}
Modal.prototype.checkScrollbar = function () {
var fullWindowWidth = window.innerWidth
if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
var documentElementRect = document.documentElement.getBoundingClientRect()
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
}
this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
this.scrollbarWidth = this.measureScrollbar()
}
Modal.prototype.setScrollbar = function () {
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
this.originalBodyPad = document.body.style.paddingRight || ''
if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
}
Modal.prototype.resetScrollbar = function () {
this.$body.css('padding-right', this.originalBodyPad)
}
Modal.prototype.measureScrollbar = function () { // thx walsh
var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv)
var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
this.$body[0].removeChild(scrollDiv)
return scrollbarWidth
}
// MODAL PLUGIN DEFINITION
// =======================
function Plugin(option, _relatedTarget) {
return this.each(function () {
var $this = $(this)
// var data = $this.data('bs.modal')
var data = $this.data('nth.modal')
var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
// if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
if (!data) $this.data('nth.modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option](_relatedTarget)
else if (options.show) data.show(_relatedTarget)
})
}
var old = $.fn.modal
$.fn.modal = Plugin
$.fn.modal.Constructor = Modal
// MODAL NO CONFLICT
// =================
$.fn.modal.noConflict = function () {
$.fn.modal = old
return this
}
// MODAL DATA-API
// ==============
// $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
$(document).on('click.nth.modal.data-api', '[data-toggle="modal"]', function (e) {
var $this = $(this)
var href = $this.attr('href')
var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
// var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
var option = $target.data('nth.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
if ($this.is('a')) e.preventDefault()
// $target.one('show.bs.modal', function (showEvent) {
$target.one('show.nth.modal', function (showEvent) {
if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
// $target.one('hidden.bs.modal', function () {
$target.one('hidden.nth.modal', function () {
$this.is(':visible') && $this.trigger('focus')
})
})
Plugin.call($target, option, this)
})
}(jQuery);
src/blocks/modal/modal.scss 0 → 100644
View file @ b17b97ac
// В этом файле должны быть стили только для БЭМ-блока modal, его элементов,
// модификаторов, псевдоселекторов, псевдоэлементов, @media-условий...
// Не пишите здесь другие селекторы.
$opacity: 0.7 !default;
$transition-time: 0.3s !default;
$z-index-modal: 100 !default;
.js-modal-open {
overflow: hidden;
}
.modal {
$block-name: &;
display: none;
overflow: hidden;
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: $z-index-modal;
-webkit-overflow-scrolling: touch;
.js-modal-open & {
overflow-x: hidden;
overflow-y: auto;
}
&__dialog {
position: relative;
margin: 0;
width: auto;
}
&__content {
position: relative;
background-color: #fff;
outline: 0;
}
// &__header {}
// &__body {}
// &__footer {}
&__backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: ($z-index-modal - 1);
background-color: rgba(0, 0, 0, $opacity);
animation: modal-backdrop-show $transition-time 1;
}
&--open {
#{$block-name}__dialog {}
}
}
@keyframes modal-backdrop-show {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
src/scss/variables.scss
View file @ b17b97ac
......@@ -89,3 +89,5 @@ $shadow: 0 4px 2px -2px rgba(0, 0, 0, 0.3);
$menu-desktop-width: $screen-xl;
$toggler-part-height: 3px;
$toggler-part-bg-color: #000;
$z-index-modal: 100;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment