diff --git a/source/clog-connection-websockets.lisp b/source/clog-connection-websockets.lisp index 1e1340e..6ecd6fc 100644 --- a/source/clog-connection-websockets.lisp +++ b/source/clog-connection-websockets.lisp @@ -48,7 +48,7 @@ (t (c) (when *verbose-output* (format t "Failed to close the old connection when establishing reconnection. ~ - This can be normal: The old connection could probably don't work for the client, ~ + This can be normal: The old connection could not work for the client, ~ so the client is requesting to reconnect.~%Condition - ~A.~&" c)))) (setf (gethash id *connection-ids*) connection) @@ -215,10 +215,13 @@ (values 0 c))))) (lambda (responder) (declare (ignore responder)) - (websocket-driver:start-connection ws))) + (handler-case + (websocket-driver:start-connection ws) + (t (c) + (format t "Condition caught in websocket-driver:start-connection - ~A.~&" c))))) (t (c) (format t "Condition caught in clog-server start-up - ~A.~&" c) - (values 0 c)))) + (values '(400 nil) c)))) ;;;;;;;;;;;;;;;; ;; initialize ;; diff --git a/source/clog-element.lisp b/source/clog-element.lisp index 7d2cff3..6e99db0 100644 --- a/source/clog-element.lisp +++ b/source/clog-element.lisp @@ -1127,6 +1127,22 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENT")) (defmethod (setf grid-auto-flow) (value (obj clog-element)) (setf (style obj "grid-auto-flow") value)) +;;;;;;;;;;;;;;;;; +;; grid-column ;; +;;;;;;;;;;;;;;;;; + +(defgeneric grid-column (clog-element) + (:documentation "Get/Setf grid-column.")) + +(defmethod grid-column ((obj clog-element)) + (style obj "grid-column")) + +(defgeneric (setf grid-column) (value clog-element) + (:documentation "Set grid-column VALUE for CLOG-ELEMENT")) + +(defmethod (setf grid-column) (value (obj clog-element)) + (setf (style obj "grid-column") value)) + ;;;;;;;;;;;;;;;;;;;;;;; ;; grid-column-start ;; ;;;;;;;;;;;;;;;;;;;;;;; @@ -1159,6 +1175,22 @@ flex-basis (default :auto = use width or height) for CLOG-ELEMENT")) (defmethod (setf grid-column-end) (value (obj clog-element)) (setf (style obj "grid-column-end") value)) +;;;;;;;;;;;;;; +;; grid-row ;; +;;;;;;;;;;;;;; + +(defgeneric grid-row (clog-element) + (:documentation "Get/Setf grid-row.")) + +(defmethod grid-row ((obj clog-element)) + (style obj "grid-row")) + +(defgeneric (setf grid-row) (value clog-element) + (:documentation "Set grid-row VALUE for CLOG-ELEMENT")) + +(defmethod (setf grid-row) (value (obj clog-element)) + (setf (style obj "grid-row") value)) + ;;;;;;;;;;;;;;;;;;;; ;; grid-row-start ;; ;;;;;;;;;;;;;;;;;;;; diff --git a/source/clog.lisp b/source/clog.lisp index 729e27d..944d5e5 100644 --- a/source/clog.lisp +++ b/source/clog.lisp @@ -289,8 +289,10 @@ embedded in a native template application.)" (grid-auto-columns generic-function) (grid-auto-rows generic-function) (grid-auto-flow generic-function) + (grid-column generic-function) (grid-column-start generic-function) (grid-column-end generic-function) + (grid-row generic-function) (grid-row-start generic-function) (grid-row-end generic-function) (align-items-type type)