summaryrefslogtreecommitdiffstats
path: root/portal/src/main/webapp/extsys/ems
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2019-11-19 23:10:53 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-19 23:10:53 +0000
commit63ec7efb434e3d172a806fdb5cbdb31f77df96fc (patch)
tree0f59ddd664571ba2eb7ef91d5da147fe1c0f57f3 /portal/src/main/webapp/extsys/ems
parent6919e101003aa30b78272a3f2e93bbf4e9d50ee8 (diff)
parent1cf839a50b323da707ee7af46735bb5ffef69488 (diff)
Merge "Upversion to Jquery 3.4.1"
Diffstat (limited to 'portal/src/main/webapp/extsys/ems')
-rw-r--r--portal/src/main/webapp/extsys/ems/emsView.html4
-rw-r--r--portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/portal/src/main/webapp/extsys/ems/emsView.html b/portal/src/main/webapp/extsys/ems/emsView.html
index 7e3eaf6..02f8b25 100644
--- a/portal/src/main/webapp/extsys/ems/emsView.html
+++ b/portal/src/main/webapp/extsys/ems/emsView.html
@@ -346,7 +346,7 @@
</div>
</div>
</div>
-<script type="text/javascript" src="../../thirdparty/jquery/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../../thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../../thirdparty/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../thirdparty/bootbox/bootbox.min.js"></script>
@@ -358,7 +358,7 @@
<!--<script type="text/javascript" src="../../thirdparty/cometd/jquery.cometd.js"></script>-->
<script type="text/javascript" src="../../thirdparty/avalon/avalon.js"></script>
-<script type="text/javascript" src="../../thirdparty/js/tools.js"></script>
+<!-- <script type="text/javascript" src="../../thirdparty/js/tools.js"></script> -->
<script type="text/javascript" src="js/commonUtil.js"></script>
<script type="text/javascript" src="js/loadi18n_nsoc.js"></script>
diff --git a/portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js
index 45224af..30a4ae2 100644
--- a/portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js
+++ b/portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js
@@ -34,5 +34,5 @@ function loadPropertiesSideMenu(lang, fileNamePrefix, filePath) {
}
});
}
-var lang = getLanguage();
-loadPropertiesSideMenu(lang, 'nfv-nso-iui-i18n', 'i18n/'); \ No newline at end of file
+
+loadPropertiesSideMenu('en-US','nfv-nso-iui-i18n', 'i18n/');