Loading spinner in dashboard gallery and newsfeed widgets

rxtur · rxtur · commit e4ba4e6600ba · 2015-11-21T18:52:06.000-06:00
diff --git a/BlogEngine/BlogEngine.NET/AppCode/Api/NewsFeedController.cs b/BlogEngine/BlogEngine.NET/AppCode/Api/NewsFeedController.cs
@@ -28,7 +28,10 @@ public List<SelectOption> Get()
                 if (cnt > 2) break;
             }
         }
-        catch (Exception) { }
+        catch (Exception ex)
+        {
+            BlogEngine.Core.Utils.Log("Dashboard news feed", ex);
+        }
         return items;
     }
 }
diff --git a/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardController.js b/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardController.js
@@ -142,22 +142,22 @@
             $scope.packages = [];
             angular.copy(data, $scope.packages);
             $scope.checkNewVersion();
-            if ($scope.packages.length > 0) {
-                $('#tr-gal-spinner').hide();
-            }
-            else { $('#div-gal-spinner').html(BlogAdmin.i18n.empty); }
+            $('#gal-spinner').hide();
         })
         .error(function () {
             toastr.error($rootScope.lbl.errorLoadingPackages);
+            $('#gal-spinner').hide();
         });
     }
     $scope.loadNewsFeed = function () {
         dataService.getItems('/api/newsfeed', { take: 5, skip: 0 })
         .success(function (data) {
             angular.copy(data, $scope.news);
+            $('#news-spinner').hide();
         })
         .error(function () {
             toastr.error($rootScope.lbl.errorLoadingPackages);
+            $('#news-spinner').hide();
         });
     }
     $scope.checkNewVersion = function () {
diff --git a/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html b/BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html
@@ -137,11 +137,10 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
                                 <span class="item-desc text-ellipsis">{{pkg.Description}}</span>
                             </a>
                         </li>
-                        <li ng-if="packages.length == 0" class="list-group-item item-spinner text-center">
-                            <div id="tr-gal-spinner">
-                                <div id="div-gal-spinner"><i class="fa fa-spinner fa-spin"></i></div>
-                            </div>
+                        <li id="gal-spinner" class="list-group-item text-center">
+                            <i class="fa fa-spinner fa-spin"></i>
                         </li>
+                        <li ng-if="packages.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
                     </ul>
                 </div>
                 <div class="panel panel-default dashboard-news dashboard-list">
@@ -152,6 +151,9 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
                         <li class="list-group-item" data-ng-repeat="n in news">
                             <a href="{{n.OptionValue}}.aspx" target="_blank">{{n.OptionName}}</a>
                         </li>
+                        <li id="news-spinner" class="list-group-item text-center">
+                            <i class="fa fa-spinner fa-spin"></i>
+                        </li>
                         <li ng-if="news.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
                     </ul>
                 </div>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,10 @@ public List<SelectOption> Get()`
`28`	`28`	`if (cnt > 2) break;`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- catch (Exception) { }`
	`31`	`+ catch (Exception ex)`
	`32`	`+ {`
	`33`	`+ BlogEngine.Core.Utils.Log("Dashboard news feed", ex);`
	`34`	`+ }`
`32`	`35`	`return items;`
`33`	`36`	`}`
`34`	`37`	`}`