Skip to content

Commit bb71b77

Browse files
committed
wip: show error types
1 parent 3946c83 commit bb71b77

File tree

5 files changed

+74
-5
lines changed

5 files changed

+74
-5
lines changed

index.html

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,28 @@ <h4 data-l10n-id="login">logge sisa:</h4>
5050
</ul>
5151
</div>
5252

53-
<div id="modes-wrapper" class="pull-right dropdown ml3">
54-
<button class="btn btn-default dropdown-toggle" type="button" id="modes-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
55-
<span data-l10n-id="variant">Variant</span>:&nbsp;<span id="the-variant"></span>&nbsp;<span class="caret"></span>
53+
<div id="show-ignorables" class="pull-right ml3">
54+
<button class="btn btn-default" type="button" id="ignshow-btn" aria-haspopup="true" aria-expanded="true">
55+
<span data-l10n-id="show_error_types">Show all error types</span>
5656
</button>
57-
<ul class="dropdown-menu" aria-labelledby="modes-btn" id="modes">
58-
</ul>
57+
</div>
58+
59+
<div id="ignorables-modal" class="modal fade">
60+
<div class="modal-dialog">
61+
<div class="modal-content">
62+
<div class="modal-header">
63+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
64+
<h4 data-l10n-id="available_error_types" class="modal-title">Available error types:</h4>
65+
</div>
66+
<div class="modal-body">
67+
<ul id="ignorables-list"></ul>
68+
</div>
69+
<div class="modal-footer">
70+
<button data-l10n-id="close" type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
71+
<button data-l10n-id="save" type="button" class="btn btn-primary">Save</button>
72+
</div>
73+
</div>
74+
</div>
5975
</div>
6076

6177
<div id="content">

locales/app.fao.ftl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ title = rættlestur
1212
1313
serverdown = Ambætari svaraði ikki. Kanska tú skuldi roynt aftur.
1414
15+
// TODO:
1516
modemissing = Server responded with error. Mode/variant missing?
1617
1718
parserfail = Ambætari svaraði ikki. Kanska tú skuldi roynt aftur. Fekk { $errorCode } / { $textStatus }.
@@ -28,12 +29,24 @@ variant = Variant
2829
// TODO:
2930
hide_errtype = Skjul feiltype
3031
32+
// TODO:
33+
show_error_types = Show error types
34+
35+
// TODO:
36+
available_error_types = Available error types:
37+
3138
// TODO:
3239
hidden_errtypes = Skjulte feiltypar
3340
3441
// TODO:
3542
hide_errtype_explanation = Klikk på eit ord for å skjula feiltypen
3643
44+
// TODO:
45+
cancel = Cancel
46+
47+
// TODO:
48+
save = Save
49+
3750
3851
3952
// BEGIN Examples

locales/app.sme.ftl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ title = grammáhtalaš divvun
1212
1313
serverdown = Bálvá ii oro doaibmamin, dahje don it leat neahtas. Geahččal viežžat siiddu ođđasit.
1414
15+
// TODO:
1516
modemissing = Server responded with error. Mode/variant missing?
1617
1718
parserfail = Bálvá ii oro doaibmamin, dahje don it leat neahtas. Geahččal viežžat siiddu ođđasit. Oaččui meattáhuskoda { $errorCode } / { $textStatus } stáhtusiin.
@@ -26,12 +27,24 @@ variant = Variánta
2627
2728
hide_errtype = Ale merke dakkár meattáhusaid
2829
30+
// TODO:
31+
show_error_types = Show error types
32+
33+
// TODO:
34+
available_error_types = Available error types:
35+
2936
// TODO:
3037
hidden_errtypes = Ale merke:
3138
3239
// TODO:
3340
hide_errtype_explanation = Klikk på eit ord for å skjula feiltypen
3441
42+
// TODO:
43+
cancel = Cancel
44+
45+
// TODO:
46+
save = Save
47+
3548
3649
// BEGIN Examples
3750
// Currently supports up to 20 examples, numbered from 1 to 20:

src/app.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ var modesUrl/*:string*/ = protocol+"//"+hostname+":"+(port.toString())+subdir+"/
395395
var checkUrl/*:string*/ = protocol+"//"+hostname+":"+(port.toString())+subdir+"/checker";
396396
log(checkUrl);
397397
var hunUrl/*:string*/ = protocol+"//"+hostname+":"+(port.toString())+subdir+"/hunspell";
398+
var errXmlUrl/*:string*/ = protocol+"//"+hostname+window.location.pathname+"/errors/";
398399

