Mehrere Instanzen für Event/NewsCollectionView im split.html erlaubt. #…

…38
University-of-Potsdam-MM · Jan 22, 2016 · 324ce9a · 324ce9a
1 parent 836633f
commit 324ce9a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/split.html b/split.html
@@ -92,15 +92,31 @@
         <div class="row js_page jsb_ jsb_views/AdView" id="ad-view" data-jsb="">
         </div>
 
-        <div class="row js_page jsb_ jsb_views/NewsCollectionView" data-jsb="">
+        <div class="row js_page jsb_ jsb_views/NewsCollectionView" data-jsb="offset=0">
             <strong class="page-headline"><span class="js_news_headline">Neuigkeiten</span></strong>
             <table class="js_news table table-striped table-hover">
                 <tbody class="js_news_tbody">
                 </tbody>
             </table>
         </div>
 
-         <div class="row js_page jsb_ jsb_views/EventCollectionView" data-jsb="">
+        <div class="row js_page jsb_ jsb_views/NewsCollectionView" data-jsb="offset=1">
+            <strong class="page-headline"><span class="js_news_headline">Neuigkeiten</span></strong>
+            <table class="js_news table table-striped table-hover">
+                <tbody class="js_news_tbody">
+                </tbody>
+            </table>
+        </div>
+
+        <div class="row js_page jsb_ jsb_views/EventCollectionView" data-jsb="offset=0">
+            <strong class="page-headline"><span class="js_news_headline">Veranstaltungen</span></strong>
+            <table class="js_news table table-striped table-hover">
+                <tbody class="js_news_tbody">
+                </tbody>
+            </table>
+        </div>
+
+        <div class="row js_page jsb_ jsb_views/EventCollectionView" data-jsb="offset=1">
             <strong class="page-headline"><span class="js_news_headline">Veranstaltungen</span></strong>
             <table class="js_news table table-striped table-hover">
                 <tbody class="js_news_tbody">

diff --git a/static/js/models/BaseRssCollection.js b/static/js/models/BaseRssCollection.js
@@ -16,7 +16,7 @@ define('models/BaseRssCollection', ["Backbone", "jquery", "config", "moment", "m
                 } else {
                     var rawEvents = that.parseNewsResponse(xmlResponseString);
 
-                    that.reset(rawEvents.slice(0, that.getMaxResults()));
+                    that.reset(rawEvents);
                     that.trigger('update');
 
                     if (options.success) {

diff --git a/static/js/models/EventCollection.js b/static/js/models/EventCollection.js
@@ -5,7 +5,6 @@ define('models/EventCollection', ["Backbone", "jquery", "config", "moment", "mod
 
         initialize: function(models, attributes) {
             if (!config.get('events_rss_feed_url')) throw new Error('Missing config.events_rss_feed_url attribute for EventCollection');
-            if (!config.get('news_per_page')) throw new Error('Missing config.news_per_page attribute for EventCollection');
         },
 
         isValid: function(rssItem) {
@@ -20,10 +19,6 @@ define('models/EventCollection', ["Backbone", "jquery", "config", "moment", "mod
             return config.get('events_rss_feed_url');
         },
 
-        getMaxResults: function() {
-            return config.get('news_per_page');
-        },
-
         comparator: function(a, b) {
             if (a.get('updatedTimestamp').getTime() == b.get('updatedTimestamp').getTime()) {
                 return 0;

diff --git a/static/js/models/NewsCollection.js b/static/js/models/NewsCollection.js
@@ -5,7 +5,6 @@ define('models/NewsCollection', ["Backbone", "jquery", "config", "moment", "mode
 
         initialize: function(models, attributes) {
             if (!config.get('news_rss_feed_url')) throw new Error('Missing config.news_rss_feed_url attribute for NewsCollection');
-            if (!config.get('news_per_page')) throw new Error('Missing config.news_per_page attribute for NewsCollection');
         },
 
         isValid: function(rssItem) {
@@ -16,10 +15,6 @@ define('models/NewsCollection', ["Backbone", "jquery", "config", "moment", "mode
             return config.get('news_rss_feed_url');
         },
 
-        getMaxResults: function() {
-            return config.get('news_per_page');
-        },
-
         comparator: function(a, b) {
             if (a.get('updatedTimestamp').getTime() == b.get('updatedTimestamp').getTime()) {
                 return 0;

diff --git a/static/js/views/EventCollectionView.js b/static/js/views/EventCollectionView.js
@@ -3,9 +3,12 @@ define('views/EventCollectionView', ["Backbone", "config", "jquery", "views/Base
 
     var EventCollectionView = BaseView.extend({
 
-        initialize: function() {
+        initialize: function(options) {
             if (!config.get('news_per_page')) throw new Error('Missing config.news_per_page attribute for EventCollectionView');
 
+            this.options = options || {};
+            this.options.offset = parseInt(this.options.offset || "0", 10);
+
             this.listenTo(eventsCollection, "update", this.render);
             this.render();
         },
@@ -24,7 +27,7 @@ define('views/EventCollectionView', ["Backbone", "config", "jquery", "views/Base
                 newsTable.css('margin-bottom', '0');
             }
 
-            eventsCollection.forEach(function(event) {
+            eventsCollection.slice(this.options.offset, this.options.offset + config.get('news_per_page')).forEach(function(event) {
                 var view = new EventView({"model": event, "tagName": "tr"});
                 newsTableBody.append(view.render().el);
             });

diff --git a/static/js/views/NewsCollectionView.js b/static/js/views/NewsCollectionView.js
@@ -3,9 +3,12 @@ define('views/NewsCollectionView', ["Backbone", "config", "jquery", "views/BaseV
 
     var NewsCollectionView = BaseView.extend({
 
-        initialize: function() {
+        initialize: function(options) {
             if (!config.get('news_per_page')) throw new Error('Missing config.news_per_page attribute for EventCollectionView');
 
+            this.options = options || {};
+            this.options.offset = parseInt(this.options.offset || "0", 10);
+
             this.listenTo(newsCollection, "update", this.render);
             this.render();
         },
@@ -24,7 +27,7 @@ define('views/NewsCollectionView', ["Backbone", "config", "jquery", "views/BaseV
                 newsTable.css('margin-bottom', '0');
             }
 
-            newsCollection.slice(0, config.get('news_per_page')).forEach(function(event) {
+            newsCollection.slice(this.options.offset, this.options.offset + config.get('news_per_page')).forEach(function(event) {
                 var view = new NewsView({"model": event, "tagName": "tr"});
                 newsTableBody.append(view.render().el);
             });