精简

src/Masuit.MyBlogs.Core/Views/Dashboard/Index.cshtml

@@ -89,7 +89,6 @@
             </div>
         </section>
     </section>
-    <div data-ng-include="'/ng-views/template/loading.html'"></div>
 </body>
 </html>
 <mini-profiler max-traces="5" />

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/analysis.js

@@ -2,7 +2,6 @@
 	function($scope, $http, NgTableParams, $timeout) {
 		window.hub.stop();
 		var self = this;
-		$scope.loading();
 		$scope.query = "";
 		$scope.currentPage = 1;
 		var _timeout;
@@ -44,7 +43,6 @@
 			}, 1000);
 		}
 		this.GetPageData = function(page, size) {
-			$scope.loading();
 			$http.post("/search/SearchList", {
 				page,
 				size,
@@ -68,7 +66,6 @@
 						time:4
 					});
 				}
-				$scope.loadingDone();
 			});
 		};
 		self.del = function(row) {

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/comment.js

@@ -1,7 +1,6 @@
 myApp.controller("comment", ["$scope", "$http", "NgTableParams", function ($scope, $http, NgTableParams) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.paginationConf = {
 		currentPage: $scope.currentPage ? $scope.currentPage : 1,
 		//totalItems: $scope.total,
@@ -14,7 +13,6 @@
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		$http.post("/comment/GetPendingComments", {
 			page,
 			size
@@ -28,7 +26,6 @@
 					filterDelay: 0,
 					dataset: res.data.Data
 				});
-			$scope.loadingDone();
 		});
 	};
 	self.del = function (row) {
@@ -75,6 +72,4 @@
 			self.GetPageData($scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage);
 		});
 	}
-	$scope.loadingDone();
-
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/dashboard.js

@@ -1,6 +1,5 @@
 myApp.controller("dashboard", ["$scope", "$http", "$timeout", "$location", function ($scope, $http, $timeout, $location) {
-	$scope.loading();
-	$scope.distinct = true;
+    $scope.distinct = true;
 	var loadsdata = [];
 	var netdata = [];
 	var iodata = [];
@@ -106,7 +105,6 @@
 					text:'服务请求失败！',
 					time:4
 				});
-				$scope.loadingDone();
 			});
         }, function() {
 		}).catch(swal.noop);
@@ -415,7 +413,6 @@
 				}
 			}]
 		});
-		$scope.loadingDone();
 	});
 
 	var gaugeOptions = {

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/donate.js

@@ -2,7 +2,6 @@
 	window.hub.stop();
 	var self = this;
 	var source = [];
-	$scope.loading();
 	$scope.paginationConf = {
 		currentPage: 1,
 		itemsPerPage: 10,
@@ -14,7 +13,6 @@
 		}
 	};
 	this.GetPageData = function(page, size) {
-		$scope.loading();
 		$http.post("/donate/getpagedata", {
 			page,
 			size
@@ -28,7 +26,6 @@
 				dataset: res.data.Data
 			});
 			source = angular.copy(res.data.Data);
-			$scope.loadingDone();
 		});
 	};
 	self.del = function(row) {
@@ -127,5 +124,4 @@
 			}
 		});
 	}
-	$scope.loadingDone();
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/links.js

@@ -2,16 +2,13 @@
 	window.hub.stop();
 	var self = this;
 	var source = [];
-	$scope.loading();
 	this.load = function() {
-		$scope.loading();
 		$http.post("/links/get", null).then(function(res) {
 			self.tableParams = new NgTableParams({}, {
 				filterDelay: 0,
 				dataset: res.data.Data
 			});
 			source = res.data.Data;
-			$scope.loadingDone();
 		});
 	};
 	this.load();

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/loginrecord.js

@@ -1,7 +1,6 @@
 myApp.controller("loginrecord", ["$scope", "$http", "NgTableParams", function($scope, $http, NgTableParams) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$http.post("/login/getrecent/"+$scope.user.Id).then(function(res) {
 		self.tableParams = new NgTableParams({
 			count: 15
@@ -9,6 +8,5 @@
 			filterDelay: 0,
 			dataset: res.data.Data
 		});
-		$scope.loadingDone();
 	});
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/main.js

@@ -184,22 +184,6 @@
 		}
 	}
 
