Logik implementiert, dass die Werbung leer geschalten wird, wenn zur …

…nächsten Seite gewechselt wurde. #45
University-of-Potsdam-MM · Jan 17, 2016 · 9b72374 · 9b72374
1 parent 8b4588c
commit 9b72374
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -85,7 +85,7 @@ <h2>Freie Räume</h2>
 
     <div class="container current-content">
 
-        <div class="row js_page jsb_ jsb_views/AdView" data-jsb="">
+        <div class="row js_page jsb_ jsb_views/AdView" id="ad-view" data-jsb="">
         </div>
 
         <div class="row js_page jsb_ jsb_views/TweetsView tweets" data-jsb="">

diff --git a/split.html b/split.html
@@ -89,7 +89,7 @@
 
     <div class="container current-content">
 
-        <div class="row js_page jsb_ jsb_views/AdView" data-jsb="">
+        <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="">

diff --git a/static/js/views/AdView.js b/static/js/views/AdView.js
@@ -11,17 +11,15 @@ define('views/AdView', ["jquery", "config", "views/BaseView"], function ($, conf
 
             if (config.get('ads').length == 0) {
                 $(this.el).addClass('is-hidden');
-            } else {
-                this.render();
-
-                setInterval(function() {
-                    that.currentIndex++;
-                    if (that.currentIndex >= config.get('ads').length) {
-                        that.currentIndex = 0;
-                    }
-                    that.render();
-                }, config.get('ads_update_frequency') * 1000);
             }
+
+            jsb.whenFired('PageSwitcherView::SHOW_PAGE', function(values) {
+                if (values.id === 'ad-view') {
+                    that.render();
+                } else {
+                    $(that.el).empty();
+                }
+            });
         },
 
         render: function() {

diff --git a/static/js/views/PageSwitcherView.js b/static/js/views/PageSwitcherView.js
@@ -15,7 +15,7 @@ define('views/PageSwitcherView', ['jquery', "config", "moment", "views/BaseView"
             $('.js_app_title').text('Campus ' + config.get('campus') + ', Haus ' + config.get('house'));
             document.title = $('.js_app_title').text();
 
-            $(this.pages[this.current_page]).show();
+            this.showCurrentPage();
 
             if (config.get('force_page') === null) {
                 setInterval(function() {
@@ -24,6 +24,16 @@ define('views/PageSwitcherView', ['jquery', "config", "moment", "views/BaseView"
             }
         },
 
+        showCurrentPage: function() {
+            $(this.pages[this.current_page]).show();
+
+            if ($(this.pages[this.current_page]).attr('id')) {
+                jsb.fireEvent('PageSwitcherView::SHOW_PAGE', {"id": $(this.pages[this.current_page]).attr('id')});
+            } else {
+                jsb.fireEvent('PageSwitcherView::SHOW_PAGE', {});
+            }
+        },
+
         showNextPage: function() {
             this.new_page_in--;
             if (this.new_page_in == -1)
@@ -45,7 +55,7 @@ define('views/PageSwitcherView', ['jquery', "config", "moment", "views/BaseView"
 
                 console.log('NEXT PAGE after', initial_current_page, 'is now', this.current_page);
 
-                $(this.pages[this.current_page]).show();
+                this.showCurrentPage();
 
                 this.new_page_in = this.max_progress;
             }