Explorar o código

Move PS-macro to utils

Innocenty Enikeew %!s(int64=11) %!d(string=hai) anos
pai
achega
08d5ab3717
Modificáronse 2 ficheiros con 7 adicións e 8 borrados
  1. 4 0
      src/utils.lisp
  2. 3 8
      src/web.lisp

+ 4 - 0
src/utils.lisp

@@ -135,3 +135,7 @@
                                                       :expires (if (equal expires 0) nil (floor expires 1000))
                                                       :securep (equal secure-p 1)
                                                       :http-only-p (equal http-only-p 1))))))
+
+;;; parenscript macros
+(defpsmacro ! (&rest method-calls)
+  `(chain ,@method-calls))

+ 3 - 8
src/web.lisp

@@ -201,9 +201,6 @@
     ((equal file "timeliner.css") +timeliner.css+)
     (t (merge-pathnames (format nil "css/~A" file) *resources*))))
 
-(defpsmacro ! (&rest method-calls)
-  `(chain ,@method-calls))
-
 (defparameter +timeliner.js+
   (ps
     ;; Base app structure
@@ -234,7 +231,7 @@
                                     (var today (! (moment)
                                                   (format "YYYY-MM-DD")))
                                     (! router (navigate
-                                               (concatenate 'string "day/" today)
+                                               (+ "day/" today)
                                                (create :trigger t :replace t))))))
                     (! router (on "route:day"
                                   (lambda (day)
@@ -297,8 +294,7 @@
                                            (lambda (e)
                                              (when (@ btn event)
                                                (! self (trigger
-                                                        (concatenate
-                                                         'string "button:"
+                                                        (+ "button:"
                                                          (@ btn event)))))
                                              (! ($ "#modal") (modal "hide")))))
                                $btn)
@@ -412,8 +408,7 @@
                :changed (lambda (e date)
                           (! *timeliner router
                              (navigate
-                              (concatenate 'string "day/"
-                                           (! date (format "YYYY-MM-DD")))
+                              (+ "day/" (! date (format "YYYY-MM-DD")))
                               (create :trigger t))))))))
     ;; ** Map
     (setf (@ *timeliner *views *map)