aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-06-29 11:33:20 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-06-29 11:33:20 +0200
commitc3dc45cb021c97be201d37f757659fec5ebc0739 (patch)
tree295abbf78e4a8f6af539175c6cd0db7b87b3e2ea
parent90d20a505d11c4f0467b56130e6331dc5974bc06 (diff)
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) <sd378r@intl.att.com>
-rw-r--r--src/main/resources/META-INF/resources/designer/index.html3
-rw-r--r--src/main/resources/META-INF/resources/designer/lib/kendo.custom.min.js (renamed from src/main/resources/META-INF/resources/designer/scripts/kendo.custom.min.js)0
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/authcontroller.js4
3 files changed, 4 insertions, 3 deletions
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 @@
<html lang="en" ng-app="clds-app">
<head>
+<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1">
@@ -200,7 +201,7 @@
<!-- dialog box ctl end -->
<link rel="stylesheet" href="css/kendo.material.min.css">
<link rel="stylesheet" href="css/kendo.common-material.core.css">
- <script src="scripts/kendo.custom.min.js"></script>
+ <script src="lib/kendo.custom.min.js"></script>
<script src="scripts/aOnBoot.js"></script>
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
index a75ceaa5a..a75ceaa5a 100644
--- 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
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();
+
});
};