(define-layered-class description
:in-layer wrap-link ()
- ((link :initarg :link :initform nil :special t :accessor link)))
+ ((link :initarg :link-action
+ :initarg :action
+ :initform nil :special t :accessor link-action)))
-(defdisplay
- :in-layer wrap-link :around (description object)
- (let ((link (link description)))
+(defaction call-action-with-component-and-object ((self component) action-id object)
+ (funcall (ucw::find-action (ucw::context.current-frame *context*) action-id)
+ self
+ object))
- (with-inactive-layers (wrap-link)
- (if *link-wrapped-p*
- (call-next-method)
- (let ((*link-wrapped-p* t))
- (<ucw:a :action (call-display self object link)
- (call-next-method)))))))
+(defdisplay
+ :in-layer wrap-link :around (description object)
+ (let ((link (link-action description)))
+
+ (with-inactive-layers (wrap-link)
+ (if *link-wrapped-p*
+ (call-next-method)
+ (let ((*link-wrapped-p* t))
+ (<ucw:a :action (call-action-with-component-and-object
+ self
+ (ucw::make-new-action
+ (ucw::context.current-frame *context*)
+ (if (consp link)
+ (eval link)
+ link))
+ object)
+ (call-next-method)))))))
;;; wrap-a-form
(deflayer wrap-form)
+(defvar *in-form-p* nil)
+
(define-layered-class description
:in-layer wrap-form ()
- ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)))
+ ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)
+ (form-type :initarg :form-type :initform '<ucw:simple-form :special t :accessor form-type)))
+(defattribute form-button-attribute ()
+ ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)))
-(defdisplay ((description (eql 'standard-form-buttons)) description-object)
+(defdisplay ((description form-button-attribute) object)
(macrolet ((submit (&key action value )
- `(<ucw::simple-submit
- :action (funcall ,action)
+ `(<ucw::value-submit
+ :action (funcall ,action self object)
- (<:as-html ,value))))
- (loop for button in (form-buttons description-object)
+ :value ,value)))
+ (loop for button in (form-buttons description)
do
(let ((button button))
(with-properties (button)
(let ((action (.get :action)))
(submit :value (.get :value)
- :action action)))))))
-
+ :action (if (consp action)
+ (eval action)
+ action))))))))
-(defdisplay :in-layer wrap-form :around (description object)
- (<ucw:form
- :action (refresh-component self)
- (with-inactive-layers (wrap-form)
-
- (call-next-method)
- (display-attribute 'standard-form-buttons description))))
+(defdisplay
+ :in-layer wrap-form
+ :around (description object)
+ (flet ((body ()
+ (with-inactive-layers (wrap-form)
+ (call-next-method)
+ (with-inactive-layers (show-attribute-labels)
+ (display-attribute
+ (make-instance
+ 'form-button-attribute
+ :form-buttons
+ (form-buttons description))
+ object)))))
+ (ecase (form-type description)
+ ('<ucw:simple-form
+ (<ucw:simple-form
+ :action (refresh-component self)
+ (body)))
+ ('<ucw:form
+ (<ucw:form
+ :action (refresh-component self)
+ (body))))))
;;;; wrap a DIV
:in-layer wrap-div ()
((div-attributes :accessor div-attributes :initarg :div :special t :initform nil)))
-(defdisplay :in-layer wrap-div :around (description object)
+(defdisplay :in-layer wrap-div :wrap-around (description object)
(let ((args (div-attributes description)))
(with-inactive-layers (wrap-div)
(yaclml::funcall-with-tag