drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ku...@apache.org
Subject [drill] branch master updated: DRILL-6837: Missing reference for dynamically created Javascript library
Date Fri, 09 Nov 2018 21:45:25 GMT
This is an automated email from the ASF dual-hosted git repository.

kunal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 3355c7e  DRILL-6837: Missing reference for dynamically created Javascript library
3355c7e is described below

commit 3355c7e9e092183be03004e0a11b940cead39458
Author: Kunal Khatua <kkhatua@maprtech.com>
AuthorDate: Thu Nov 8 15:13:43 2018 -0800

    DRILL-6837: Missing reference for dynamically created Javascript library
    
    A PR for DRILL-6084 broke the auto-complete library required for Edit Query page, with
the removal of the static javascript library.
    https://github.com/apache/drill/pull/1491/files#diff-2bb3c04f1a9eead1faf57212cce5d2a9
    
    The dynamically loaded script is not defined in the Freemarker template page.
    The fix is trivial.
---
 exec/java-exec/src/main/resources/rest/profile/profile.ftl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
index 1d6a0c2..c14e1b2 100644
--- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
@@ -29,7 +29,8 @@
 </#if>
   <!-- Ace Libraries for Syntax Formatting -->
   <script src="/static/js/ace-code-editor/ace.js" type="text/javascript" charset="utf-8"></script>
-  <script src="/static/js/ace-code-editor/mode-sql.js" type="text/javascript" charset="utf-8"></script>
+  <!-- Disabled in favour of dynamic: script src="/static/js/ace-code-editor/mode-sql.js"
type="text/javascript" charset="utf-8" -->
+  <script src="/dynamic/mode-sql.js" type="text/javascript" charset="utf-8"></script>
   <script src="/static/js/ace-code-editor/ext-language_tools.js" type="text/javascript"
charset="utf-8"></script>
   <script src="/static/js/ace-code-editor/theme-sqlserver.js" type="text/javascript" charset="utf-8"></script>
   <script src="/static/js/ace-code-editor/snippets/sql.js" type="text/javascript" charset="utf-8"></script>


Mime
View raw message