399400
$(document).ready(function() {
400401
if(window.location.host.match("^localhost:") || window.location.protocol === "file:") {
@@ -945,6 +946,30 @@ var initL10n = function(lang/*:string*/)/*:void*/ {
945946
$('head').append(el);
946947
};
947948

949+
var showIgnorables = function() {
950+
let search = searchToObject(),
951+
variant = getVariant(search),
952+
lang = getLang(search),
953+
url = errXmlUrl + "/" + lang + ".xml";
954+
$.ajax(url, {
955+
success: function(res) {
956+
let ul = $("#ignorables-list");
957+
ul.html("");
958+
let errors = $(res.activeElement).find('error');
959+
errors.each(function(i, e) {
960+
let t = $(e).find('header title[xml\\:lang="se"]').text();
961+
ul.append($("<li>").addClass("error-doc").addClass("list-unstyled").text(t));
962+
});
963+
console.log(errors);
964+
$('#ignorables-modal').modal('show');
965+
},
966+
error: function(jqXHR, textStatus/*:string*/, errXHR/*:string*/)/*:void*/ {
967+
console.warn("Error getting pipespec from " + url, jqXHR, textStatus, errXHR);
968+
},
969+
dataType: "xml"
970+
});
971+
};
972+
948973
var init = function()/*:void*/ {
949974
if(window.location.protocol == "http:") {
950975
$('#password').attr("type", "text");
@@ -989,6 +1014,7 @@ var init = function()/*:void*/ {
9891014
hiderep();
9901015
updateIgnored();
9911016
check();
1017+
$('#ignshow-btn').click(showIgnorables);
9921018
};
9931019

9941020
$(document).ready(init);

style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,5 +254,6 @@ button.loading-check {
254254
font-size: larger;
255255
}
256256

257+
257258
/* Margins snatched from tachyons: */
258259
.ma0{margin:0}.ma1{margin:.25rem}.ma2{margin:.5rem}.ma3{margin:1rem}.ma4{margin:2rem}.ma5{margin:4rem}.ma6{margin:8rem}.ma7{margin:16rem}.ml0{margin-left:0}.ml1{margin-left:.25rem}.ml2{margin-left:.5rem}.ml3{margin-left:1rem}.ml4{margin-left:2rem}.ml5{margin-left:4rem}.ml6{margin-left:8rem}.ml7{margin-left:16rem}.mr0{margin-right:0}.mr1{margin-right:.25rem}.mr2{margin-right:.5rem}.mr3{margin-right:1rem}.mr4{margin-right:2rem}.mr5{margin-right:4rem}.mr6{margin-right:8rem}.mr7{margin-right:16rem}.mb0{margin-bottom:0}.mb1{margin-bottom:.25rem}.mb2{margin-bottom:.5rem}.mb3{margin-bottom:1rem}.mb4{margin-bottom:2rem}.mb5{margin-bottom:4rem}.mb6{margin-bottom:8rem}.mb7{margin-bottom:16rem}.mt0{margin-top:0}.mt1{margin-top:.25rem}.mt2{margin-top:.5rem}.mt3{margin-top:1rem}.mt4{margin-top:2rem}.mt5{margin-top:4rem}.mt6{margin-top:8rem}.mt7{margin-top:16rem}.mv0{margin-top:0;margin-bottom:0}.mv1{margin-top:.25rem;margin-bottom:.25rem}.mv2{margin-top:.5rem;margin-bottom:.5rem}.mv3{margin-top:1rem;margin-bottom:1rem}.mv4{margin-top:2rem;margin-bottom:2rem}.mv5{margin-top:4rem;margin-bottom:4rem}.mv6{margin-top:8rem;margin-bottom:8rem}.mv7{margin-top:16rem;margin-bottom:16rem}.mh0{margin-left:0;margin-right:0}.mh1{margin-left:.25rem;margin-right:.25rem}.mh2{margin-left:.5rem;margin-right:.5rem}.mh3{margin-left:1rem;margin-right:1rem}.mh4{margin-left:2rem;margin-right:2rem}.mh5{margin-left:4rem;margin-right:4rem}.mh6{margin-left:8rem;margin-right:8rem}.mh7{margin-left:16rem;margin-right:16rem}

0 commit comments

Comments
 (0)