Merge pull request #51 from sakshityagi/master

RJASeoud · web-flow · commit 1514307eaa5b · 2016-07-11T08:16:34.000-04:00
Corrected issue for changing feed url in CP doesnot refresh result in app : #125608181
diff --git a/widget/controllers/widget.feed.controller.js b/widget/controllers/widget.feed.controller.js
@@ -111,7 +111,6 @@
                 }
               }
               currentListLayout = WidgetFeed.data.design.itemListLayout;
-              currentFeedId = WidgetFeed.data.content.feedID;
             }
 
             if (!WidgetFeed.data.content.rssUrl) {
@@ -131,6 +130,8 @@
               WidgetFeed.loadMore();
             } else if (WidgetFeed.data.content && WidgetFeed.data.content.videoID)
               Location.goTo("#/video/" + WidgetFeed.data.content.videoID);
+
+            currentFeedId = WidgetFeed.data.content.feedID;
           }
         };
         DataStore.onUpdate().then(null, null, onUpdateCallback);

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`currentListLayout = WidgetFeed.data.design.itemListLayout;`
`114`		`- currentFeedId = WidgetFeed.data.content.feedID;`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`if (!WidgetFeed.data.content.rssUrl) {`
`@@ -131,6 +130,8 @@`
`131`	`130`	`WidgetFeed.loadMore();`
`132`	`131`	`} else if (WidgetFeed.data.content && WidgetFeed.data.content.videoID)`
`133`	`132`	`Location.goTo("#/video/" + WidgetFeed.data.content.videoID);`
	`133`	`+`
	`134`	`+ currentFeedId = WidgetFeed.data.content.feedID;`
`134`	`135`	`}`
`135`	`136`	`};`
`136`	`137`	`DataStore.onUpdate().then(null, null, onUpdateCallback);`