Эх сурвалжийг харах

HUE-6554 [frontend] Put moment timezone in the common header to avoid multiple instances of it

Enrico Berti 8 жил өмнө
parent
commit
513ced4

+ 0 - 3
apps/oozie/src/oozie/templates/editor2/common_scheduler.inc.mako

@@ -483,9 +483,6 @@ from django.utils.translation import ugettext as _
   <link href="${ static('desktop/css/jqCron.css') }" rel="stylesheet" type="text/css" />
   <script src="${ static('desktop/js/jqCron.js') }" type="text/javascript"></script>
 
-  <script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
-  <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
-
   <script type="text/javascript">
     function showChooseWorkflow() {
     }

+ 0 - 3
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -115,9 +115,6 @@ ${ scheduler.import_modals() }
 <link href="${ static('desktop/css/jqCron.css') }" rel="stylesheet" type="text/css" />
 <script src="${ static('desktop/js/jqCron.js') }" type="text/javascript"></script>
 
-<script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
-
 <link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
 <script src="${ static('desktop/ext/select2/select2.min.js') }" type="text/javascript" charset="utf-8"></script>
 

+ 2 - 0
desktop/core/src/desktop/templates/common_header.mako

@@ -148,6 +148,8 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/ext/js/filesize.min.js') }"></script>
   <script src="${ static('desktop/js/popover-extra-placements.js') }"></script>
   <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
+  <script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
+  <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout.validation.min.js') }"></script>

+ 2 - 0
desktop/core/src/desktop/templates/common_header_m.mako

@@ -155,6 +155,8 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/ext/js/bootstrap.min.js') }"></script>
   <script src="${ static('desktop/ext/js/bootstrap-better-typeahead.min.js') }"></script>
   <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
+  <script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
+  <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/d3.v3.js') }"></script>
   <script src="${ static('desktop/ext/js/d3.v4.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout.min.js') }"></script>

+ 2 - 0
desktop/core/src/desktop/templates/hue.mako

@@ -443,6 +443,8 @@ ${ hueIcons.symbols() }
 <script src="${ static('desktop/ext/js/fileuploader.js') }"></script>
 <script src="${ static('desktop/ext/js/filesize.min.js') }"></script>
 <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }"></script>
+<script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.total-storage.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.cookie.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js') }"></script>

+ 0 - 2
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -161,8 +161,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 <script src="${ static('desktop/ext/js/download.min.js') }"></script>
 
 <%namespace name="dashboard" file="/common_dashboard.mako" />
-<script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
 
 <script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>