|
@@ -1,12 +1,6 @@
|
|
|
/**
|
|
/**
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
* @author Dustin Utecht
|
|
* @author Dustin Utecht
|
|
|
* https://github.com/wenzhixin/bootstrap-table/
|
|
* https://github.com/wenzhixin/bootstrap-table/
|
|
|
-=======
|
|
|
|
|
- * @author zhixin wen <wenzhixin2010@gmail.com>
|
|
|
|
|
- * https://github.com/wenzhixin/bootstrap-table/
|
|
|
|
|
- * theme: https://github.com/jgthms/bulma/
|
|
|
|
|
->>>>>>> first (s)css for the bootrap-table theme
|
|
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
$.fn.bootstrapTable.theme = 'bootstrap-table'
|
|
$.fn.bootstrapTable.theme = 'bootstrap-table'
|
|
@@ -14,20 +8,29 @@ $.fn.bootstrapTable.theme = 'bootstrap-table'
|
|
|
$.extend($.fn.bootstrapTable.defaults, {
|
|
$.extend($.fn.bootstrapTable.defaults, {
|
|
|
iconsPrefix: 'icon',
|
|
iconsPrefix: 'icon',
|
|
|
icons: {
|
|
icons: {
|
|
|
- paginationSwitchDown: 'grid_on',
|
|
|
|
|
- paginationSwitchUp: 'grid_off',
|
|
|
|
|
|
|
+ paginationSwitchDown: 'icon-arrow-up-circle',
|
|
|
|
|
+ paginationSwitchUp: 'icon-arrow-down-circle',
|
|
|
refresh: 'icon-refresh-cw',
|
|
refresh: 'icon-refresh-cw',
|
|
|
toggleOff: 'icon-toggle-right',
|
|
toggleOff: 'icon-toggle-right',
|
|
|
toggleOn: 'icon-toggle-right',
|
|
toggleOn: 'icon-toggle-right',
|
|
|
columns: 'icon-list',
|
|
columns: 'icon-list',
|
|
|
- detailOpen: 'add',
|
|
|
|
|
- detailClose: 'remove',
|
|
|
|
|
|
|
+ detailOpen: 'icon-plus',
|
|
|
|
|
+ detailClose: 'icon-minus',
|
|
|
fullscreen: 'icon-maximize',
|
|
fullscreen: 'icon-maximize',
|
|
|
|
|
+ search: 'icon-search',
|
|
|
clearSearch: 'icon-trash-2'
|
|
clearSearch: 'icon-trash-2'
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
$.BootstrapTable = class extends $.BootstrapTable {
|
|
$.BootstrapTable = class extends $.BootstrapTable {
|
|
|
|
|
+ init () {
|
|
|
|
|
+ super.init()
|
|
|
|
|
+
|
|
|
|
|
+ $('.modal').on('click', '[data-close]', (e) => {
|
|
|
|
|
+ $(e.delegateTarget).removeClass('show')
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
initConstants () {
|
|
initConstants () {
|
|
|
super.initConstants()
|
|
super.initConstants()
|
|
|
|
|
|
|
@@ -56,15 +59,17 @@ $.BootstrapTable = class extends $.BootstrapTable {
|
|
|
_initDropdown () {
|
|
_initDropdown () {
|
|
|
const $dropdownToggles = $('.dropdown-toggle')
|
|
const $dropdownToggles = $('.dropdown-toggle')
|
|
|
$dropdownToggles.off('click').on('click', (e) => {
|
|
$dropdownToggles.off('click').on('click', (e) => {
|
|
|
- let $target = $(e.target)
|
|
|
|
|
|
|
+ let $target = $(e.currentTarget)
|
|
|
if ($target.parents('.dropdown-toggle').length > 0) {
|
|
if ($target.parents('.dropdown-toggle').length > 0) {
|
|
|
$target = $target.parents('.dropdown-toggle')
|
|
$target = $target.parents('.dropdown-toggle')
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $dropdownToggles.next('.dropdown-menu').removeClass('open')
|
|
|
$target.next('.dropdown-menu').toggleClass('open')
|
|
$target.next('.dropdown-menu').toggleClass('open')
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
$(window).off('click').on('click', (e) => {
|
|
$(window).off('click').on('click', (e) => {
|
|
|
|
|
+ const $dropdownToggles = $('.dropdown-toggle')
|
|
|
if ($(e.target).parents('.dropdown-toggle, .dropdown-menu').length === 0 && !$(e.target).hasClass('dropdown-toggle')) {
|
|
if ($(e.target).parents('.dropdown-toggle, .dropdown-menu').length === 0 && !$(e.target).hasClass('dropdown-toggle')) {
|
|
|
$dropdownToggles.next('.dropdown-menu').removeClass('open')
|
|
$dropdownToggles.next('.dropdown-menu').removeClass('open')
|
|
|
}
|
|
}
|