Merge branch 'master' into gruntmaster

diff --git a/js/90-tracker.js b/js/90-tracker.js
index a475ee850bd5ad5fbbd00c5b84c5e30efa6165ec..8e7a4433f8965affad02929e49cc431296d13fa4 100644 (file)
--- a/js/90-tracker.js
+++ b/js/90-tracker.js
@@ -77,8 +77,7 @@
                $('#tracker_form').addClass('hidden');
                update_tracker();
                var xhr = new XMLHttpRequest();
-               xhr.open('GET', '/us/' + user);
-               xhr.setRequestHeader('Accept', 'application/json');
+               xhr.open('GET', '/us/' + user + '?format=json');
                xhr.onload = function () {
                        localStorage.setItem('tracker_data', this.responseText);
                        update_tracker();

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index b84dc81db4b13bcf3ec79a3c65f18912d831233a..503d0c426a1c5e57c2dc3cd1af6ffc7d94c39b04 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -125,11 +125,12 @@ sub dispatch_request{
                        response_filter { return shift }
                },
 
-               sub () {
+               sub (?:format~) {
+                       my $format = lc $_{format} // '';
                        response_filter {
                                my ($r) = @_;
                                return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
-                               return [200, ['Content-Type' => 'application/json', 'X-Forever' => 1], [encode_json $r->{params}]] if $env->{HTTP_ACCEPT} =~ m,^\s*application/json\s*$,g;
+                               return [200, ['Content-Type' => 'application/json'], [encode_json $r->{params}]] if $format eq 'json';
                                my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
                                [200, ['Content-Type' => 'text/html'], [encode 'UTF-8', $ret]]
                        },

diff --git a/tmpl/skel.en b/tmpl/skel.en
index 4d1e73e847b9e0271018adb8f9818f867ce8e9c6..d8392f48aaa888d485fbe5b26361b91c8305c423 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -37,7 +37,7 @@
 
 <div id="content">Content goes here</div>
 
-<div id="tracker">
+<div id="tracker" class="hidden">
 <h1>Track user</h1>
 <div id="tracker_form">
 <div class="form-group">