Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions app/public/js/app.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
$(document).ready(function() {
var previous_req_id = 0;
$(".story-preview").click(function(e){
$(".story-preview").click(function(e){
e.preventDefault();

var $this = $(this);

var openStories = $("li.story.open");

if(!$this.hasClass("open")) {
$this.trigger("openStory");
}
Expand Down Expand Up @@ -69,10 +69,17 @@ $(document).ready(function() {
}

openStories.trigger("closeStory");

window.scrollTo(0, $this.offset().top);
});

$("li.story").on("updateScroll", function(e) {
var $this = $(this);
if (!$this.visible()) {
window.scrollTo(0, $this.offset().top);
}
});

$("#mark-all").click(function(e) {
e.preventDefault();

Expand Down Expand Up @@ -133,7 +140,6 @@ $(document).ready(function() {
Stringer.currentlySelectedStory().trigger("toggleStory");
} else {
cursorPosition = 0;

Stringer.setCursorPosition(cursorPosition);
Stringer.currentlySelectedStory().trigger("openStory");
}
Expand All @@ -159,4 +165,22 @@ $(document).ready(function() {

if (permalink) window.open(permalink.href, '_blank');
});
});

Mousetrap.bind("n", function() {
if (cursorPosition < MAX_POSITION - 1) {
Stringer.setCursorPosition(++cursorPosition);
Stringer.currentlySelectedStory().trigger("updateScroll");
}
});

Mousetrap.bind("p", function() {
if (cursorPosition > 0) {
Stringer.setCursorPosition(--cursorPosition);
} else {
cursorPosition = 0;
Stringer.setCursorPosition(cursorPosition);
}
Stringer.currentlySelectedStory().trigger("updateScroll");
});

});
2 changes: 2 additions & 0 deletions app/public/js/jquery.visible.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/views/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<script type="text/javascript" src="/js/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/js/mousetrap.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/js/jquery.visible.min.js"></script>
<script type="text/javascript" src="/js/app.js"></script>

<%= yield_content :head %>
Expand Down
1 change: 1 addition & 0 deletions app/views/partials/_shortcuts.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<div class="modal-body">
<ul class="shortcut-legend">
<li><kbd>j</kbd>/<kbd>k</kbd>: <%= t('partials.shortcuts.keys.jk') %></li>
<li><kbd>n</kbd>/<kbd>p</kbd>: <%= t('partials.shortcuts.keys.np') %></li>
<li><kbd>o</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
<li><kbd>v</kbd>: <%= t('partials.shortcuts.keys.v') %></li>
<li class="blank"></li>
Expand Down
3 changes: 2 additions & 1 deletion config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ de:
shortcuts:
title: "Tastaturkürzel"
keys:
jk: "Nächste/vorherige Geschichte"
jk: "Wählen nächsten/vorherigen Geschichte"
np: "Gehe zur nächsten/vorherigen Bericht (ohne Auswahl it)"
oenter: "Klappe Geschichte aus/ein"
or: "oder"
v: "Öffne die URL der Geschichte"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ en:
shortcuts:
title: "Keyboard shortcuts"
keys:
jk: "Next/previous story"
jk: "Select next/previous story"
np: "Go to next/previous story (without selecting it)"
oenter: "Toggle story open/closed"
or: "or"
v: "Go to story URL"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ es:
shortcuts:
title: "Atajos de teclado"
keys:
jk: "Siguiente/Anterior historia"
jk: "Seleccionar siguiente/anterior historia"
np: "Ir a la siguiente / anterior historia (sin seleccionarlo)"
oenter: "Arrastrar historia abierta/cerrada"
or: "o"
v: "Ir a URL de la historia"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ fr:
shortcuts:
title: "Raccourcis clavier"
keys:
jk: "Article suivant/précédant"
jk: "Sélectionner article suivant/précédent"
np: "Aller à l'article suivant/précédent (sans le sélectionner)"
oenter: "Ouvrir/fermer l'article"
or: "ou"
v: "Aller à l'URL de l'article"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ it:
shortcuts:
title: "Shortcuts da tastiera"
keys:
jk: "Prossima/precedente storia"
jk: "Seleziona successiva/precedente storia"
np: "Vai alla successiva/precedente storia (senza selezionarla)"
oenter: "Apri/chiudi la storia"
or: "o"
v: "Vai all'URL della storia"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ nl:
shortcuts:
title: "Sneltoetsen"
keys:
jk: "Volgend/vorig artikel"
jk: "Naar volgend/vorig artikel"
np: "Ga naar volgende/vorige artikel (zonder het te selecteren)"
oenter: "Artikel open-/dichtklappen"
or: "of"
v: "Open de URL van het artikel"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ pt:
shortcuts:
title: "Atalhos do teclado"
keys:
jk: "História seguinte/anterior"
jk: "Selecionar anterior/seguinte história"
np: "Ir para a próxima/anterior story (sem selecioná-lo)"
oenter: "Abrir/fechar história"
or: "ou"
v: "Ir para URL da história"
Expand Down
3 changes: 2 additions & 1 deletion config/locales/zh_CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ zh_CN:
shortcuts:
title: "快捷键"
keys:
jk: "下一个/上一个故事"
jk: "選擇下一首/上一故事"
np: "轉到下一首/上的故事(不選擇"
oenter: "点击打开/关闭"
or: "或"
v: "转到原网址"
Expand Down