From c3dc45cb021c97be201d37f757659fec5ebc0739 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 29 Jun 2018 11:33:20 +0200 Subject: [PATCH] Fix error reported by firefox Fix callback error and move kendo to lib folder Issue-ID: CLAMP-191 Change-Id: Ie262ec30f1148a4049dd36e94a6b7293eea9abfe Signed-off-by: Determe, Sebastien (sd378r) --- src/main/resources/META-INF/resources/designer/index.html | 3 ++- .../META-INF/resources/designer/{scripts => lib}/kendo.custom.min.js | 0 .../resources/META-INF/resources/designer/scripts/authcontroller.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) rename src/main/resources/META-INF/resources/designer/{scripts => lib}/kendo.custom.min.js (100%) diff --git a/src/main/resources/META-INF/resources/designer/index.html b/src/main/resources/META-INF/resources/designer/index.html index a3d788117..9ab905fb0 100644 --- a/src/main/resources/META-INF/resources/designer/index.html +++ b/src/main/resources/META-INF/resources/designer/index.html @@ -34,6 +34,7 @@ + @@ -200,7 +201,7 @@ - + diff --git a/src/main/resources/META-INF/resources/designer/scripts/kendo.custom.min.js b/src/main/resources/META-INF/resources/designer/lib/kendo.custom.min.js similarity index 100% rename from src/main/resources/META-INF/resources/designer/scripts/kendo.custom.min.js rename to src/main/resources/META-INF/resources/designer/lib/kendo.custom.min.js diff --git a/src/main/resources/META-INF/resources/designer/scripts/authcontroller.js b/src/main/resources/META-INF/resources/designer/scripts/authcontroller.js index 5992138bf..de364774d 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/authcontroller.js +++ b/src/main/resources/META-INF/resources/designer/scripts/authcontroller.js @@ -46,10 +46,10 @@ function AuthenticateCtrl($scope, $rootScope, $window, $resource, $http, $locati $rootScope.loginuser = data; } window.localStorage.removeItem("invalidUser"); - callback && callback(); + }).error(function() { $window.localStorage.setItem("invalidUser", true); - callback && callback(); + }); }; -- 2.16.6