File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ import Vue from 'vue'
44import './icon-picker.styl'
55
66// Mixins
7- import Colorize from './mixins/ colorize'
7+ import { Colorize } from 'quasar-mixin- colorize'
88
99// Util
1010import props from './utils/props'
@@ -159,7 +159,7 @@ export default Vue.extend({
159159 loadIconSet ( set ) {
160160 if ( set ) {
161161 try {
162- let icons = require ( `./utils/${ set } .json` )
162+ let icons = require ( `./utils/${ set } .js` ) . default
163163 this . iconsList = icons
164164 return
165165 } catch ( e ) {
@@ -182,6 +182,7 @@ export default Vue.extend({
182182 // returns true of the pagination is the same,
183183 // otherwise returns false if it has changed
184184 samePagination ( oldPag , newPag ) {
185+ // eslint-disable-next-line no-unused-vars
185186 for ( let prop in newPag ) {
186187 if ( newPag [ prop ] !== oldPag [ prop ] ) {
187188 return false
You can’t perform that action at this time.
0 commit comments