mirror of
https://github.com/rabbibotton/clog.git
synced 2025-12-06 02:30:42 -08:00
merged
This commit is contained in:
commit
8ebc9e1ec9
3 changed files with 259 additions and 254 deletions
|
|
@ -85,6 +85,7 @@
|
|||
(clog-ace::js-ace editor)
|
||||
(jquery editor)))
|
||||
;; setup adjust tab key
|
||||
(when (current-editor-is-lisp app)
|
||||
(js-execute editor
|
||||
(format nil
|
||||
"~A.commands.addCommand({
|
||||
|
|
@ -119,7 +120,7 @@
|
|||
(if *editor-use-tab-as-tabbify*
|
||||
"Ctrl-t|Tab"
|
||||
"Ctrl-t")
|
||||
(jquery editor)))
|
||||
(jquery editor))))
|
||||
(set-on-event-with-data editor "clog-adjust-tabs"
|
||||
(lambda (obj data)
|
||||
(declare (ignore obj))
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@
|
|||
lisp-package
|
||||
regex
|
||||
show-find
|
||||
force-mode
|
||||
is-console
|
||||
left top
|
||||
(editor-use-console-for-evals *editor-use-console-for-evals*)
|
||||
|
|
@ -263,11 +264,6 @@
|
|||
(clog-ace:resize ace)
|
||||
(set-geometry status :units "" :width "" :height "20px"
|
||||
:bottom "0px" :left "0px" :right "0px")
|
||||
(setup-lisp-ace ace status)
|
||||
(when is-console
|
||||
(setf (clog-ace:mode ace) "ace/mode/plain_text")
|
||||
(clog-ace:set-auto-completion ace nil)
|
||||
(set-on-change ace nil))
|
||||
(labels ((on-help (obj)
|
||||
(declare (ignore obj))
|
||||
(alert-dialog win
|
||||
|
|
@ -332,6 +328,14 @@
|
|||
(not (equalp open-file " "))
|
||||
(not (equalp open-file "")))
|
||||
(open-file-name open-file))
|
||||
(when force-mode
|
||||
(setf (clog-ace:mode ace) force-mode)
|
||||
(setf (current-editor-is-lisp app) nil))
|
||||
(setup-lisp-ace ace status)
|
||||
(when is-console
|
||||
(setf (clog-ace:mode ace) "ace/mode/plain_text")
|
||||
(clog-ace:set-auto-completion ace nil)
|
||||
(set-on-change ace nil))
|
||||
(when regex
|
||||
(focus ace)
|
||||
(js-execute obj (format nil "~A.find('~A',{caseSensitive:false,regExp:true})"
|
||||
|
|
|
|||
|
|
@ -1023,9 +1023,9 @@ not a temporarily attached one when using select-control."
|
|||
(get-control-list app panel-id))
|
||||
result)))
|
||||
(set-on-click m-html (lambda (obj)
|
||||
(on-open-file obj :text (render-html))))
|
||||
(on-open-file obj :force-mode "ace/mode/html" :text (render-html))))
|
||||
(set-on-click m-htmlq (lambda (obj)
|
||||
(on-open-file obj :text
|
||||
(on-open-file obj :force-mode "ace/mode/html" :text
|
||||
(ppcre:regex-replace-all "\""
|
||||
(render-html)
|
||||
"\\\"")))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue