Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/views/login/login.js

@@ -10,28 +10,6 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
     }])
 
     .controller('loginCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter,$location,$http,localStorageService) {
-
-        if($rootScope.loginData.login==true){
-            whereToGo($rootScope.loginData.roleList[0].process)
-        }
-
-        $scope.enterEvent = function(e) {
-            var keycode = window.event?e.keyCode:e.which;
-            if(keycode==13){
-                $scope.doLogin();
-            }
-        }
-
-
-        var browserName = function (userAgent){
-            if (userAgent.index0f('Firefox')!= -1)
-                location.reload([true])
-
-            if (userAgent.index0f(" Chrome") !== -1){
-                location. reload([true])
-            }
-        }
-
         var whereToGo = function(process){
             switch (process){
                 case 1:
@@ -75,6 +53,28 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
                     break;
             }
         }
+        if($rootScope.loginData.login==true){
+            whereToGo($rootScope.loginData.roleList[0].process)
+        }
+
+        $scope.enterEvent = function(e) {
+            var keycode = window.event?e.keyCode:e.which;
+            if(keycode==13){
+                $scope.doLogin();
+            }
+        }
+
+
+        var browserName = function (userAgent){
+            if (userAgent.index0f('Firefox')!= -1)
+                location.reload([true])
+
+            if (userAgent.index0f(" Chrome") !== -1){
+                location. reload([true])
+            }
+        }
+
+
 
         $scope.user = {};
         $scope.doLogin = function(){