es6 all the things

3 files changed, 32 insertions, 39 deletions

diff --git a/js/app/App.js b/js/app/App.js
index 947a68a2e..3dbc907da 100644
--- a/js/app/App.js
+++ b/js/app/App.js
@@ -7,4 +7,4 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @copyright Bernhard Posselt 2014
  */
-var app = angular.module('News', ['ngRoute', 'ngSanitize', 'ngAnimate']);
\ No newline at end of file
+let app = angular.module('News', ['ngRoute', 'ngSanitize', 'ngAnimate']);
\ No newline at end of file
diff --git a/js/app/Config.js b/js/app/Config.js
index 5581af0e4..bd38f897b 100644
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -9,10 +9,8 @@
  */
 app.config(function ($routeProvider, $provide, $httpProvider) {
     'use strict';
-    var getResolve,
-        feedType;
 
-    feedType = {
+    let feedType = {
         FEED: 0,
         FOLDER: 1,
         STARRED: 2,
@@ -21,17 +19,17 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
     };
 
     // constants
-    $provide.constant('REFRESH_RATE', 60);  // seconds, how often feeds and folders shoudl be refreshed
+    $provide.constant('REFRESH_RATE', 60);  // seconds
     $provide.constant('ITEM_BATCH_SIZE', 50);  // how many items to autopage by
     $provide.constant('BASE_URL', OC.generateUrl('/apps/news'));
     $provide.constant('FEED_TYPE', feedType);
 
     // make sure that the CSRF header is only sent to the ownCloud domain
-    $provide.factory('CSRFInterceptor', function ($q, BASE_URL) {
+    $provide.factory('CSRFInterceptor', ($q, BASE_URL) => {
         return {
-            request: function (config) {
+            request: (config) => {
                 if (config.url.indexOf(BASE_URL) === 0) {
-                    config.headers.requesttoken = oc_requesttoken;
+                    config.headers.requesttoken = csrfToken;
                 }
 
                 return config || $q.when(config);
@@ -41,7 +39,7 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
     $httpProvider.interceptors.push('CSRFInterceptor');
 
     // routing
-    getResolve = function (type) {
+    let getResolve = (type) => {
         return {
             // request to items also returns feeds
             data: [
@@ -50,12 +48,9 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
                 '$q',
                 'BASE_URL',
                 'ITEM_BATCH_SIZE',
-                function ($http, $route, $q, BASE_URL, ITEM_BATCH_SIZE) {
+                ($http, $route, $q, BASE_URL, ITEM_BATCH_SIZE) => {
 
-                    var parameters,
-                        deferred;
-
-                    parameters = {
+                    let parameters = {
                         type: type,
                         limit: ITEM_BATCH_SIZE
                     };
@@ -64,13 +59,13 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
                         parameters.id = $route.current.params.id;
                     }
 
-                    deferred = $q.defer();
+                    let deferred = $q.defer();
 
                     $http({
                         url: BASE_URL + '/items',
                         method: 'GET',
                         params: parameters
-                    }).success(function (data) {
+                    }).success((data) => {
                         deferred.resolve(data);
                     });
 
diff --git a/js/app/Run.js b/js/app/Run.js
index c60150fbe..743f83c9b 100644
--- a/js/app/Run.js
+++ b/js/app/Run.js
@@ -7,36 +7,34 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @copyright Bernhard Posselt 2014
  */
-app.run(function ($rootScope, $location, $http, $q, $interval, Loading,
-                  ItemResource, FeedResource, FolderResource, Settings,
-                  Publisher, BASE_URL, FEED_TYPE, REFRESH_RATE) {
+app.run(($rootScope, $location, $http, $q, $interval, Loading, ItemResource,
+         FeedResource, FolderResource, Settings, Publisher, BASE_URL, FEED_TYPE,
+         REFRESH_RATE) => {
     'use strict';
 
+    console.log($location);
+
     // show Loading screen
     Loading.setLoading('global', true);
 
     // listen to keys in returned queries to automatically distribute the
     // incoming values to models
-    Publisher.subscribe(ItemResource).toChannels('items', 'newestItemId', 'starred');
+    Publisher.subscribe(ItemResource).toChannels('items', 'newestItemId',
+                                                 'starred');
     Publisher.subscribe(FolderResource).toChannels('folders');
     Publisher.subscribe(FeedResource).toChannels('feeds');
     Publisher.subscribe(Settings).toChannels('settings');
 
     // load feeds, settings and last read feed
-    var settingsDeferred,
-        activeFeedDeferred,
-        folderDeferred,
-        feedDeferred;
-
-    settingsDeferred = $q.defer();
-    $http.get(BASE_URL + '/settings').success(function (data) {
+    let settingsDeferred = $q.defer();
+    $http.get(BASE_URL + '/settings').success((data) => {
         Publisher.publishAll(data);
         settingsDeferred.resolve();
     });
 
-    activeFeedDeferred = $q.defer();
-    $http.get(BASE_URL + '/feeds/active').success(function (data) {
-        var url;
+    let activeFeedDeferred = $q.defer();
+    $http.get(BASE_URL + '/feeds/active').success((data) => {
+        let url;
 
         switch (data.type) {
 
@@ -60,14 +58,14 @@ app.run(function ($rootScope, $location, $http, $q, $interval, Loading,
         activeFeedDeferred.resolve();
     });
 
-    folderDeferred = $q.defer();
-    $http.get(BASE_URL + '/folders').success(function (data) {
+    let folderDeferred = $q.defer();
+    $http.get(BASE_URL + '/folders').success((data) => {
         Publisher.publishAll(data);
         folderDeferred.resolve();
     });
 
-    feedDeferred = $q.defer();
-    $http.get(BASE_URL + '/feeds').success(function (data) {
+    let feedDeferred = $q.defer();
+    $http.get(BASE_URL + '/feeds').success((data) => {
         Publisher.publishAll(data);
         feedDeferred.resolve();
     });
@@ -81,27 +79,27 @@ app.run(function ($rootScope, $location, $http, $q, $interval, Loading,
             folderDeferred.promise
         ]
     )
-        .then(function () {
+        .then(() => {
             Loading.setLoading('global', false);
         });
 
     // refresh feeds and folders
-    $interval(function () {
+    $interval(() => {
         $http.get(BASE_URL + '/feeds');
         $http.get(BASE_URL + '/folders');
     }, REFRESH_RATE * 1000);
 
 
-    $rootScope.$on('$routeChangeStart', function () {
+    $rootScope.$on('$routeChangeStart', () => {
         Loading.setLoading('content', true);
     });
 
-    $rootScope.$on('$routeChangeSuccess', function () {
+    $rootScope.$on('$routeChangeSuccess', () => {
         Loading.setLoading('content', false);
     });
 
     // in case of wrong id etc show all items
-    $rootScope.$on('$routeChangeError', function () {
+    $rootScope.$on('$routeChangeError', () => {
         $location.path('/items');
     });
 });
\ No newline at end of file