BlogML import button not firing event without type attribute set.

rxtur · rxtur · commit a4d3335316b2 · 2016-03-29T19:14:58.000-05:00
diff --git a/BlogEngine/BlogEngine.NET/admin/app/settings/advancedView.html b/BlogEngine/BlogEngine.NET/admin/app/settings/advancedView.html
@@ -46,17 +46,17 @@ <h4>  {{lbl.securitySettings}}</h4>
                 <div ng-if="settings.AllowServerToDownloadRemoteFiles" class="form-group">
                     <div class="form-group">
                         <label class="control-label" for="txtRemoteFileDownloadTimeout">{{lbl.remoteTimeout}}</label>
-                        <input type="text" class=" form-control" id="txtRemoteFileDownloadTimeout" name="txtRemoteFileDownloadTimeout" data-ng-model="settings.RemoteFileDownloadTimeout" />
+                        <input type="text" class="form-control" id="txtRemoteFileDownloadTimeout" name="txtRemoteFileDownloadTimeout" data-ng-model="settings.RemoteFileDownloadTimeout" />
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="txtRemoteMaxFileSize">{{lbl.maximumRemoteFileSize}}</label>
-                        <input type="text" class=" form-control" id="txtRemoteMaxFileSize" name="txtRemoteMaxFileSize" data-ng-model="settings.RemoteMaxFileSize" />
+                        <input type="text" class="form-control" id="txtRemoteMaxFileSize" name="txtRemoteMaxFileSize" data-ng-model="settings.RemoteMaxFileSize" />
                     </div>
                 </div>
                 <h4>{{lbl.tools}}</h4>
                 <div class="form-group">
                     <p>{{lbl.selectSavedBlogMlFle}}</p>
-                    <button class="btn btn-default btn-input-file next">{{lbl.import}}</button>
+                    <button type="button" class="btn btn-default btn-input-file next">{{lbl.import}}</button>
                     <input type="file" class="input-file-hidden" onchange="angular.element(this).scope().uploadFile(this.files)" />
                 </div>
                 <div class="form-group">
diff --git a/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js b/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js
@@ -82,14 +82,15 @@
     }
 
     $scope.uploadFile = function (files) {
+        spinOn();
         var fd = new FormData();
         fd.append("file", files[0]);
-
         dataService.uploadFile("/api/upload?action=import", fd)
         .success(function (data) {
             toastr.success($rootScope.lbl.importedFromBlogML);
+            spinOff();
         })
-        .error(function () { toastr.error($rootScope.lbl.importFailed); });
+        .error(function () { toastr.error($rootScope.lbl.importFailed); spinOff(); });
     }
 
     $scope.testEmail = function () {
