Переглянути джерело

HUE-6455 [frontend] Fix Ace require base path for the highlight and readonly XML bindings

Enrico Berti 8 роки тому
батько
коміт
e87fea847e

+ 0 - 7
apps/hbase/src/hbase/templates/app.mako

@@ -2562,13 +2562,6 @@ ${ commonheader(None, "hbase", user, request) | n,unicode }
 </script>
 <script src="${ static('desktop/ext/js/mustache.js') }" type="text/javascript" charset="utf-8"></script>
 
-<script src="${ static('desktop/js/ace/ace.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
-<script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
-<script src="${ static('desktop/js/ace.extended.js') }"></script>
-
-
 %if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
 %endif

+ 0 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -52,7 +52,6 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
-<script src="${ static('desktop/js/ace/ace.js') }"></script>
 
 % if not is_mini:
 <div id="jobbrowserComponents" class="jobbrowser-components">

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -306,7 +306,6 @@ ${ layout.menubar(section='bundles', dashboard=True) }
 </div>
 
 <script src="${ static('oozie/js/dashboard-utils.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/ace/ace.js') }" type="text/javascript"></script>
 
 <style type="text/css">
   #definitionEditor {

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -492,7 +492,6 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 <div id="rerun-coord-modal" class="modal hide"></div>
 
 <script src="${ static('oozie/js/dashboard-utils.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/ace/ace.js') }" type="text/javascript"></script>
 
 % if oozie_coordinator.has_sla:
 <script src="${ static('oozie/js/sla.utils.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -359,7 +359,6 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 <script src="${ static('oozie/js/dashboard-utils.js') }" type="text/javascript" charset="utf-8"></script>
 <link rel="stylesheet" href="${ static('oozie/css/workflow.css') }">
 <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/ace/ace.js') }" type="text/javascript"></script>
 
 % if oozie_workflow.has_sla:
 <script src="${ static('oozie/js/sla.utils.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 2
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako

@@ -206,8 +206,6 @@ ${ layout.menubar(section='workflows', dashboard=True) }
     </div>
 </div>
 
-<script src="${ static('desktop/js/ace/ace.js') }" type="text/javascript"></script>
-
 <script type="text/javascript">
 
   $(document).ready(function() {

+ 5 - 2
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -5391,8 +5391,9 @@
           'ace/mode/hive_highlight_rules',
           'ace/mode/xml_highlight_rules',
           'ace/tokenizer',
-          'ace/layer/text'
-        ], function (impalaRules, hiveRules, xmlRules, tokenizer, text) {
+          'ace/layer/text',
+          'ace/config'
+        ], function (impalaRules, hiveRules, xmlRules, tokenizer, text, config) {
           var res = [];
 
           var Tokenizer = tokenizer.Tokenizer;
@@ -5401,6 +5402,8 @@
             Rules = impalaRules.ImpalaHighlightRules;
           }
 
+          config.loadModule(["theme", $.totalStorage("hue.ace.theme") || "ace/theme/hue"]);
+
           var Text = text.Text;
 
           var tok = new Tokenizer(new Rules().getRules());

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

@@ -155,6 +155,14 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
   <script src="${ static('desktop/js/sqlUtils.js') }"></script>
   <script src="${ static('desktop/ext/js/dropzone.min.js') }"></script>
+  <script src="${ static('desktop/js/ace/ace.js') }"></script>
+  <script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
+  <script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
+  <script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
+  <script src="${ static('desktop/js/ace.extended.js') }"></script>
+  <script>
+    ace.config.set("basePath", "/static/desktop/js/ace");
+  </script>
 
   <script src="${ static('metastore/js/metastore.model.js') }"></script>
 

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

@@ -163,6 +163,14 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/js/ko.switch-case.js') }"></script>
   <script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
   <script src="${ static('desktop/js/hue.colors.js') }"></script>
+  <script src="${ static('desktop/js/ace/ace.js') }"></script>
+  <script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
+  <script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
+  <script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
+  <script src="${ static('desktop/js/ace.extended.js') }"></script>
+  <script>
+    ace.config.set("basePath", "/static/desktop/js/ace");
+  </script>
 
 
   <script type="text/javascript">

+ 4 - 0
desktop/core/src/desktop/templates/common_jasmine.mako

@@ -28,6 +28,10 @@
   <script type="text/javascript" src="${ static('desktop/js/hue.utils.js') }"></script>
   <script type="text/javascript" src="${ static('desktop/ext/js/jquery/plugins/jquery.total-storage.min.js') }"></script>
   <script type="text/javascript" src="${ static('desktop/js/ace/ace.js') }"></script>
+  <script>
+    ace.config.set("basePath", "/static/desktop/js/ace");
+  </script>
+
   <script type="text/javascript" src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
   <script type="text/javascript" src="${ static('desktop/js/ace.extended.js') }"></script>
   <script type="text/javascript" src="${ static('desktop/ext/js/jasmine-2.3.4/jasmine') }"></script>

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

@@ -487,6 +487,10 @@ ${ hueIcons.symbols() }
 <script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
 <script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
 <script src="${ static('desktop/js/ace.extended.js') }"></script>
+<script>
+  ace.config.set("basePath", "/static/desktop/js/ace");
+</script>
+
 <script src="${ static('desktop/ext/js/dropzone.min.js') }"></script>
 
 <script src="${ static('desktop/js/autocomplete/sqlParseSupport.js') }"></script>

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

@@ -158,11 +158,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 <![endif]-->
 <script src="${ static('desktop/ext/js/medium-editor.min.js') }" type="text/javascript" charset="utf-8"></script>
 
-<script src="${ static('desktop/js/ace/ace.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
-<script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
-<script src="${ static('desktop/js/ace.extended.js') }"></script>
 <script src="${ static('desktop/ext/js/download.min.js') }"></script>
 
 <%namespace name="dashboard" file="/common_dashboard.mako" />
@@ -2014,8 +2009,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
     return text;
   }
 
-  ace.config.set("basePath", "/static/desktop/js/ace");
-
   function createHueDatatable(el, snippet, vm) {
     var DATATABLES_MAX_HEIGHT = 330;
     var _dt = $(el).hueDataTable({

+ 0 - 5
desktop/libs/notebook/src/notebook/templates/editor_m.mako

@@ -165,11 +165,6 @@ ${ commonheader_m(editor_type, editor_type, user, request, "68px") | n,unicode }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
-<script src="${ static('desktop/js/ace/ace.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
-<script src="${ static('desktop/js/ace/mode-hive.js') }"></script>
-<script src="${ static('desktop/js/ace/ext-language_tools.js') }"></script>
-<script src="${ static('desktop/js/ace.extended.js') }"></script>
 <script src="${ static('desktop/js/ko.switch-case.js') }"></script>
 <script src="${ static('desktop/js/sqlFunctions.js') }"></script>
 <script src="${ static('desktop/js/autocomplete/sqlParseSupport.js') }"></script>