Skip to content

Commit 558e6f6

Browse files
ceaurstoenescu
authored andcommitted
Code style update (quasarframework#607)
* fix: QPopover fix * Update QUploader.vue * fix isNumber * fix isNumber * Update is.js * Update QUploader.vue * update style * Update QProgressBtn.vue * Update slide-animation.js * Update slide-animation.js * Update slide-animation.js
1 parent f8f5e0c commit 558e6f6

File tree

8 files changed

+15
-19
lines changed

8 files changed

+15
-19
lines changed

src/components/pagination/QPagination.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ export default {
7878
return between(parseInt(value, 10), 1, this.max)
7979
},
8080
__update () {
81-
var parsed = parseInt(this.newPage, 10)
81+
let parsed = parseInt(this.newPage, 10)
8282
if (parsed) {
83-
console.log('blurring and setting model')
8483
this.model = parsed
8584
this.$refs.input.blur()
8685
}

src/components/pull-to-refresh/QPullToRefresh.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,11 @@ export default {
9191
}
9292
9393
if (event.isFinal) {
94+
this.scrolling = false
95+
this.pulling = false
9496
if (this.scrolling) {
95-
this.scrolling = false
96-
this.pulling = false
9797
return
9898
}
99-
this.scrolling = false
100-
this.pulling = false
101-
10299
if (this.state === 'pulled') {
103100
this.state = 'refreshing'
104101
this.__animateTo(0)

src/components/range/range-utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function getPercentage (event, dragging) {
88

99
export function notDivides (res, decimals) {
1010
let number = decimals
11-
? parseFloat(res.toFixed(decimals), 10)
11+
? parseFloat(res.toFixed(decimals))
1212
: res
1313

1414
return number !== parseInt(number, 10)

src/components/slide-transition/slide-animation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function getHeight (el, style) {
1414
const height = style.height
1515
css(el, initial)
1616

17-
return parseFloat(height, 10)
17+
return parseFloat(height)
1818
}
1919

2020
function parseSize (padding) {
@@ -23,7 +23,7 @@ function parseSize (padding) {
2323
if (unit) {
2424
unit = unit[0]
2525
}
26-
return [parseFloat(t, 10), unit]
26+
return [parseFloat(t), unit]
2727
})
2828
}
2929

src/directives/ripple.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ function showRipple (evt, el, stopPropagation) {
88
evt.stopPropagation()
99
}
1010

11-
var container = document.createElement('span')
12-
var animNode = document.createElement('span')
11+
let container = document.createElement('span')
12+
let animNode = document.createElement('span')
1313

1414
container.appendChild(animNode)
1515
container.className = 'q-ripple-container'

src/utils/dom.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ export function height (el) {
1515
if (el === window) {
1616
return viewport().height
1717
}
18-
return parseFloat(window.getComputedStyle(el).getPropertyValue('height'), 10)
18+
return parseFloat(style(el, 'height'))
1919
}
2020

2121
export function width (el) {
2222
if (el === window) {
2323
return viewport().width
2424
}
25-
return parseFloat(window.getComputedStyle(el).getPropertyValue('width'), 10)
25+
return parseFloat(style(el, 'width'))
2626
}
2727

2828
export function css (element, css) {

src/utils/event.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
function getEvent (e) {
2-
return !e ? window.event : e
2+
return e || window.event
33
}
44

55
export function rightClick (e) {
66
e = getEvent(e)
77

88
if (e.which) {
9-
return e.which == 3 // eslint-disable-line
9+
return e.which === 3 // eslint-disable-line
1010
}
1111
if (e.button) {
12-
return e.button == 2 // eslint-disable-line
12+
return e.button === 2 // eslint-disable-line
1313
}
1414

1515
return false

src/utils/extend.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let
88
})
99

1010
function type (obj) {
11-
return obj == null ? String(obj) : class2type[toString.call(obj)] || 'object'
11+
return obj === null ? String(obj) : class2type[toString.call(obj)] || 'object'
1212
}
1313

1414
function isPlainObject (obj) {
@@ -52,7 +52,7 @@ export default function extend () {
5252
}
5353

5454
for (; i < length; i++) {
55-
if ((options = arguments[i]) != null) {
55+
if ((options = arguments[i]) !== null) {
5656
for (name in options) {
5757
src = target[name]
5858
copy = options[name]

0 commit comments

Comments
 (0)