Installer adjustments (#7592)

src/Umbraco.Web.UI.Client/src/installer/installer.service.js

@@ -2,17 +2,16 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 
 	var _status = {
 		index: 0,
-		current: undefined,
-		steps: undefined,
+		current: null,
+		steps: null,
 		loading: true,
 		progress: "100%"
 	};
 
-	var factTimer = undefined;
+	var factTimer;
 	var _installerModel = {
-	    installId: undefined,
-        instructions: {
-        }
+		installId: null,
+		instructions: {}
 	};
 
 	//add to umbraco installer facts here
@@ -304,7 +303,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 		},
 
 		switchToFeedback : function(){
-			service.status.current = undefined;
+			service.status.current = null;
 			service.status.loading = true;
 			service.status.configuring = false;
 
@@ -320,11 +319,11 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 		switchToConfiguration : function(){
 			service.status.loading = false;
 			service.status.configuring = true;
-			service.status.feedback = undefined;
-			service.status.fact = undefined;
+			service.status.feedback = null;
+			service.status.fact = null;
 
-			if(factTimer){
-				clearInterval(factTimer);
+			if (factTimer) {
+			    clearInterval(factTimer);
 			}
 		},
 
@@ -335,8 +334,8 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 			service.status.feedback = "Redirecting you to Umbraco, please wait";
 			service.status.loading = false;
 
-			if(factTimer){
-				clearInterval(factTimer);
+			if (factTimer) {
+			    clearInterval(factTimer);
 			}
 
 			$timeout(function(){

src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js

@@ -4,18 +4,19 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
 	$scope.invalidDbDns = false;
 			
 	$scope.dbs = [
-		{ name: 'Microsoft SQL Server Compact (SQL CE)', id: 0},
-		{ name: 'Microsoft SQL Server', id: 1},
+		{ name: 'Microsoft SQL Server Compact (SQL CE)', id: 0 },
+		{ name: 'Microsoft SQL Server', id: 1 },
 		{ name: 'Microsoft SQL Azure', id: 3 },
-		{ name: 'Custom connection string', id: -1}
+		{ name: 'Custom connection string', id: -1 }
 	];
 
-	if ( installerService.status.current.model.dbType === undefined ) {
+    if (angular.isUndefined(installerService.status.current.model.dbType) || installerService.status.current.model.dbType === null) {
 		installerService.status.current.model.dbType = 0;
 	}
 	
-    	$scope.validateAndForward = function(){
-		if ( !$scope.checking && this.myForm.$valid ) {
+    $scope.validateAndForward = function() {
+        if (!$scope.checking && this.myForm.$valid)
+        {
 		 	$scope.checking = true;
 			$scope.invalidDbDns = false;
 			
@@ -23,9 +24,9 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
 
 			$http.post(
 				Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostValidateDatabaseConnection",
-				model ).then( function( response ) {
+				model).then(function(response) {
 					
-					if ( response.data === true ) {
+					if (response.data === true) {
 						installerService.forward();	
 					}
 					else {

src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js

@@ -1,5 +1,4 @@
 angular.module("umbraco.install").controller("Umbraco.Installer.MachineKeyController", function ($scope, installerService) {
-
     
     $scope.continue = function () {
         installerService.status.current.model = true;
@@ -11,4 +10,4 @@
         installerService.forward();
     };
 
-});
+});

src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html

@@ -20,8 +20,9 @@
         </li>
     </ul>
 
-    <a href ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')"
-       class="btn btn-link btn-link-reverse">
+    <button type="button"
+            class="btn btn-link btn-link-reverse"
+            ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')">
         No thanks, I do not want to install a starter website
-    </a>
+    </button>
 </div>

src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js

@@ -13,14 +13,14 @@ angular.module("umbraco.install").controller("Umbraco.Install.UserController", f
         $scope.passwordPattern = new RegExp(exp);
     }
 
-	$scope.validateAndInstall = function(){
-			installerService.install();
+	$scope.validateAndInstall = function() {
+	    installerService.install();
 	};
 
 	$scope.validateAndForward = function(){
-			if(this.myForm.$valid){
-				installerService.forward();
-			}
+		if (this.myForm.$valid) {
+			installerService.forward();
+		}
 	};
 	
-});
+});