Merge pull request #22 from vineetasharma/master

Fixed issue: #1554
BuildFire · Jan 29, 2016 · 46134e5 · 46134e5
2 parents 5fbaa6e + de7425c
commit 46134e5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/test/widget/controllers/widget.wall.controller.js b/test/widget/controllers/widget.wall.controller.js
@@ -11,6 +11,7 @@ describe('Unit : Controller - WidgetWallCtrl', function () {
             this.auth = jasmine.createSpyObj('auth', ['getCurrentUser', 'login','onLogin','onLogout']);
             this.navigation = jasmine.createSpyObj('navigation', ['get', 'onUpdate']);
             this.messaging = jasmine.createSpyObj('messaging', ['get', 'onUpdate','sendMessageToControl']);
+            this.getContext=function(){};
 
         });
     }));

diff --git a/widget/app.js b/widget/app.js
@@ -82,7 +82,7 @@
                     $rootScope.$digest();
                 }
                 else
-                    Buildfire.navigation.navigateHome();
+                    Buildfire.navigation._goBackOne();
             }
         }])
         .directive('handlePhoneSubmit', function () {

diff --git a/widget/app.service.js b/widget/app.service.js
@@ -415,6 +415,7 @@
                 if (_this.busy) {
                     return;
                 }
+                _this.busy = true;
                 if (_this.parentThreadId && _this.socialAppId) {
                     console.log('Inside if---------------------------------------this', _this);
                     getPosts();
@@ -452,7 +453,6 @@
                 }
                 function getPosts(){
                     console.log('getPosts called');
-                    _this.busy = true;
                     var postDataObject = {};
                     postDataObject.id = '1';
                     postDataObject.method = 'thread/findByPage';

diff --git a/widget/controllers/widget.wall.controller.js b/widget/controllers/widget.wall.controller.js
@@ -25,7 +25,7 @@
             WidgetWall.SocialItems = SocialItems.getInstance();
             var masterItems = WidgetWall.SocialItems && WidgetWall.SocialItems.items && WidgetWall.SocialItems.items.slice(0,WidgetWall.SocialItems.items.length);
             console.log('SocialItems------------------Wall Controller-------------------- this---------------333333333333----', WidgetWall.SocialItems);
-            //SocialItems.posts();
+            WidgetWall.SocialItems.posts();
             WidgetWall.SocialItems.loggedInUserDetails();
 
             WidgetWall.createPost = function ($event) {

diff --git a/widget/index.html b/widget/index.html
@@ -47,7 +47,7 @@
                         <a ng-click="WidgetWall.followUnfollow(WidgetWall.getFollowingStatus())" >{{WidgetWall.getFollowingStatus()}}</a>
                     </div>
                     <div style="overflow-x:hidden; width:100%; overflow-y: auto;height: calc(100% - 48px);" class="infinite-scroll-parent">
-                        <div  id="top" infinite-scroll-distance="0"
+                        <div style="height: 20px;" id="top" infinite-scroll-distance="0"
                              data-infinite-container=".infinite-scroll-parent"
                              infinite-scroll="WidgetWall.SocialItems.posts()"
                              infinite-scroll-disabled="WidgetWall.SocialItems.busy">