Skip to content

Commit d4df379

Browse files
committed
Merge pull request #68 from fundon/dev
Travis CI
2 parents 6fe5b8d + 4ea19f1 commit d4df379

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: objective-c
2+
3+
notifications:
4+
email:
5+
on_success: never
6+
on_failure: change
7+
8+
script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Minimap package
1+
# Minimap package [![Build Status](https://travis-ci.org/fundon/atom-minimap.svg?branch=master)](https://travis-ci.org/fundon/atom-minimap)
22

33
A preview of the full source code.
44

lib/minimap-editor-view.coffee

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,17 @@ class MinimapEditorView extends ScrollView
6161

6262
displayBuffer = @editorView.getEditor().displayBuffer
6363
while @bufferChanges.length > 0
64-
{newRange, oldRange} = @bufferChanges.shift()
64+
try
65+
{newRange, oldRange} = @bufferChanges.shift()
6566

66-
newScreenRange = displayBuffer.screenRangeForBufferRange(newRange)
67-
oldScreenRange = displayBuffer.screenRangeForBufferRange(oldRange)
67+
newScreenRange = displayBuffer.screenRangeForBufferRange(newRange)
68+
oldScreenRange = displayBuffer.screenRangeForBufferRange(oldRange)
6869

69-
@deleteRowsAtRange(oldScreenRange)
70-
@createRowsAtRange(newScreenRange)
71-
@markIntermediateTime("update buffer change")
70+
@deleteRowsAtRange(oldScreenRange)
71+
@createRowsAtRange(newScreenRange)
72+
@markIntermediateTime("update buffer change")
73+
catch e
74+
continue
7275

7376
@endBench('complete update')
7477

lib/minimap-view.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class MinimapView extends View
4545

4646
@subscribe @paneView.model.$activeItem, @onActiveItemChanged
4747
# Fixed item move to other pane.
48-
@subscribe @paneView.model, 'item-removed', (item) -> item.off '.minimap'
48+
@subscribe @paneView.model, 'item-removed', (item) -> item.off? '.minimap'
4949

5050
@subscribe @miniEditorView, 'minimap:updated', @updateMinimapView
5151

0 commit comments

Comments
 (0)