From dd8785b60ac8d8f9e256f1f200b87dade67a174a Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Tue, 7 Oct 2014 17:48:20 +0200
Subject: remove derstandard.at enhancer

---
 CHANGELOG.md                        |  1 -
 articleenhancer/xpathenhancers.json | 45 -------------------------------------
 js/directive/NewsOnFolderRoute.js   | 27 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 46 deletions(-)
 create mode 100644 js/directive/NewsOnFolderRoute.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e91978074..b2944c6bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 owncloud-news (3.303)
 * **Enhancement**: Added Slashdot.org enhancer to get rid of tons of advertising that create a lot of whitespace when using adblock
 * **Enhancement**: When a folder or feed of a folder is selected, select that folder in the add new feed section
-* **Enhancement**: Added derstandard.at enhancer for the main sections
 
 owncloud-news (3.302)
 * **Bugfix**: Fix text overflow for subscriptions and starred feed
diff --git a/articleenhancer/xpathenhancers.json b/articleenhancer/xpathenhancers.json
index e7ec0b533..1441ce920 100644
--- a/articleenhancer/xpathenhancers.json
+++ b/articleenhancer/xpathenhancers.json
@@ -5,51 +5,6 @@
 	"slashdot.org": {
 		"%rss.slashdot.org%": "//article/div[@class='body'] | //article[@class='layout-article']/div"
 	},
-	"derstandard.at": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Web": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/International": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Inland": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Wirtschaft": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Sport": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Panorama": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Etat": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Kultur": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Wissenschaft": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Gesundheit": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Bildung": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Reisen": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Lifestyle": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
-	"derstandard.at/Familie": {
-		"%derstandard.at%": "//*[@id='content-main']"
-	},
 	"explosm.net": {
 		"%explosm.net/comics%": "//*[@id='maincontent']/div[2]/div/img",
 		"%explosm.net/show%": "//*[@id='videoPlayer']/iframe"
diff --git a/js/directive/NewsOnFolderRoute.js b/js/directive/NewsOnFolderRoute.js
new file mode 100644
index 000000000..f53c61463
--- /dev/null
+++ b/js/directive/NewsOnFolderRoute.js
@@ -0,0 +1,27 @@
+/**
+ * ownCloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+app.directive('newsOnFolderRoute', function ($rootScope, $route, FEED_TYPE) {
+    'use strict';
+
+    return {
+    	scope: {
+    		newsOnFolderRoute: '&',
+    	},
+    	link: function (scope) {
+	        $rootScope.$on('$locationChangeStart', function () {
+	        	if ($route.current.$$route.type === FEED_TYPE.FOLDER) {
+	        		var id = parseInt($route.current.params.id, 10);
+	        		scope.folder.existingFolder = scope.newsOnFolderRoute(id);
+	        	}
+	        });
+	    }
+    };
+
+});
\ No newline at end of file
-- 
cgit v1.2.3