Skip to content

Commit

Permalink
style corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
rabbibotton committed Feb 12, 2021
1 parent 6e287ab commit 11dade5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 23 deletions.
4 changes: 2 additions & 2 deletions clog-base.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ result or if time out DEFAULT-ANSWER (Private)"))
(:documentation "Get/Setf html height in pixels."))

(defmethod height ((obj clog-obj))
(parse-integer (jquery-query obj "height()")))
(parse-integer (jquery-query obj "height()") :junk-allowed t))

(defgeneric set-height (clog-obj value)
(:documentation "Set height VALUE for CLOG-OBJ"))
Expand All @@ -364,7 +364,7 @@ result or if time out DEFAULT-ANSWER (Private)"))
(:documentation "Get/Setf html width in pixels."))

(defmethod width ((obj clog-obj))
(parse-integer (jquery-query obj "width()")))
(parse-integer (jquery-query obj "width()") :junk-allowed t))

(defgeneric set-width (clog-obj value)
(:documentation "Set width VALUE for CLOG-OBJ"))
Expand Down
20 changes: 10 additions & 10 deletions clog-element.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ spell checking if Editable is also true."))
in pixels. It does not include the margin or padding."))

(defmethod client-left ((obj clog-element))
(parse-integer (property obj "clientLeft" :default-answer 0)))
(parse-integer (property obj "clientLeft" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;
;; client-top ;;
Expand All @@ -494,7 +494,7 @@ in pixels. It does not include the margin or padding."))
in pixels. It does not include the margin or padding."))

(defmethod client-top ((obj clog-element))
(parse-integer (property obj "clientTop" :default-answer 0)))
(parse-integer (property obj "clientTop" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;;
;; client-width ;;
Expand All @@ -506,7 +506,7 @@ CSS width + CSS padding - width of vertical scrollbar (if present)
Does not include the border or margin."))

(defmethod client-width ((obj clog-element))
(parse-integer (property obj "clientWidth" :default-answer 0)))
(parse-integer (property obj "clientWidth" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;;;
;; client-height ;;
Expand All @@ -518,7 +518,7 @@ CSS height + CSS padding - height of horizontal scrollbar (if present)
Does not include the border or margin."))

(defmethod client-height ((obj clog-element))
(parse-integer (property obj "clientHeight" :default-answer 0)))
(parse-integer (property obj "clientHeight" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;
;; offset-left ;;
Expand Down Expand Up @@ -609,7 +609,7 @@ content has been scrolled upward."))
of an element or the width of the element itself, whichever is greater."))

(defmethod scroll-width ((obj clog-element))
(parse-integer (property obj "scrollWidth" :default-answer 0)))
(parse-integer (property obj "scrollWidth" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;;;
;; scroll-height ;;
Expand All @@ -620,7 +620,7 @@ of an element or the width of the element itself, whichever is greater."))
content not visible on the screen due to overflow."))

(defmethod scroll-height ((obj clog-element))
(parse-integer (property obj "scrollHeight" :default-answer 0)))
(parse-integer (property obj "scrollHeight" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;
;; html-tag ;;
Expand Down Expand Up @@ -1335,7 +1335,7 @@ right, top and bottom are interpreted.
parent in the DOM."))

(defmethod position-top ((obj clog-element))
(parse-integer (jquery-query obj "position().top" :default-answer 0)))
(parse-integer (jquery-query obj "position().top" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;;;
;; position-left ;;
Expand All @@ -1346,7 +1346,7 @@ parent in the DOM."))
parent in the DOM."))

(defmethod position-left ((obj clog-element))
(parse-integer (jquery-query obj "position().left" :default-answer 0)))
(parse-integer (jquery-query obj "position().left" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;
;; offset-top ;;
Expand All @@ -1356,7 +1356,7 @@ parent in the DOM."))
(:documentation "Position in pixels from top relative to the document."))

(defmethod offset-top ((obj clog-element))
(parse-integer (jquery-query obj "offset().top" :default-answer 0)))
(parse-integer (jquery-query obj "offset().top" :default-answer 0) :junk-allowed t))

;;;;;;;;;;;;;;;;;
;; offset-left ;;
Expand All @@ -1366,7 +1366,7 @@ parent in the DOM."))
(:documentation "Position in pixels from left relative to the document."))

(defmethod offset-left ((obj clog-element))
(parse-integer (jquery-query obj "offset().left" :default-answer 0)))
(parse-integer (jquery-query obj "offset().left" :default-answer 0) :junk-allowed t))

;;;;;;;;;;
;; left ;;
Expand Down
21 changes: 10 additions & 11 deletions demos/03-demo.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@
(escape-string (read-file fname))
(html-id (current-window obj)))))))

(defun do-ide-file-save-as (obj)
(let ((cw (current-window obj)))
(when cw
(get-file-name obj "Save As.."
(lambda (fname)
(setf (window-title cw) fname)
(write-file (js-query obj (format nil "editor_~A.getValue()"
(html-id cw)))
fname))))))

(defun do-ide-file-save (obj)
(if (equalp (window-title (current-window obj)) "New Window")
(do-ide-file-save-as obj)
Expand All @@ -99,17 +109,6 @@
(sleep 2)
(setf (window-title cw) fname))))

(defun do-ide-file-save-as (obj)
(let ((cw (current-window obj)))
(when cw
(get-file-name obj "Save As.."
(lambda (fname)
(setf (window-title cw) fname)
(write-file (js-query obj (format nil "editor_~A.getValue()"
(html-id cw)))
fname))))))


(defun do-ide-edit-copy (obj)
(let ((cw (current-window obj)))
(when cw
Expand Down

0 comments on commit 11dade5

Please sign in to comment.