Skip to content

Commit a2e4cde

Browse files
megothmegoth
authored
Merge pull request #111 from solid/tab-tets
Tweaks to get the tests for tabs.js working
2 parents 3d05c8e + 27725d3 commit a2e4cde

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

‎src/test/test-tabs.html‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link type="text/css" rel="stylesheet" href=
1313
"https://linkeddata.github.io/tabulator-firefox/content/tabbedtab.css" />
1414

15-
<style type="application/javascript">
15+
<style type="text/css">
1616
<![CDATA[
1717

1818
input { background-color: #eef; padding: 0.5em; border: .5em solid white; font-size: 120%; };
@@ -31,7 +31,7 @@
3131
]]>
3232
</style>
3333
<script type="text/javascript" src=
34-
"../../../mashlib/dist/mashlib-prealpha.js">
34+
"../../../mashlib/dist/mashlib.js">
3535
</script>
3636
<!-- "https://linkeddata.github.io/app-schedule/schedule.js" -->
3737

@@ -74,7 +74,7 @@ <h2>Test Tabs widget</h2>
7474
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://cnn.com/&gt; &lt;https://webfoundation.org/&gt; ) .
7575

7676
#ends
77-
77+
7878
</pre>
7979
</td>
8080

@@ -91,7 +91,7 @@ <h2>Test Tabs widget</h2>
9191
ui:subject &lt;#it&gt;.
9292
&lt;#it&gt;
9393
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
94-
94+
9595
</pre>
9696
</td>
9797

@@ -108,7 +108,7 @@ <h2>Test Tabs widget</h2>
108108
ui:subject &lt;#it&gt;.
109109
&lt;#it&gt;
110110
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
111-
111+
112112
</pre>
113113
</td>
114114

@@ -125,7 +125,7 @@ <h2>Test Tabs widget</h2>
125125
ui:subject &lt;#it&gt;.
126126
&lt;#it&gt;
127127
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
128-
128+
129129
</pre>
130130
</td>
131131

@@ -144,7 +144,7 @@ <h2>Test Tabs widget</h2>
144144
trip:attachmentList ( &lt;http://acm.org/&gt; &lt;http://aclu.org/&gt;
145145
&lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt;
146146
&lt;http://www.zenith.org/&gt; ) .
147-
147+
148148
</pre>
149149
</td>
150150

@@ -169,7 +169,7 @@ <h2>Test Tabs widget</h2>
169169
&lt;http://aclu.org/&gt;
170170
&lt;http://acm.org/&gt;
171171
) .
172-
172+
173173
</pre>
174174
</td>
175175

@@ -186,7 +186,7 @@ <h2>Test Tabs widget</h2>
186186
ui:subject &lt;#it&gt;.
187187
&lt;#it&gt;
188188
trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
189-
189+
190190
</pre>
191191
</td>
192192

@@ -202,7 +202,7 @@ <h2>Test Tabs widget</h2>
202202
ui:subject &lt;#it&gt;.
203203
&lt;#it&gt;
204204
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
205-
205+
206206
</pre>
207207
</td>
208208

@@ -219,7 +219,7 @@ <h2>Test Tabs widget</h2>
219219
ui:subject &lt;#it&gt;.
220220
&lt;#it&gt;
221221
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
222-
222+
223223
</pre>
224224
</td>
225225

@@ -236,7 +236,7 @@ <h2>Test Tabs widget</h2>
236236
ui:subject &lt;#it&gt;.
237237
&lt;#it&gt;
238238
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
239-
239+
240240
</pre>
241241
</td>
242242

@@ -253,7 +253,7 @@ <h2>Test Tabs widget</h2>
253253
ui:subject &lt;#it&gt;.
254254
&lt;#it&gt;
255255
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
256-
256+
257257
</pre>
258258
</td>
259259

@@ -272,7 +272,7 @@ <h2>Test Tabs widget</h2>
272272
trip:attachmentList ( &lt;http://acm.org/&gt; &lt;http://aclu.org/&gt;
273273
&lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt;
274274
&lt;http://www.zenith.org/&gt; ) .
275-
275+
276276
</pre>
277277
</td>
278278

@@ -297,7 +297,7 @@ <h2>Test Tabs widget</h2>
297297
&lt;http://aclu.org/&gt;
298298
&lt;http://acm.org/&gt;
299299
) .
300-
300+
301301
</pre>
302302
</td>
303303

@@ -314,7 +314,7 @@ <h2>Test Tabs widget</h2>
314314
ui:subject &lt;#it&gt;.
315315
&lt;#it&gt;
316316
trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
317-
317+
318318
</pre>
319319
</td>
320320

@@ -330,7 +330,7 @@ <h2>Test Tabs widget</h2>
330330
ui:subject &lt;#it&gt;.
331331
&lt;#it&gt;
332332
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
333-
333+
334334
</pre>
335335
</td>
336336

@@ -347,7 +347,7 @@ <h2>Test Tabs widget</h2>
347347
ui:subject &lt;#it&gt;.
348348
&lt;#it&gt;
349349
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
350-
350+
351351
</pre>
352352
</td>
353353

@@ -364,7 +364,7 @@ <h2>Test Tabs widget</h2>
364364
ui:subject &lt;#it&gt;.
365365
&lt;#it&gt;
366366
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
367-
367+
368368
</pre>
369369
</td>
370370

@@ -381,7 +381,7 @@ <h2>Test Tabs widget</h2>
381381
ui:subject &lt;#it&gt;.
382382
&lt;#it&gt;
383383
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
384-
384+
385385
</pre>
386386
</td>
387387

@@ -400,7 +400,7 @@ <h2>Test Tabs widget</h2>
400400
trip:attachmentList ( &lt;http://acm.org/&gt; &lt;http://aclu.org/&gt;
401401
&lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt;
402402
&lt;http://www.zenith.org/&gt; ) .
403-
403+
404404
</pre>
405405
</td>
406406

@@ -425,7 +425,7 @@ <h2>Test Tabs widget</h2>
425425
&lt;http://aclu.org/&gt;
426426
&lt;http://acm.org/&gt;
427427
) .
428-
428+
429429
</pre>
430430
</td>
431431

@@ -442,7 +442,7 @@ <h2>Test Tabs widget</h2>
442442
ui:subject &lt;#it&gt;.
443443
&lt;#it&gt;
444444
trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
445-
445+
446446
</pre>
447447
</td>
448448

@@ -458,7 +458,7 @@ <h2>Test Tabs widget</h2>
458458
ui:subject &lt;#it&gt;.
459459
&lt;#it&gt;
460460
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
461-
461+
462462
</pre>
463463
</td>
464464

@@ -475,7 +475,7 @@ <h2>Test Tabs widget</h2>
475475
ui:subject &lt;#it&gt;.
476476
&lt;#it&gt;
477477
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;https://webfoundation.org/&gt; ) .
478-
478+
479479
</pre>
480480
</td>
481481

@@ -492,7 +492,7 @@ <h2>Test Tabs widget</h2>
492492
ui:subject &lt;#it&gt;.
493493
&lt;#it&gt;
494494
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
495-
495+
496496
</pre>
497497
</td>
498498

@@ -509,7 +509,7 @@ <h2>Test Tabs widget</h2>
509509
ui:subject &lt;#it&gt;.
510510
&lt;#it&gt;
511511
trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt; ) .
512-
512+
513513
</pre>
514514
</td>
515515

