diff options
| author |   James Forsyth <jf2512@att.com> | 2019-11-19 23:10:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-11-19 23:10:53 +0000 |
| commit | 63ec7efb434e3d172a806fdb5cbdb31f77df96fc (patch) | |
| tree | 0f59ddd664571ba2eb7ef91d5da147fe1c0f57f3 /portal/src | |
| parent | 6919e101003aa30b78272a3f2e93bbf4e9d50ee8 (diff) | |
| parent | 1cf839a50b323da707ee7af46735bb5ffef69488 (diff) | |
Merge "Upversion to Jquery 3.4.1"
Diffstat (limited to 'portal/src')
10 files changed, 16 insertions, 20 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/'); diff --git a/portal/src/main/webapp/extsys/nfvo/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/nfvo/js/loadi18n_nsoc.js index 3f18972..22cd768 100644 --- a/portal/src/main/webapp/extsys/nfvo/js/loadi18n_nsoc.js +++ b/portal/src/main/webapp/extsys/nfvo/js/loadi18n_nsoc.js @@ -34,5 +34,4 @@ function loadPropertiesSideMenu(lang, fileNamePrefix, filePath) { } }); } -var lang = getLanguage(); -loadPropertiesSideMenu(lang, 'nfv-nso-iui-i18n', 'i18n/'); +loadPropertiesSideMenu('en-US', 'nfv-nso-iui-i18n', 'i18n/');
\ No newline at end of file diff --git a/portal/src/main/webapp/extsys/nfvo/nfvoView.html b/portal/src/main/webapp/extsys/nfvo/nfvoView.html index 4753830..0868cca 100644 --- a/portal/src/main/webapp/extsys/nfvo/nfvoView.html +++ b/portal/src/main/webapp/extsys/nfvo/nfvoView.html @@ -166,7 +166,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> @@ -178,7 +178,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/sdncontroller/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js index 45224af..13163c6 100644 --- a/portal/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js +++ b/portal/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js @@ -34,5 +34,4 @@ 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/');
\ No newline at end of file diff --git a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html index 05a3e4f..b832e93 100644 --- a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html +++ b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html @@ -186,7 +186,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> @@ -198,7 +198,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/vim/i18n/loadi18nApp.js b/portal/src/main/webapp/extsys/vim/i18n/loadi18nApp.js index d0388b3..03be821 100644 --- a/portal/src/main/webapp/extsys/vim/i18n/loadi18nApp.js +++ b/portal/src/main/webapp/extsys/vim/i18n/loadi18nApp.js @@ -37,6 +37,5 @@ function loadPropertiesSideMenu(lang, propertiesFileNamePrefix, propertiesFilePa } }); } -var lang = getLanguage(); -loadPropertiesSideMenu(lang, 'roc-vim-iui-i18n', 'i18n/'); +loadPropertiesSideMenu('en-US', 'roc-vim-iui-i18n', 'i18n/'); diff --git a/portal/src/main/webapp/extsys/vim/vimView.html b/portal/src/main/webapp/extsys/vim/vimView.html index 0dce392..32ba8f3 100644 --- a/portal/src/main/webapp/extsys/vim/vimView.html +++ b/portal/src/main/webapp/extsys/vim/vimView.html @@ -277,8 +277,8 @@ </div> </div> -<script type="text/javascript" src="../../thirdparty/jquery/jquery-1.10.2.min.js"></script> -<script type="text/javascript" src="../../thirdparty/js/tools.js"></script> +<script type="text/javascript" src="../../thirdparty/jquery/jquery-3.4.1.min.js"></script> +<!-- <script type="text/javascript" src="../../thirdparty/js/tools.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/jquery-validation/js/jquery.validate.js"></script> diff --git a/portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js index 45224af..13163c6 100644 --- a/portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js +++ b/portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js @@ -34,5 +34,4 @@ 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/');
\ No newline at end of file diff --git a/portal/src/main/webapp/extsys/vnfm/vnfmView.html b/portal/src/main/webapp/extsys/vnfm/vnfmView.html index b5da6fc..6234f01 100644 --- a/portal/src/main/webapp/extsys/vnfm/vnfmView.html +++ b/portal/src/main/webapp/extsys/vnfm/vnfmView.html @@ -193,7 +193,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> @@ -203,7 +203,7 @@ <script type="text/javascript" src="../../thirdparty/bootstrap-growl/bootstrap-growl.min.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> |