From: Chip Black Date: Wed, 6 Jun 2012 20:51:21 +0000 (-0700) Subject: Clear feed status when reading feed X-Git-Tag: v1.7~2^2~10 X-Git-Url: http://git.bytex64.net/?a=commitdiff_plain;h=6eee0074c07ce85359975621ff832943d320493a;p=blerg.git Clear feed status when reading feed --- diff --git a/www/jssrc/blerg/Blerg.js b/www/jssrc/blerg/Blerg.js index 9285d2b..827dc06 100644 --- a/www/jssrc/blerg/Blerg.js +++ b/www/jssrc/blerg/Blerg.js @@ -11,6 +11,7 @@ enyo.kind({ onPostVisibility: "postVisibilityUpdate", onReload: "sendReload", onShowChangePassword: "showChangePassword", + onClearFeedStatus: "clearFeedStatus" }, components: [ {classes: "blerg-header", components: [ @@ -96,5 +97,8 @@ enyo.kind({ }, showChangePassword: function() { this.$.passwdDialog.show(); + }, + clearFeedStatus: function() { + this.$.controls.waterfall('onClearFeedStatus'); } }); diff --git a/www/jssrc/blerg/Controls.js b/www/jssrc/blerg/Controls.js index 165b100..529df1e 100644 --- a/www/jssrc/blerg/Controls.js +++ b/www/jssrc/blerg/Controls.js @@ -10,7 +10,8 @@ enyo.kind({ handlers: { onLogin: "login", onLogout: "logout", - onPostVisibility: "postVisibilityUpdate" + onPostVisibility: "postVisibilityUpdate", + onClearFeedStatus: "clearFeedStatus" }, components: [ {name: "loggedOutControls", components: [ @@ -82,9 +83,9 @@ enyo.kind({ this.$.userlink.setContent('@' + inEvent.username); this.username = inEvent.username; - this.$.api.getFeedInfo(); + this.updateFeedInfo(); this.feedStatusUpdateInterval = setInterval(function() { - this.$.api.getFeedInfo(); + this.updateFeedInfo(); }.bind(this), 900000); }, logout: function(inSender, inEvent) { @@ -102,6 +103,9 @@ enyo.kind({ this.postShowing = inEvent.showing; this.$.spewButton.addRemoveClass('active', inEvent.showing); }, + updateFeedInfo: function() { + this.$.api.getFeedInfo(); + }, gotFeedInfo: function(inSender, inEvent) { this.$.feedButton.addRemoveClass('new', inEvent.new > 0); if (inEvent.new > 0) { @@ -117,5 +121,8 @@ enyo.kind({ feedClicked: function() { window.location.href = '/#/feed'; this.bubble('onNavigate'); + }, + clearFeedStatus: function() { + this.gotFeedInfo(this, {new: 0}); } }); diff --git a/www/jssrc/blerg/Feed.js b/www/jssrc/blerg/Feed.js index 63ef7fb..a07d7e5 100644 --- a/www/jssrc/blerg/Feed.js +++ b/www/jssrc/blerg/Feed.js @@ -28,5 +28,6 @@ enyo.kind({ }, itemsLoaded: function(inSender, inEvent) { this.addItems(inEvent.entries); + this.bubble('onClearFeedStatus'); } });