@@ -528,7 +528,7 @@ <h2>Test Tabs widget</h2>
528528
trip:attachmentList ( &lt;http://acm.org/&gt; &lt;http://aclu.org/&gt;
529529
&lt;http://bbc.co.uk/&gt; &lt;http://cbc.ca/&gt; &lt;http://dbp.de/&gt; &lt;https://webfoundation.org/&gt;
530530
&lt;http://www.zenith.org/&gt; ) .
531-
531+
532532
</pre>
533533
</td>
534534

@@ -553,7 +553,7 @@ <h2>Test Tabs widget</h2>
553553
&lt;http://aclu.org/&gt;
554554
&lt;http://acm.org/&gt;
555555
) .
556-
556+
557557
</pre>
558558
</td>
559559

@@ -570,7 +570,7 @@ <h2>Test Tabs widget</h2>
570570
ui:subject &lt;#it&gt;.
571571
&lt;#it&gt;
572572
trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
573-
573+
574574
</pre>
575575
</td>
576576

‎src/test/test-tabs.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
document.addEventListener('DOMContentLoaded', function () {
33
/// ///////////////////////////////////////////
44

5-
var UI = require('mashlib')
5+
var UI = panes.UI
66
var kb = UI.store
77
var dom = document
88

@@ -48,7 +48,8 @@ document.addEventListener('DOMContentLoaded', function () {
4848
options.subject = kb.the(target, UI.ns.ui('subject'))
4949
options.ordered = kb.the(target, UI.ns.ui('ordered')).value === '1'
5050
options.orientation = kb.the(target, UI.ns.ui('orientation')).value
51-
51+
options.onClose = function(e) {} // Test it can make a close button is a good place
52+
// todo: test both cases
5253
var tabs = div.appendChild(UI.tabs.tabWidget(options))
5354
return tabs
5455
}
@@ -60,7 +61,7 @@ document.addEventListener('DOMContentLoaded', function () {
6061

6162
var tabContentCache = []
6263

63-
options.showMain = function (container, subject) {
64+
options.renderMain = function (container, subject) {
6465
container.innerHTML = ''
6566
if (tabContentCache[subject.uri]) {
6667
container.appendChild(tabContentCache[subject.uri])

0 commit comments

Comments
 (0)