From 35ec8e025954f44f588f602db718dcf98bbfc041 Mon Sep 17 00:00:00 2001 From: David Botton Date: Fri, 17 Jun 2022 13:49:19 -0400 Subject: [PATCH] improved load-script --- source/clog-document.lisp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/source/clog-document.lisp b/source/clog-document.lisp index 2755826..d7779c0 100644 --- a/source/clog-document.lisp +++ b/source/clog-document.lisp @@ -195,18 +195,21 @@ If LOAD-ONLY-ONCE is t first checks if previously loaded with load-script.")) ;; custom on-load-script event in the next line of ;; script after the load as scripts are loaded ;; synchronously. - (jquery-execute (head-element obj) - (format nil "append('~ - ')" - (escape-string script-url) - (escape-string script-url))) + (js-execute obj + (format nil "$.getScript('~A', function() {~ + $(clog['document']).trigger('on-load-script',~ + '~A')})" + (escape-string script-url) + (escape-string script-url))) (cond (load-only-once - (when (bordeaux-threads:wait-on-semaphore sem :timeout wait-timeout) - (setf (connection-data-item obj (format nil "clog-~A" script-url)) t) + (when (bordeaux-threads:wait-on-semaphore + sem :timeout wait-timeout) + (setf (connection-data-item obj (format nil "clog-~A" + script-url)) t) script-url)) (t - (setf (connection-data-item obj (format nil "clog-~A" script-url)) t) + (setf (connection-data-item obj (format nil "clog-~A" + script-url)) t) script-url))))) (t t))))