Skip to content

Commit cbaa632

Browse files
brewster1134brewster1134
authored
Merge pull request #13 from brewster1134/2.x-bug-fixes
2.x-bug-fixes
2 parents 4947189 + e1b25eb commit cbaa632

File tree

10 files changed

+416
-289
lines changed

10 files changed

+416
-289
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#### CHANGE LOG
22

3+
###### 2.0.2
4+
* code refactor
5+
* added tests
6+
37
###### 2.0.1
48
* viewport sizing bugfix
59

‎Newfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
sources:
33
default: ~/Code/ruby/new-tasks
44
name: Tiler
5-
version: 2.0.1
5+
version: 2.0.2
66
tasks:
77
changelog:
88
git:

‎bower.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"jquery-ui": "latest"
66
},
77
"devDependencies": {
8-
"chai": "latest",
98
"chai-as-promised": "latest",
9+
"chai-jquery": "latest",
10+
"chai": "latest",
11+
"lolex": "sinonjs/lolex",
1012
"mocha": "latest",
1113
"sinon-chai": "latest",
1214
"sinon": "latest"

‎demo/tiler_demo.coffee‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ $ ->
22

33
# initalize tiler
44
$('.tiler-viewport').each ->
5-
$(@).tiler().tiler('goTo', 1, false)
5+
$(@).tiler()
66

77
# set the button text to match the tile title
88
$('button[data-tiler-link]').each ->
9-
$(@).text($(@).data('tiler-title'))
9+
$(@).text $(@).data('tiler-title')
1010

1111
# go to a tile on click based on the link id
1212
$('button').click ->
1313
tileId = $(@).data('tiler-link')
14-
$(@).closest('.tiler-viewport').tiler('goTo', tileId)
14+
$(@).closest('.tiler-viewport').tiler 'goTo', tileId
1515

1616
# event to set background
1717
$('#background').on 'tiler.goto', (e, data) ->

‎demo/tiler_demo.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/tiler.js‎

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

‎spec/index.html‎

Lines changed: 58 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,73 @@
1010

1111
<!-- initialize -->
1212
<div class="tiler-viewport" id="initialize">
13-
<div class="tiler-tile">
13+
<div class="tiler-tile" id="tile-initialize-1" data-tiler-animation="tile-initialize-1-animation" data-tiler-title="Tile Initialize 1 Title">
14+
15+
<!-- nested tiler instance -->
1416
<div class="tiler-viewport" id="initialize-nested">
15-
<div class="tiler-tile"></div>
17+
<div class="tiler-tile" id="tile-initialize-nested-1"></div>
1618
</div>
1719
</div>
18-
</div>
19-
<div class="tiler-viewport" id="viewport-height">
20-
<div class="tiler-tile"></div>
21-
</div>
2220

23-
<!-- initialize : buildLinks-->
24-
<button data-tiler-link="build-links:tile-1"></button>
25-
<div class="tiler-viewport" id="build-links">
26-
<div class="tiler-tile" id="tile-1" data-tiler-title="Tile 1" data-tiler-foo="Foo 1"></div>
21+
<!-- link tile -->
22+
<div class="tiler-tile" id="tile-initialize-2" data-tiler-animation="tile-initialize-2-animation" data-tiler-title="Tile Initialize 2 Title"></div>
2723
</div>
2824

29-
<!-- initialize : options : isReversible -->
30-
<div class="tiler-viewport" id="reverse-support">
31-
<div class="tiler-tile" id="tile-1"></div>
32-
<div class="tiler-tile" id="tile-2"></div>
25+
<!-- link element -->
26+
<button data-tiler-link="initialize:tile-initialize-2"></button>
27+
28+
<!-- option: activeTile -->
29+
<div class="tiler-viewport" id="active-tile">
30+
<div class="tiler-tile" id="tile-active-tile-1"></div>
31+
<div class="tiler-tile" id="tile-active-tile-2"></div>
3332
</div>
3433

3534
<!-- goTo -->
3635
<div class="tiler-viewport" id="go-to">
37-
<div class="tiler-tile" id="tile-1"></div>
38-
<div class="tiler-tile" id="tile-2"></div>
36+
<div class="tiler-tile" id="tile-go-to-1" data-tiler-animation="tile-go-to-animation-1"></div>
37+
<div class="tiler-tile" id="tile-go-to-2" data-tiler-animation="tile-go-to-animation-2"></div>
38+
</div>
39+
40+
<!-- goTo: current tile -->
41+
<div class="tiler-viewport" id="current-tile">
42+
<div class="tiler-tile" id="tile-current-tile-1"></div>
43+
<div class="tiler-tile" id="tile-current-tile-2"></div>
44+
</div>
45+
46+
<!-- goTo: events -->
47+
<div class="tiler-viewport" id="events">
48+
<div class="tiler-tile" id="tile-events-1"></div>
49+
<div class="tiler-tile" id="tile-events-2"></div>
50+
</div>
51+
52+
<!-- goTo: option: isReversible -->
53+
<div class="tiler-viewport" id="is-reversible">
54+
<div class="tiler-tile" id="tile-is-reversible-1"></div>
55+
<div class="tiler-tile" id="tile-is-reversible-2"></div>
56+
</div>
57+
58+
<!-- goTo: custom animation -->
59+
<div class="tiler-viewport" id="custom-animation">
60+
<div class="tiler-tile" id="tile-custom-animation-1"></div>
61+
<div class="tiler-tile" id="tile-custom-animation-2"></div>
62+
</div>
63+
64+
<!-- goTo: animation true or undefined -->
65+
<div class="tiler-viewport" id="animation-true-or-undefined">
66+
<div class="tiler-tile" id="tile-animation-true-or-undefined-1" data-tiler-animation="tile-animation-true-or-undefined-animation-1"></div>
67+
<div class="tiler-tile" id="tile-animation-true-or-undefined-2" data-tiler-animation="tile-animation-true-or-undefined-animation-2"></div>
68+
</div>
69+
70+
<!-- goTo: animation false -->
71+
<div class="tiler-viewport" id="animation-false">
72+
<div class="tiler-tile" id="tile-animation-false-1"></div>
73+
<div class="tiler-tile" id="tile-animation-false-2"></div>
3974
</div>
4075

4176
<!-- refresh -->
4277
<div class="tiler-viewport" id="refresh">
43-
<div class="tiler-tile" id="tile-1"></div>
44-
<div class="tiler-tile" id="tile-2"></div>
78+
<div class="tiler-tile" id="tile-refresh-1"></div>
79+
<div class="tiler-tile" id="tile-refresh-2"></div>
4580
</div>
4681

4782
</body>
@@ -52,26 +87,16 @@
5287
<script type="text/javascript" src="/vendor/jquery-ui/ui/widget.js"></script>
5388
<script type="text/javascript" src="/vendor/mocha/mocha.js"></script>
5489
<script type="text/javascript" src="/vendor/chai/chai.js"></script>
90+
<script type="text/javascript" src="/vendor/chai-jquery/chai-jquery.js"></script>
5591

5692
<!-- Sinon -->
93+
<script type="text/javascript" src="/vendor/lolex/lolex.js"></script>
5794
<script type="text/javascript" src="/vendor/sinon/lib/sinon.js"></script>
58-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/util/core.js"></script>
95+
<script type="text/javascript" src="/vendor/sinon/lib/sinon/call.js"></script>
5996
<script type="text/javascript" src="/vendor/sinon/lib/sinon/extend.js"></script>
60-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/typeOf.js"></script>
61-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/times_in_words.js"></script>
6297
<script type="text/javascript" src="/vendor/sinon/lib/sinon/spy.js"></script>
63-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/call.js"></script>
64-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/behavior.js"></script>
65-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/stub.js"></script>
66-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/mock.js"></script>
67-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/collection.js"></script>
68-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/assert.js"></script>
69-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/sandbox.js"></script>
70-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/test.js"></script>
71-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/test_case.js"></script>
72-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/match.js"></script>
73-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/format.js"></script>
74-
<script type="text/javascript" src="/vendor/sinon/lib/sinon/log_error.js"></script>
98+
<script type="text/javascript" src="/vendor/sinon/lib/sinon/util/core.js"></script>
99+
<script type="text/javascript" src="/vendor/sinon/lib/sinon/util/fake_timers.js"></script>
75100

76101
<script type="text/javascript" src="/vendor/sinon-chai/lib/sinon-chai.js"></script>
77102
<script type="text/javascript" src="/testem.js"></script>

0 commit comments

Comments
 (0)