-	//两个全局加载动画
-	$scope.isloading = false;
-	$scope.loading = function() {
-		if($scope.isloading) {
-			return;
-		}
-		$scope.isloading = true;
-		let r = new Date().getMilliseconds();
-		$(".loading" + (r % 2 + 1)).show();
-	}
-
-	$scope.loadingDone = function() {
-		$scope.isloading = false;
-		$(".loading1").hide();
-		$(".loading2").hide();
-	}
 	$http.post("/passport/getuserinfo", null).then(function(res) {
 		if(res.data.Success) {
 			$scope.user = res.data.Data;
@@ -207,11 +191,9 @@
 	});
 
 	$scope.request = function(url, data, success, error) {
-		$scope.loading();
 		$http.post(url, data, {
 			'Content-Type':'application/x-www-form-urlencoded'
 		}).then(function(res) {
-			$scope.loadingDone();
 			if(res.data.Success && res.data.IsLogin) {
 				success(res.data);
 			} else {
@@ -240,7 +222,6 @@
 				    time:4
 			    });
             }
-			$scope.loadingDone();
 		});
 	}
 
@@ -396,7 +377,6 @@
 		}).catch(swal.noop);
 	}
 	$scope.submit = function() {
-		$scope.loading();
         var form = new FormData(document.getElementById("fileform"));
 		$http({
             url: "upload",
@@ -413,14 +393,11 @@
 			}).then(function(res2) {
 				swal("头像修改成功", "", "success");
 				layer.closeAll();
-				$scope.loadingDone();
 			}, function(error) {
 				swal("头像修改失败", "请求失败，错误码：" + error.status, "error");
-				$scope.loadingDone();
 			});
         }, function(response) {
 			swal("头像修改失败", "", "error");
-			$scope.loadingDone();
         });
     };
 	

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/menu.js

