Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-18 03:00:56 +01:00
Code Issues Packages Projects Releases Activity

Increased specificity for Colorpicker field to prevent 3rd party conflicts

Browse Source
This commit is contained in:
Djamil Legato
2016-11-06 19:19:38 -08:00
parent 548fad1805
commit 0757d49d9f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -6,6 +6,7 @@
1. [](#improved) 1. [](#improved)
* Always delete image alternatives in AdminController#taskDelmedia [#814](https://github.com/getgrav/grav-plugin-admin/issues/814) * Always delete image alternatives in AdminController#taskDelmedia [#814](https://github.com/getgrav/grav-plugin-admin/issues/814)
* Use Media class to retrieve files in AdminController#taskGetFilesInFolder [#842](https://github.com/getgrav/grav-plugin-admin/issues/842) * Use Media class to retrieve files in AdminController#taskGetFilesInFolder [#842](https://github.com/getgrav/grav-plugin-admin/issues/842)
* Increased specificity for Colorpicker field to prevent 3rd party conflicts
1. [](#bugfix) 1. [](#bugfix)
* Editor link button doesn't prefix links with `http://` anymore [#813](https://github.com/getgrav/grav-plugin-admin/issues/813) * Editor link button doesn't prefix links with `http://` anymore [#813](https://github.com/getgrav/grav-plugin-admin/issues/813)
* Dashboard Charts now always refresh no matter what [#753](https://github.com/getgrav/grav-plugin-admin/issues/753) * Dashboard Charts now always refresh no matter what [#753](https://github.com/getgrav/grav-plugin-admin/issues/753)

2
themes/grav/app/forms/fields/colorpicker.js
View File

@@ -43,7 +43,7 @@ export default class ColorpickerField {
attach() { attach() {
body.on(FOCUSIN, this.selector, (event) => this.show(event, event.currentTarget)); body.on(FOCUSIN, this.selector, (event) => this.show(event, event.currentTarget));
body.on(MOUSEDOWN, '.g-colorpicker, .g-colorpicker i', this.bound('iconClick')); body.on(MOUSEDOWN, this.selector + ' .g-colorpicker, ' + this.selector + ' .g-colorpicker i', this.bound('iconClick'));
body.on('keydown', this.selector, (event) => { body.on('keydown', this.selector, (event) => {
switch (event.keyCode) { switch (event.keyCode) {
case 9: // tab case 9: // tab

4
themes/grav/js/admin.min.js vendored
View File

File diff suppressed because one or more lines are too long