fetch chatcounts on push; Don't long wait

Freegle · Aug 29, 2018 · 7e1d656 · 7e1d656
1 parent db36e61
commit 7e1d656
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/dev/webpack.appfd.config.js b/dev/webpack.appfd.config.js
@@ -69,7 +69,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/user_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('1.4.0, 28 August 2018'),
+      APP_VERSION: JSON.stringify('1.4.0, 29 August 2018'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),
@@ -100,13 +100,13 @@ module.exports = new Config().extend({
       new CopyWebpackPlugin([
           {from: 'http/xdk', to: 'xdk'}
       ]),
-    /*new webpack.optimize.UglifyJsPlugin({
+    new webpack.optimize.UglifyJsPlugin({
       sourceMap: true,
       minimize: true,
       compress: {
         warnings: false
       }
-    }),*/
+    }),
 
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({

diff --git a/http/js/iznik/base.js b/http/js/iznik/base.js
@@ -448,6 +448,7 @@ define([
         if ($(this).html() != chatcount) {
           if (chatcount > 0) {
             $(this).html(chatcount).show();
+            console.log("chatcount set to: " + chatcount);
           } else {
             $(this).empty().hide();
           }
@@ -457,6 +458,7 @@ define([
         if ($(this).html() != notifcount) {
           if (notifcount > 0) {
             $(this).html(notifcount);
+            console.log("notifcount set to: " + notifcount);
             $(this).css('visibility', 'visible');
           } else {
             $(this).empty();

diff --git a/http/js/iznik/main.js b/http/js/iznik/main.js
@@ -390,8 +390,8 @@ function mainOnAppStart() { // CC
                       var notifcount = parseInt(data.additionalData.notifcount);
                       console.log("Got chatcount " + chatcount + " notifcount " + notifcount);
                       if (!isNaN(chatcount) && !isNaN(notifcount)) {
-                        console.log("Setting counts");
                         Iznik.setHeaderCounts(chatcount, notifcount);
+                        Iznik.Session.chats.fetch();
                       }
                     }
 

diff --git a/http/js/iznik/models/chat/chat.js b/http/js/iznik/models/chat/chat.js
@@ -269,7 +269,7 @@ define([
 
             if (Iznik.Session) {
                 // Start our poll for new info.
-                self.wait();
+                // DON'T POLL ON MOBILE APP: self.wait();
 
                 // Start our fallback fetch for new info in case the poll doesn't tell us.
                 _.delay(_.bind(self.fallback, self), self.fallbackInterval);