@@ -1,6 +1,5 @@
 myApp.controller("menu", ["$scope", "$http", "$timeout", function($scope, $http, $timeout) {
 	window.hub.stop();
-	$scope.loading();
 	$scope.menu = {};
 	$scope.init = function() {
 		$scope.request("/menu/getmenus", null, function(data) {
@@ -307,12 +306,10 @@
 		}
 	}
 	$scope.uploadImage = function() {
-		$scope.loading();
         $("#uploadform").ajaxSubmit({
 			url: "/Upload",
 			type: "post",
 			success: function(data) {
-				$scope.loadingDone();
 				document.getElementById("uploadform").reset();
 				$scope.$apply(function () {
 			     　$scope.allowUpload=false;

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/merge.js

@@ -1,7 +1,6 @@
 myApp.controller("mergelist", ["$scope", "$http", "NgTableParams", "$timeout", function ($scope, $http, NgTableParams, $timeout) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.kw = "";
 	$scope.orderby = 1;
 	$scope.paginationConf = {
@@ -15,7 +14,6 @@
 		}
 	};
 	this.GetPageData = function(page, size) {
-		$scope.loading();
 		$http.get("/merge?page="+page+"&size="+size+"&kw="+$scope.kw).then(function(res) {
 			$scope.paginationConf.currentPage = page;
 			$scope.paginationConf.totalItems = res.data.TotalCount;
@@ -26,7 +24,6 @@
 				filterDelay: 0,
 				dataset: res.data.Data
 			});
-			$scope.loadingDone();
 		});
 	};
 	self.pass = function(row) {
@@ -124,18 +121,15 @@
 			_timeout = null;
 		}, 500);
 	}
-	$scope.loadingDone();
 }]);
 myApp.controller("mergecompare", ["$scope", "$http", "$timeout","$location", function ($scope, $http, $timeout,$location) {
 	window.hub.stop();
 	clearInterval(window.interval);
-	$scope.loading();
 	$scope.id = $location.search()['id'];
 	$scope.get("/merge/compare/"+$scope.id, function(res) {
 		var data = res.Data;
         $scope.old=data.old;
         $scope.newer=data.newer;
-	    $scope.loadingDone();
 	});
     
 	$scope.pass = function() {
@@ -222,21 +216,18 @@ myApp.controller("mergecompare", ["$scope", "$http", "$timeout","$location", fun
 myApp.controller("mergeedit", ["$scope", "$http", "$timeout","$location", function ($scope, $http, $timeout,$location) {
 	window.hub.stop();
 	clearInterval(window.interval);
-	$scope.loading();
 	$scope.id = $location.search()['id'];
 	$scope.get("/merge/"+$scope.id, function(res) {
 		$scope.post= res.Data;
-	    $scope.loadingDone();
+	    
 	});
     $scope.merge= function() {
-	    $scope.loading();
         $scope.request("/merge",$scope.post, function(res) {
 		    window.notie.alert({
 				type: 1,
 				text: res.Message,
 				time: 4
 			});
-	        $scope.loadingDone();
             window.location.href = "#/merge/list";
 	    });
     }

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/misc.js

@@ -1,7 +1,6 @@
 myApp.controller("miscAdd", ["$scope", "$http", "$location", "$timeout", function ($scope, $http, $location, $timeout) {
 	window.hub.stop();
 	$scope.misc = {};
-	$scope.loading();
 	$scope.misc.Id = $location.search()['id'];
 	if ($scope.misc.Id) {
 		$scope.request("/misc/get", { id: $scope.misc.Id }, function (res) {
@@ -10,7 +9,6 @@
 	}
 	//异步提交表单开始
 	$scope.submit = function (misc) {
-		$scope.loading();
 		var url = "/misc/write";
 		if (misc.Id) {
 			url = "/misc/edit";
@@ -22,7 +20,6 @@
 		}
 		$http.post(url, misc).then(function (res) {
 			var data = res.data;
-			$scope.loadingDone();
 			if (data.Success) {
 				window.notie.alert({
 					type: 1,
@@ -41,12 +38,10 @@
 		});
 	}
 	//异步提交表单结束
-	$scope.loadingDone();
 }]);
 myApp.controller("miscList", ["$scope", "$http", "NgTableParams", function ($scope, $http, NgTableParams) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.paginationConf = {
 		currentPage: $scope.currentPage ? $scope.currentPage : 1,
 		//totalItems: $scope.total,
@@ -59,7 +54,6 @@ myApp.controller("miscList", ["$scope", "$http", "NgTableParams", function ($sco
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		$http.post("/misc/getpagedata", {
 			page,
 			size
@@ -73,7 +67,6 @@ myApp.controller("miscList", ["$scope", "$http", "NgTableParams", function ($sco
 					filterDelay: 0,
 					dataset: res.data.Data
 				});
-			$scope.loadingDone();
 		});
 	};
 	self.del = function (row) {
@@ -109,6 +102,4 @@ myApp.controller("miscList", ["$scope", "$http", "NgTableParams", function ($sco
 		}, function () {
 		}).catch(swal.noop);
 	}
-	$scope.loadingDone();
-
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/msg.js

@@ -1,7 +1,6 @@
 myApp.controller("msg", ["$scope", "$http", "NgTableParams", "$timeout", function ($scope, $http, NgTableParams, $timeout) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.currentPage = 1;
 	$scope.paginationConf = {
 		currentPage: $scope.currentPage ||1,
@@ -14,7 +13,6 @@
 		}
 	};
 	this.GetPageData = function(page, size) {
-		$scope.loading();
 		$http.post("/msg/GetPendingMsgs", {
 			page,
 			size
@@ -27,7 +25,6 @@
 				filterDelay: 0,
 				dataset: res.data.Data
 			});
-			$scope.loadingDone();
 		});
 	};
 	self.del = function(row) {
@@ -74,13 +71,10 @@
 			self.GetPageData($scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage);
 		});
 	}
-	$scope.loadingDone();
-
 }]);
 myApp.controller("msgs", ["$scope", "$http", "$timeout", function ($scope, $http, $timeout) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.currentPage = 1;
 	$scope.paginationConf = {
 		currentPage: $scope.currentPage || 1,
@@ -93,14 +87,12 @@ myApp.controller("msgs", ["$scope", "$http", "$timeout", function ($scope, $http
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		$http.post("/msg/GetInternalMsgs", {
 			page,
 			size
 		}).then(function (res) {
 			$scope.paginationConf.totalItems = res.data.TotalCount;
 			$scope.Messages = res.data.Data;
-			$scope.loadingDone();
 		});
 	};
 	$scope.MarkRead= function() {

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/notice.js

@@ -1,7 +1,6 @@
 myApp.controller("noticeAdd", ["$scope", "$http", "$location", "$timeout", function ($scope, $http, $location, $timeout) {
 	window.hub.stop();
 	$scope.notice = {};
-	$scope.loading();
 	$scope.notice.Id = $location.search()['id']||0;
 	if ($scope.notice.Id) {
 		$scope.request("/notice/get", { id: $scope.notice.Id }, function (res) {
@@ -10,14 +9,12 @@
 	}
 	//异步提交表单开始
 	$scope.submit = function (notice) {
-		$scope.loading();
 		var url = "/notice/write";
 		if (notice.Id) {
 			url = "/notice/edit";
 		}
 		$http.post(url, notice).then(function (res) {
 			var data = res.data;
-			$scope.loadingDone();
 			if (data.Success) {
 				window.notie.alert({
 					type: 1,
@@ -36,12 +33,10 @@
 		});
 	}
 	//异步提交表单结束
-	$scope.loadingDone();
 }]);
 myApp.controller("noticeList", ["$scope", "$http", "NgTableParams", function ($scope, $http, NgTableParams) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
 	$scope.paginationConf = {
 		currentPage: 1,
 		//totalItems: $scope.total,
@@ -54,7 +49,6 @@ myApp.controller("noticeList", ["$scope", "$http", "NgTableParams", function ($s
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		$http.post("/notice/getpagedata", {
 			page,
 			size
@@ -67,7 +61,6 @@ myApp.controller("noticeList", ["$scope", "$http", "NgTableParams", function ($s
 					filterDelay: 0,
 					dataset: res.data.Data
 				});
-			$scope.loadingDone();
 		});
 	};
 	self.del = function (row) {
@@ -103,6 +96,4 @@ myApp.controller("noticeList", ["$scope", "$http", "NgTableParams", function ($s
 		}, function () {
 		}).catch(swal.noop);
 	}
-	$scope.loadingDone();
-
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/partner.js

@@ -3,7 +3,6 @@
 	var self = this;
 	$scope.isAdd = true;
 	$scope.allowUpload=false;
-	$scope.loading();
 	$scope.partner = {};
 	$scope.kw = "";
 	$scope.paginationConf = {
@@ -17,7 +16,6 @@
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		$http.post("/partner/getpagedata", {
 			page,
 			size,
@@ -32,7 +30,6 @@
 				dataset: res.data.Data
 			});
 			self.data = res.data.Data;
-			$scope.loadingDone();
 		});
 	}
     $('.ui.dropdown.types').dropdown({
@@ -41,9 +38,7 @@
 		}
 	});
     $scope.getCategory = function () {
-		$scope.loading();
 		$http.post("/category/getcategories", null).then(function (res) {
-			$scope.loadingDone();
 			var data = res.data;
 			if (data.Success) {
 				$scope.cat = data.Data;
@@ -79,7 +74,6 @@
 			cancelButtonText: '取消'
 		}).then(function(isConfirm) {
 			if (isConfirm) {
-				$scope.loading();
 				$scope.request("/partner/delete/"+partner.Id, null, function(data) {
 					swal(data.Message, null, 'success');
 			        self.GetPageData($scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage);
@@ -153,12 +147,10 @@
 		});
 	}
 	$scope.uploadImage = function(field) {
-		$scope.loading();
         $("#uploadform").ajaxSubmit({
 			url: "/Upload",
 			type: "post",
 			success: function(data) {
-				$scope.loadingDone();
 				document.getElementById("uploadform").reset();
 				$scope.$apply(function () {
 					$scope.partner[field] = data.Data;

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/post.js

@@ -1,6 +1,5 @@
 myApp.controller("postlist", ["$scope", "$http", "NgTableParams", "$timeout", function ($scope, $http, NgTableParams, $timeout) {
 	window.hub.stop();
-	$scope.loading();
 	var self = this;
 	self.stats = [];
 	self.data = {};
@@ -28,7 +27,6 @@
 	});
 
 	$http.post("/category/getcategories", null).then(function (res) {
-		$scope.loadingDone();
 		var data = res.data;
 		if (data.Success) {
 			$scope.cat = data.Data;
@@ -62,7 +60,6 @@
 	});
 
 	this.GetPageData = function (page, size) {
-		$scope.loading();
 		var params={ page, size, kw: $scope.kw, orderby:$scope.orderby, cid:$scope.CategoryId };
 		$http.post("/post/getpagedata", params).then(function(res) {
 			$scope.paginationConf.totalItems = res.data.TotalCount;
@@ -79,7 +76,7 @@
 				});
 			});
 			self.stats = Enumerable.From(self.stats).Distinct().ToArray();
-			$scope.loadingDone();
+			
 			localStorage.setItem("postlist-params",JSON.stringify(params));
 		});
 	}
@@ -190,7 +187,7 @@
 			_timeout = null;
 		}, 500);
 	}
-	$scope.loadingDone();
+	
     $scope.toggleDisableComment= function(row) {
         $scope.request("/post/DisableComment", {
 			id: row.Id
@@ -226,13 +223,13 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
 		Seminars: "",
 		Keyword:""
 	};
-	$scope.loading();
+	
 	$scope.post.Author = $scope.user.NickName || $scope.user.Username;
 	$scope.post.Email = $scope.user.Email;
 	$scope.getCategory = function () {
-		$scope.loading();
+		
 		$http.post("/category/getcategories", null).then(function (res) {
-			$scope.loadingDone();
+			
 			var data = res.data;
 			if (data.Success) {
 				$scope.cat = data.Data;
@@ -289,12 +286,12 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
 	});
 	//上传Word文档
 	$scope.upload = function() {
-		$scope.loading();
+		
 		$("#docform").ajaxSubmit({
 			url: "/Upload/UploadWord",
 			type: "post",
 			success: function(data) {
-				$scope.loadingDone();
+				
 				console.log(data);
 				if (data.Success) {
 					window.notie.alert({
@@ -333,7 +330,7 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
 	}
 	//异步提交表单开始
 	$scope.submit = function(post) {
-		$scope.loading();
+		
 		if (!post.Label) {
 			post.Label = null;
 		}
@@ -343,12 +340,12 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
 				text: '文章标题必须在2到128个字符以内！',
 				time: 4
 			});
-			$scope.loadingDone();
+			
 			return;
 		}
 		$http.post("/Post/write", post).then(function(res) {
 			var data = res.data;
-			$scope.loadingDone();
+			
 			if (data.Success) {
 				window.notie.alert({
 					type: 1,
@@ -423,7 +420,7 @@ myApp.controller("writeblog", ["$scope", "$http", "$timeout", function ($scope,
 myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", function ($scope, $http, $location, $timeout) {
 	window.hub.stop();
 	$scope.id = $location.search()['id'];
-	$scope.loading();
+	
 	$scope.reserve = true;
 	$scope.request("/post/get", {
 		id: $scope.id
@@ -472,9 +469,9 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 		$('.ui.dropdown.keyword').dropdown('set selected', $scope.post.Keyword.split(','));
 	});
 	$scope.getCategory = function () {
-		$scope.loading();
+		
 		$http.post("/category/getcategories", null).then(function (res) {
-			$scope.loadingDone();
+			
 			var data = res.data;
 			if (data.Success) {
 				$scope.cat = data.Data;
@@ -501,12 +498,12 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 	}
 	//上传Word文档
 	$scope.upload = function () {
-		$scope.loading();
+		
 		$("#docform").ajaxSubmit({
 			url: "/Upload/UploadWord",
 			type: "post",
 			success: function (data) {
-				$scope.loadingDone();
+				
 				console.log(data);
 				if (data.Success) {
 					window.notie.alert({
@@ -545,7 +542,7 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 
 	//异步提交表单开始
 	$scope.submit = function (post) {
-		$scope.loading();
+		
 		if (!post.Label) {
 			post.Label = null;
 		}
@@ -555,7 +552,7 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 				text: '文章标题必须在2到128个字符以内！',
 				time: 4
 			});
-			$scope.loadingDone();
+			
 			return;
 		}
 		if (post.Author.trim().length <= 0 || post.Author.trim().length > 20) {
@@ -564,7 +561,7 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 				text: '再怎么你也应该留个合理的名字吧，非主流的我可不喜欢！',
 				time: 4
 			});
-			$scope.loadingDone();
+			
 			return;
 		}
 		if (!/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
@@ -574,7 +571,7 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 				text: '请输入正确的邮箱格式！',
 				time: 4
 			});
-			$scope.loadingDone();
+			
 			return;
 		}
 		if (post.Content.length < 200 || post.Content.length > 1000000) {
@@ -583,13 +580,13 @@ myApp.controller("postedit", ["$scope", "$http", "$location", "$timeout", functi
 				text: '文章内容过短或者超长的，我都认为你是在制造垃圾！',
 				time: 4
 			});
-			$scope.loadingDone();
+			
 			return;
 		}
 		post.reserve = $scope.reserve;
 		$http.post("/Post/edit", post).then(function (res) {
 			var data = res.data;
-			$scope.loadingDone();
+			
 			if (data.Success) {
 				window.notie.alert({
 					type: 1,
@@ -790,7 +787,7 @@ myApp.controller("category", ["$scope", "$http", "NgTableParams", function ($sco
 myApp.controller("postpending", ["$scope", "$http", "NgTableParams", "$timeout", function ($scope, $http, NgTableParams, $timeout) {
 	window.hub.stop();
 	var self = this;
-	$scope.loading();
+	
 	$scope.kw = "";
 	$scope.orderby = 1;
 	$scope.paginationConf = {
@@ -805,7 +802,7 @@ myApp.controller("postpending", ["$scope", "$http", "NgTableParams", "$timeout",
 		}
 	};
 	this.GetPageData = function(page, size) {
-		$scope.loading();
+		
 		$http.post("/post/GetPending", {
 			page,
 			size,
@@ -820,7 +817,7 @@ myApp.controller("postpending", ["$scope", "$http", "NgTableParams", "$timeout",
 				filterDelay: 0,
 				dataset: res.data.Data
 			});
-			$scope.loadingDone();
+			
 		});
 	};
 	self.del = function(row) {
@@ -879,7 +876,7 @@ myApp.controller("postpending", ["$scope", "$http", "NgTableParams", "$timeout",
 			_timeout = null;
 		}, 500);
 	}
-	$scope.loadingDone();
+	
 
 }]);
 

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/seminar.js

@@ -2,7 +2,7 @@
 	window.hub.stop();
 	var self = this;
 	var source = [];
-	$scope.loading();
+	
 	$scope.paginationConf = {
 		currentPage: $scope.currentPage ? $scope.currentPage : 1,
 		itemsPerPage: 10,
@@ -14,7 +14,7 @@
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
+		
 		$http.post("/seminar/getpagedata", {
 			page,
 			size
@@ -29,7 +29,7 @@
 				dataset: res.data.Data
 			});
 			source = angular.copy(res.data.Data);
-			$scope.loadingDone();
+			
 		});
 	};
 	self.del = function (row) {
@@ -108,5 +108,5 @@
 			}
 		}).catch(swal.noop);
 	}
-	$scope.loadingDone();
+	
 }]);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/system.js

@@ -13,12 +13,12 @@
 		$scope.Settings = settings;
 	});
 	$scope.uploadImage = function() {
-		$scope.loading();
+		
         $("#setImageForm").ajaxSubmit({
 			url: "/Upload",
 			type: "post",
 			success: function(data) {
-				$scope.loadingDone();
+				
 				document.getElementById("setImageForm").reset();
 				$scope.$apply(function () {
 			     　$scope.Settings[$scope.property] = data.Data;

src/Masuit.MyBlogs.Core/wwwroot/ng-views/controllers/users.js

@@ -3,7 +3,7 @@
 	var self = this;
 	$scope.isAdd = true;
 	$scope.allowUpload=false;
-	$scope.loading();
+	
 	$scope.userinfo = {};
 	$scope.kw = "";
 	$scope.paginationConf = {
@@ -17,7 +17,7 @@
 		}
 	};
 	this.GetPageData = function (page, size) {
-		$scope.loading();
+		
 		 window.fetch("/user/getusers?page="+page+"&size="+size+"&search="+$scope.kw).then(function(response) {
             return response.json();
         }).then(function(data) {
@@ -30,7 +30,7 @@
 				dataset: data.Data
 			});
 			self.data = data.Data;
-			$scope.loadingDone();
+			
          });
 	}
     $('.ui.dropdown.types').dropdown({
@@ -51,7 +51,7 @@
 			cancelButtonText: '取消'
 		}).then(function(isConfirm) {
 			if (isConfirm) {
-				$scope.loading();
+				
 				$scope.request("/user/delete?id="+userinfo.Id, null, function(data) {
 					swal(data.Message, null, 'success');
 			        self.GetPageData($scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage);

src/Masuit.MyBlogs.Core/wwwroot/ng-views/template/loading.html

@@ -1,57 +0,0 @@
-<div id="loading">
-    <div class="loading3">
-        <ul class="c">
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-        </ul>
-    </div>
-    <div class="loading2">
-        <div class="bg0 pa">
-            <div class="bg1"></div>
-        </div>
-        <div class="hx-box pa">
-            <ul class="pr">
-                <li class="hx-k1 pa0">
-                    <span></span>
-                </li>
-                <li class="hx-k2 pa0">
-                    <span></span>
-                </li>
-                <li class="hx-k3 pa0">
-                    <span></span>
-                </li>
-            </ul>
-        </div>
-    </div>
-    <div class="loading1 animated fadeIn">
-        <div class="loadEffect">
-            <div>
-                <span class="bg-warning"></span>
-            </div>
-            <div>
-                <span class="bg-success"></span>
-            </div>
-            <div>
-                <span class="bg-info"></span>
-            </div>
-            <div>
-                <span class="bg-primary"></span>
-            </div>
-            <div>
-                <span class="bg-default"></span>
-            </div>
-            <div>
-                <span class="bg-warning"></span>
-            </div>
-            <div>
-                <span class="bg-info"></span>
-            </div>
-            <div>
-                <span class="bg-success"></span>
-            </div>
-        </div>
-    </div>
-</div>

src/Masuit.MyBlogs.Core/wwwroot/ng-views/template/loading.min.html

@@ -1 +0,0 @@
-<div id=loading><div class=loading3><ul class=c><li></li><li></li><li></li><li></li><li></li></ul></div><div class=loading2><div class="bg0 pa"><div class=bg1></div></div><div class="hx-box pa"><ul class=pr><li class="hx-k1 pa0"><span></span></li><li class="hx-k2 pa0"><span></span></li><li class="hx-k3 pa0"><span></span></li></ul></div></div><div class="loading1 animated fadeIn"><div class=loadEffect><div><span class=bg-warning></span></div><div><span class=bg-success></span></div><div><span class=bg-info></span></div><div><span class=bg-primary></span></div><div><span class=bg-default></span></div><div><span class=bg-warning></span></div><div><span class=bg-info></span></div><div><span class=bg-success></span></div></div></div></div>