sql snippet have html editor as default

viebel · Aug 30, 2019 · 1f84e13 · 1f84e13
1 parent 95d6a49
commit 1f84e13
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,5 @@ docs/cache-cljs/local-m2/
 .idea/
 *.iml
 out/
-.rebel_readline_history
+.rebel_readline_history
+pom.xml*
diff --git a/resources/public/sql-dbg.html b/resources/public/sql-dbg.html
@@ -8,47 +8,28 @@
 </head>
 <body>
 
-<pre><code class="sql" data-editor-type="html">
+  <pre><code class="sql">
     CREATE TABLE play (game, points, day)
-</code></pre>
+  </code></pre>
 
-<pre><code class="sql" data-editor-type="html">
+  <pre><code class="sql">
     INSERT INTO play VALUES ("go", 500, "monday");
     INSERT INTO play VALUES ("go", 300, "tuesday");
     INSERT INTO play VALUES ("chess", 1250, "tuesday");
     INSERT INTO play VALUES ("chess", 1250, "tuesday");
     INSERT INTO play VALUES ("chess", 50, "sunday");
     INSERT INTO play VALUES ("chess", 3200, "saturday");
-</code></pre>
+  </code></pre>
 
-<pre><code class="sql" data-editor-type="html">
+  <pre><code class="sql">
     SELECT game, sum(points) as total_points FROM play GROUP BY game HAVING total_points &gt; 10
-</code></pre>
+  </code></pre>
 
-<script>
-    window.klipse_settings = {
-    codemirror_options_in: {
-    lineWrapping: true,
-    lineNumbers: true,
-    autoCloseBrackets: true
-    },
-    codemirror_options_out: {
-    lineWrapping: true
-    },
-    selector: '.clojure',
-    selector_eval_markdown: '.eval-markdown',
-    selector_eval_html: '.eval-html',
-    selector_eval_lambdaway: '.lambda',
-    selector_eval_js: '.javascript',
-    selector_eval_ruby: '.ruby',
-    selector_eval_python_client: '.python',
-    selector_sql: '.sql',
-    selector_compile_js: '.compile_js',
-    selector_eval_scheme: '.scheme',
-    selector_js: '.yo-clojure'
-    };
-    </script>
-<script src="lib/mirror_extensions.js"></script>
-<script src="fig/js/klipse.fig.js"></script>
+  <script>
+   window.klipse_settings = {
+     selector_sql: '.sql',
+   };
+  </script>
+  <script src="/cljs-out/dev-main.js"></script>
 </body>
 </html>
diff --git a/src/klipse/lang/sql.cljs b/src/klipse/lang/sql.cljs
@@ -1,14 +1,12 @@
 (ns klipse.lang.sql
   (:require-macros
-    [gadjett.core :refer [dbg]]
-    [cljs.core.async.macros :refer [go go-loop]])
+   [gadjett.core :refer [dbg]]
+   [cljs.core.async.macros :refer [go]])
   (:require
-   [klipse.utils :refer [runonce runonce-async]]
-   [cljs.core.async :refer [<! timeout chan put!]]
+   [klipse.utils :refer [runonce]]
    [klipse.common.registry :refer [codemirror-mode-src register-mode scripts-src]]
    [applied-science.js-interop :as j]))
 
-
 (def db nil)
 
 (defn create-db* []
@@ -25,6 +23,7 @@
           e))))
 
 (def opts {:editor-in-mode "text/x-sql"
+           :default-editor "html"
            :eval-fn str-eval-async
            :external-scripts [(codemirror-mode-src "sql") (scripts-src "sql-formatter.min.js") (scripts-src "sql.js") "https://gist.githubusercontent.com/viebel/fc86366093c27aca0adc103b1d20190d/raw"]; https://github.com/kripken/sql.js/
            :comment-str "--"})