From 2a9d397089abdfc3c8cb3e43092b243c1813afb9 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Mar 03 2017 17:29:14 +0000
Subject: Make the JS setup_feed function independant from template tags


This will allow moving it to an external JS file.

---

diff --git a/hubs/models.py b/hubs/models.py
index 2b7b6d5..f476bb6 100644
--- a/hubs/models.py
+++ b/hubs/models.py
@@ -274,11 +274,6 @@ class Hub(BASE):
              if w.plugin in hubs.widgets.registry and not w.left],
             key=lambda w: w.index)
 
-    @property
-    def widgets_idx(self):
-        """Returns the list of indices for this hub's widgets."""
-        return [w.idx for w in self.widgets]
-
     def __json__(self):
         return {
             'name': self.name,
diff --git a/hubs/templates/stream.html b/hubs/templates/stream.html
index f9e00c5..e33c301 100644
--- a/hubs/templates/stream.html
+++ b/hubs/templates/stream.html
@@ -73,55 +73,56 @@
 <script type="text/javascript"
   src ="{{url_for('static', filename='js/build/Feed.js')}}"></script>
 <script>
+  function setup_feeds(actions, saved, saveUrl) {
+    var streamFeed = React.createElement(Feed, {
+      matches: actions,
+      options: {
+        saveUrl: saveUrl,
+        messageLimit: 100
+      }
+    });
+    /* Right now, stream and actions are the same.
+     * Once, Mentions is implemented, then each will be its own
+     */
+    ReactDOM.render(streamFeed, document.getElementById('streamFeed'));
+    ReactDOM.render(streamFeed, document.getElementById('actionsFeed'));
+  
+    var savedFeed = React.createElement(Feed, {
+      matches: saved,
+      url: false,
+      options: {
+        messageLimit: 100,
+        delete: true,
+        saveUrl: saveUrl
+      }
+    });
+    ReactDOM.render(savedFeed, document.getElementById('savedFeed'));
+    $('a[href="#saved"]').on('shown.bs.tab', function(){
+      $.get(saveUrl).done(function(resp) {
+        if (resp.length != saved.length) {
+          ReactDOM.unmountComponentAtNode(document.getElementById('savedFeed'));
+          var savedFeed = React.createElement(Feed, {
+            matches: resp,
+            url: false,
+            options: {
+              messageLimit: 100,
+              delete: true,
+              saveUrl: saveUrl
+            }
+          });
+          ReactDOM.render(savedFeed, document.getElementById('savedFeed'));
+        }
+      });
+    });
+  }
 
- function setup_feeds() {
-   var actions = {{actions|safe}};
-
-   var streamFeed = React.createElement(Feed, {
-     matches: actions,
-     options: {
-       saveUrl: '/{{hub.name}}/notifications/',
-       messageLimit: 100
-     }
-   });
-   /* Right now, stream and actions are the same.
-    * Once, Mentions is implemented, then each will be its own
-    */
-   ReactDOM.render(streamFeed, document.getElementById('streamFeed'));
-   ReactDOM.render(streamFeed, document.getElementById('actionsFeed'));
-
-   var savedFeed = React.createElement(Feed, {
-     matches: {{saved|safe}},
-     url: false,
-     options: {
-       messageLimit: 100,
-       delete: true,
-       saveUrl: '/{{hub.name}}/notifications/'
-     }
-   });
-   ReactDOM.render(savedFeed, document.getElementById('savedFeed'));
-   $('a[href="#saved"]').on('shown.bs.tab', function(){
-     $.get('/{{hub.name}}/notifications/').done(function(resp) {
-       var saved = {{saved|safe}};
-       if (resp.length != saved.length) {
-         ReactDOM.unmountComponentAtNode(document.getElementById('savedFeed'));
-         var savedFeed = React.createElement(Feed, {
-           matches: resp,
-           url: false,
-           options: {
-             messageLimit: 100,
-             delete: true,
-             saveUrl: '/{{hub.name}}/notifications/'
-           }
-         });
-         ReactDOM.render(savedFeed, document.getElementById('savedFeed'));
-       }
-     });
-   });
- }
  $(function() {
    setup_widgets();
-   setup_feeds();
+   setup_feeds(
+       {{ actions|safe }},
+       {{ saved|safe }},
+       {{ url_for("notifications", user=hub.name)|tojson }}
+   );
  });
 </script>
 {% endblock %}