Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

diff --git a/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt b/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt
new file mode 100644 (file)
index 0000000..aa2f186
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/blog.niqnutn.com.txt
@@ -0,0 +1,9 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fblog.niqnutn.com%2Farticle35%2Fsteganographie-l-art-de-dissimuler-un-message
+
+body: //article[contains(concat(' ',normalize-space(@class),' '),' article-content ')]//section
+
+strip_id_or_class: sommaire
+
+test_url: http://blog.niqnutn.com/article35/steganographie-l-art-de-dissimuler-un-message

diff --git a/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt b/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt
new file mode 100644 (file)
index 0000000..b395fa9
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/gokulkrishh.github.io.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fgokulkrishh.github.io%2FJavascript-Guidelines%2F
+
+body: //section[contains(concat(' ',normalize-space(@class),' '),' main-content ')]
+test_url: https://gokulkrishh.github.io/Javascript-Guidelines/

diff --git a/inc/3rdparty/site_config/standard/hackersrepublic.org.txt b/inc/3rdparty/site_config/standard/hackersrepublic.org.txt
new file mode 100644 (file)
index 0000000..da01c21
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/hackersrepublic.org.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.hackersrepublic.org%2Fculture-du-hacking%2Fune-histoire-de-privileges
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' field-name-body ')]//div[contains(concat(' ',normalize-space(@class),' '),' field-items ')]//div[contains(concat(' ',normalize-space(@class),' '),' field-item ') and (contains(concat(' ',normalize-space(@class),' '),' even '))]
+test_url: http://www.hackersrepublic.org/culture-du-hacking/une-histoire-de-privileges

diff --git a/inc/3rdparty/site_config/standard/metrocop.net.txt b/inc/3rdparty/site_config/standard/metrocop.net.txt
new file mode 100644 (file)
index 0000000..9535f12
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/metrocop.net.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fmetrocop.net%2Fmythic-comics%2Fissue-1%2F
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' entry ')]
+test_url: http://metrocop.net/mythic-comics/issue-1/

diff --git a/inc/3rdparty/site_config/standard/pérotin.com.txt b/inc/3rdparty/site_config/standard/pérotin.com.txt
new file mode 100644 (file)
index 0000000..7784fa4
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/pérotin.com.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=xn--protin-bva.com%2Fpost%2F2009%2F06%2F09%2FSAV-Free-un-sketch-kafkaien
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' post ')]
+test_url: http://xn--protin-bva.com/post/2009/06/09/SAV-Free-un-sketch-kafkaien

diff --git a/inc/3rdparty/site_config/standard/reddit.com.txt b/inc/3rdparty/site_config/standard/reddit.com.txt
index ba342c7cd2aa0fe1f6f85cb28b80d1e29719cc5b..c3f2d3e5c510fb811e65e90e445fc19506a73262 100755 (executable)
--- a/inc/3rdparty/site_config/standard/reddit.com.txt
+++ b/inc/3rdparty/site_config/standard/reddit.com.txt
@@ -7,7 +7,9 @@ author: //p[@class="tagline"]/a
 # this doesn't work for some reason...?
 date: //p[@class="tagline"]//@datetime
 
-body: (//div[contains(@class, 'noncollapsed')]//div[contains(@class, 'usertext-body')])[1]
+#body: (//div[contains(@class, 'noncollapsed')]//div[contains(@class, 'usertext-body')])[1]
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' usertext-body ') and (contains(concat(' ',normalize-space(@class),' '),' may-blank-within ')) and (contains(concat(' ',normalize-space(@class),' '),' md-container '))]//div[contains(concat(' ',normalize-space(@class),' '),' md ')]
 
 strip_id_or_class: tagline
 strip_id_or_class: unvotable-message
@@ -18,4 +20,4 @@ single_page_link: //p[@class="title"]/a[contains(@href, 'http://')]
 
 test_url: http://www.reddit.com/r/truegaming/comments/wfe7r/i_wrote_about_the_problems_i_honestly_feel_that/
 test_url: http://www.reddit.com/r/worldnews/comments/1as37r/twelve_north_korean_soldiers_attempting_to_defect/
-test_url: http://www.reddit.com/r/WritingPrompts/comments/2786lw/wp_in_a_world_where_puns_are_illegal_one_man/chybk8e
\ No newline at end of file
+test_url: http://www.reddit.com/r/WritingPrompts/comments/2786lw/wp_in_a_world_where_puns_are_illegal_one_man/chybk8e

diff --git a/inc/3rdparty/site_config/standard/spiil.org.txt b/inc/3rdparty/site_config/standard/spiil.org.txt
new file mode 100644 (file)
index 0000000..dd12fb8
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/spiil.org.txt
@@ -0,0 +1,6 @@
+# Generated by FiveFilters.org's web-based selection tool
+# Place this file inside your site_config/custom/ folder
+# Source: http://siteconfig.fivefilters.org/grab.php?url=https%3A%2F%2Fwww.spiil.org%2Fguide-bonnes-pratiques-editeurs-de-presse-ligne
+
+body: //div[contains(concat(' ',normalize-space(@class),' '),' node-content ')]
+test_url: https://www.spiil.org/guide-bonnes-pratiques-editeurs-de-presse-ligne

diff --git a/themes/_global/js/keyboard.js b/themes/_global/js/keyboard.js
index 4469248dc368ee2c66836241e4996f16afed2861..48f60a095ee2a62c0dc1c3d8486a266998d41539 100644 (file)
--- a/themes/_global/js/keyboard.js
+++ b/themes/_global/js/keyboard.js
@@ -144,5 +144,7 @@ function goSelectPrev(selectedArticle,number) {
 }
 
 function enterArticle(selectedArticle) {
-  window.location = selectedArticle.find('a:first').attr('href');
+  if (!$("#bagit").hasClass("current")) {
+    window.location = selectedArticle.find('a:first').attr('href');
+  }
 }
\ No newline at end of file