Skip to content

Commit 6b2a3c4

Browse files
mattpapmattpap
authored
Upgrade TypeScript to version 3.1 (bokeh#8414)
* Upgrade TypeScript to version 3.1.6 * Fix compilation errors with TypeScript 3.1.6 * Upgrade mocha to version 5.2
1 parent 6f52ccf commit 6b2a3c4

File tree

8 files changed

+43
-51
lines changed

8 files changed

+43
-51
lines changed

‎bokehjs/package-lock.json

Lines changed: 15 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bokehjs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"uglifycss": "^0.0.29",
3333
"@types/uglifycss": "^0.0.5",
3434
"logtrap": "^0.0.1",
35-
"mocha": "^5.1.1",
35+
"mocha": "^5.2.0",
3636
"sinon": "^1.15.4",
3737
"yargs": "^11.0.0",
3838
"jsdom": "^9.8.3",
3939
"websocket": "^1.0.26",
40-
"typescript": "3.0.3",
40+
"typescript": "3.1.6",
4141
"tslib": "^1.9.3",
4242
"tslint": "^5.11.0",
4343
"coffeescript": "^2.3.0",

‎bokehjs/src/lib/core/dom.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ export function position(element: HTMLElement) {
132132
export function offset(element: HTMLElement) {
133133
const rect = element.getBoundingClientRect()
134134
return {
135-
top: rect.top + window.pageYOffset - document.documentElement.clientTop,
136-
left: rect.left + window.pageXOffset - document.documentElement.clientLeft,
135+
top: rect.top + window.pageYOffset - document.documentElement!.clientTop,
136+
left: rect.left + window.pageXOffset - document.documentElement!.clientLeft,
137137
}
138138
}
139139

‎bokehjs/src/lib/core/layout/side_panel.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const _angle_lookup: {[key in Side]: {[key in Orient]: number}} = {
7777
},
7878
}
7979

80-
const _baseline_lookup: {[key in Side]: {[key in TextOrient]: string}} = {
80+
const _baseline_lookup: {[key in Side]: {[key in TextOrient]: CanvasTextBaseline}} = {
8181
above: {
8282
justified : TOP,
8383
parallel : ALPHABETIC,
@@ -108,7 +108,7 @@ const _baseline_lookup: {[key in Side]: {[key in TextOrient]: string}} = {
108108
},
109109
}
110110

111-
const _align_lookup: {[key in Side]: {[key in TextOrient]: string}} = {
111+
const _align_lookup: {[key in Side]: {[key in TextOrient]: CanvasTextAlign}} = {
112112
above: {
113113
justified : CENTER,
114114
parallel : CENTER,
@@ -139,14 +139,14 @@ const _align_lookup: {[key in Side]: {[key in TextOrient]: string}} = {
139139
},
140140
}
141141

142-
const _align_lookup_negative: {[key in Side]: string} = {
142+
const _align_lookup_negative: {[key in Side]: CanvasTextAlign} = {
143143
above : RIGHT,
144144
below : LEFT,
145145
left : RIGHT,
146146
right : LEFT,
147147
}
148148

149-
const _align_lookup_positive: {[key in Side]: string} = {
149+
const _align_lookup_positive: {[key in Side]: CanvasTextAlign} = {
150150
above : LEFT,
151151
below : RIGHT,
152152
left : RIGHT,
@@ -274,16 +274,16 @@ export class SidePanel extends LayoutCanvas {
274274
apply_label_text_heuristics(ctx: CanvasRenderingContext2D, orient: TextOrient | number): void {
275275
const side = this.side
276276

277-
let baseline: string
278-
let align: string
277+
let baseline: CanvasTextBaseline
278+
let align: CanvasTextAlign
279279

280280
if (isString(orient)) {
281281
baseline = _baseline_lookup[side][orient]
282282
align = _align_lookup[side][orient]
283283
} else {
284284
if (orient === 0) {
285-
baseline = "whatever" // XXX: _baseline_lookup[side][orient]
286-
align = "whatever" // XXX: _align_lookup[side][orient]
285+
baseline = "whatever" as any // XXX: _baseline_lookup[side][orient]
286+
align = "whatever" as any // XXX: _align_lookup[side][orient]
287287
} else if (orient < 0) {
288288
baseline = 'middle'
289289
align = _align_lookup_negative[side]

‎bokehjs/src/lib/external/ie.d.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
declare interface HTMLCanvasElement {
2+
msToBlob(): Blob
3+
}
4+
5+
declare function clearImmediate(handle: number): void
6+
declare function setImmediate(handler: (...args: any[]) => void): number
7+
declare function setImmediate(handler: any, ...args: any[]): number

‎bokehjs/src/lib/models/layouts/layout_dom.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export abstract class LayoutDOMView extends DOMView implements EventListenerObje
8383
// we reached <body> element, so use viewport size
8484
if (measuring == document.body) {
8585
const {left, right, top, bottom} = margin(document.body)
86-
const width = document.documentElement.clientWidth - left - right
87-
const height = document.documentElement.clientHeight - top - bottom
86+
const width = document.documentElement!.clientWidth - left - right
87+
const height = document.documentElement!.clientHeight - top - bottom
8888
return [width, height]
8989
}
9090

‎bokehjs/src/lib/models/plots/plot_canvas.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,12 @@ export class PlotCanvasView extends DOMView {
388388
this.state_changed.emit()
389389
}
390390

391-
can_undo(): void {
392-
this.state.index >= 0
391+
can_undo(): boolean {
392+
return this.state.index >= 0
393393
}
394394

395-
can_redo(): void {
396-
this.state.index < this.state.history.length - 1
395+
can_redo(): boolean {
396+
return this.state.index < this.state.history.length - 1
397397
}
398398

399399
undo(): void {

‎bokehjs/src/lib/models/widgets/date_picker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Pikaday.prototype.adjustPosition = function(this: Pikaday & {_o: Pikaday.Pikaday
1414
const field = this._o.trigger!
1515
const width = this.el.offsetWidth
1616
const height = this.el.offsetHeight
17-
const viewportWidth = window.innerWidth || document.documentElement.clientWidth
18-
const viewportHeight = window.innerHeight || document.documentElement.clientHeight
19-
const scrollTop = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop
17+
const viewportWidth = window.innerWidth || document.documentElement!.clientWidth
18+
const viewportHeight = window.innerHeight || document.documentElement!.clientHeight
19+
const scrollTop = window.pageYOffset || document.body.scrollTop || document.documentElement!.scrollTop
2020

2121
const clientRect = field.getBoundingClientRect()
2222
let left = clientRect.left + window.pageXOffset

0 commit comments

Comments
 (0)