correct second search and popups closing sometimes on search

This commit is contained in:
David Botton 2024-07-24 09:00:47 -04:00
parent ec93e87deb
commit 746fe1e99f
3 changed files with 10 additions and 9 deletions

View file

@ -109,6 +109,7 @@
(*menu-full-screen-item* variable) (*menu-full-screen-item* variable)
(*menu-icon-image-class* variable) (*menu-icon-image-class* variable)
(*top-bar-height* variable) (*top-bar-height* variable)
(*default-icon* variable)
(*default-title-class* variable) (*default-title-class* variable)
(*default-border-class* variable)) (*default-border-class* variable))

View file

@ -83,14 +83,14 @@
(when win (when win
(let ((pop (connection-data-item obj "clog-popup"))) (let ((pop (connection-data-item obj "clog-popup")))
(when pop (when pop
(close-window pop) (focus pop)
(window-focus win)) (window-focus win)))
(when regex (when regex
(focus (window-param win)) (focus (window-param win))
(js-execute obj (format nil "~A.find({regExp:true,needle:'~A',caseSensitive:false})" (js-execute obj (format nil "~A.find('~A',{caseSensitive:false,regExp:true})"
(clog-ace::js-ace (window-param win)) (escape-string regex)))) (clog-ace::js-ace (window-param win)) regex)))
(when show-find (when show-find
(clog-ace:execute-command (window-param win) "find"))) (clog-ace:execute-command (window-param win) "find"))
win) win)
(unless win (unless win
(let* ((app (connection-data-item obj "builder-app-data")) (let* ((app (connection-data-item obj "builder-app-data"))

View file

@ -103,7 +103,7 @@
(defun sys-browser-file-name-on-click (panel target) (defun sys-browser-file-name-on-click (panel target)
(unless (or (equal (text-value target) "") (unless (or (equal (text-value target) "")
(equal (text-value target) "click to open file in source editor")) (equal (text-value target) "click to open file in source editor"))
(on-open-file target :open-file (text-value target) :regex (search-js panel)))) (on-open-file target :open-file (text-value target) :show-find t :regex (search-js panel))))
(defun sys-browser-eval-form-button-on-click (panel target) (defun sys-browser-eval-form-button-on-click (panel target)
(declare (ignore target)) (declare (ignore target))