TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes colorpicker when used inside a popup 

Fixes #1145
Refs #1021
This commit is contained in:
Samuel Georges 2016-05-25 06:37:03 +10:00
parent de7edb10be
commit 30f7c03718
6 changed files with 605 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/backend/formwidgets/colorpicker/assets/css/colorpicker.css
View File

@ -10,7 +10,7 @@
padding: 3px; padding: 3px;
margin: 14px 14px 0 0; margin: 14px 14px 0 0;
cursor: pointer; cursor: pointer;
border-radius: 2px; border-radius: 3px;
} }
.field-colorpicker > ul li span { .field-colorpicker > ul li span {
display: block; display: block;
@ -57,3 +57,10 @@
bottom: 3px; bottom: 3px;
right: 3px; right: 3px;
} }
.colpick {
border: none;
border-radius: 3px;
z-index: 10100;
-webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.12), 0 1px 4px rgba(0, 0, 0, 0.24);
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.12), 0 1px 4px rgba(0, 0, 0, 0.24);
}

7
modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less
View File

@ -70,3 +70,10 @@
} }
} }
.colpick {
border: none;
border-radius: @border-radius-base;
z-index: @zindex-datepicker;
.box-shadow(@overlay-box-shadow);
}

1090
modules/backend/formwidgets/colorpicker/assets/vendor/colpick/js/colpick.js vendored
View File

File diff suppressed because it is too large Load Diff

2
modules/system/assets/js/eventlogs/exception-beautifier.links.js
View File

@ -55,7 +55,7 @@
<label for="editor-remember-choice">' + rememberChoice + '</label> \ <label for="editor-remember-choice">' + rememberChoice + '</label> \
</div> \ </div> \
</div> \ </div> \
<div class="modal-footer"> \ \ <div class="modal-footer"> \
<button type="button" class="btn btn-primary" \ <button type="button" class="btn btn-primary" \
data-action="submit" data-dismiss="modal">' + open + '</button> \ data-action="submit" data-dismiss="modal">' + open + '</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \ <button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \

3
modules/system/assets/ui/storm-min.js vendored
View File

@ -230,7 +230,8 @@ this.escape()
$(document).off('focusin.bs.modal') $(document).off('focusin.bs.modal')
this.$element.removeClass('in').attr('aria-hidden',true).off('click.dismiss.bs.modal') this.$element.removeClass('in').attr('aria-hidden',true).off('click.dismiss.bs.modal')
$.support.transition&&this.$element.hasClass('fade')?this.$element.one($.support.transition.end,$.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal()} $.support.transition&&this.$element.hasClass('fade')?this.$element.one($.support.transition.end,$.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal()}
Modal.prototype.enforceFocus=function(){$(document).off('focusin.bs.modal').on('focusin.bs.modal',$.proxy(function(e){if($(e.target).hasClass('select2-search__field')){return} Modal.prototype.enforceFocus=function(){$(document).off('focusin.bs.modal').on('focusin.bs.modal',$.proxy(function(e){var $target=$(e.target)
if($target.hasClass('select2-search__field')||$target.hasClass('popup-allow-focus')){return}
if(this.$element[0]!==e.target&&!this.$element.has(e.target).length){this.$element.focus()}},this))} if(this.$element[0]!==e.target&&!this.$element.has(e.target).length){this.$element.focus()}},this))}
Modal.prototype.escape=function(){if(this.isShown&&this.options.keyboard){this.$element.on('keyup.dismiss.bs.modal',$.proxy(function(e){e.which==27&&this.hide()},this))} Modal.prototype.escape=function(){if(this.isShown&&this.options.keyboard){this.$element.on('keyup.dismiss.bs.modal',$.proxy(function(e){e.which==27&&this.hide()},this))}
else if(!this.isShown){this.$element.off('keyup.dismiss.bs.modal')}} else if(!this.isShown){this.$element.off('keyup.dismiss.bs.modal')}}

6
modules/system/assets/ui/vendor/bootstrap/js/modal.js vendored
View File

@ -116,7 +116,11 @@
$(document) $(document)
.off('focusin.bs.modal') // Guard against infinite focus loop .off('focusin.bs.modal') // Guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) { .on('focusin.bs.modal', $.proxy(function (e) {
if ($(e.target).hasClass('select2-search__field')) { var $target = $(e.target)
if (
$target.hasClass('select2-search__field') ||
$target.hasClass('popup-allow-focus')
) {
return // Allow select2 to be focused return // Allow select2 to be focused
} }