suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major api change: view focus now only treats its input as an id, rather than a general selector. We'll have extension to this later.

Browse Source
This commit is contained in:
Danny Yoo 2011-09-02 13:56:34 -04:00
parent 086a5dc61f
commit d6759935cd
13 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scribblings/cs19.scrbl
View File

@ -165,7 +165,7 @@ Write a file called @filepath{tick-tock.rkt} with the following content.
;; draw: world view -> view
(define (draw world dom)
(update-view-text (view-focus dom "#counter") world))
(update-view-text (view-focus dom "counter") world))
;; tick: world view -> world
@ -333,7 +333,7 @@ function will be called every time an event occurs.
;; draw: world view -> view
(define (draw world dom)
(update-view-text (view-focus dom "#name-span")
(update-view-text (view-focus dom "name-span")
(world-name world)))
...
(big-bang ...
@ -359,19 +359,13 @@ Common values for @racket[x] include @tech{resource}s.
@defproc[(view-focus? [v view] [selector String]) boolean]{
Return true if the view can be focused using the given selector.
Selectors are currently restricted to @litchar{#id} selectors for the
moment.
@defproc[(view-focus? [v view] [id String]) boolean]{
Return true if the view can be focused using the given id.
}
@defproc[(view-focus [v view] [selector String]) view]{
Focuses the view on an element, given the @racket[selector]. The view
@defproc[(view-focus [v view] [id String]) view]{
Focuses the view on an element, given the @racket[id]. The view
will be searched starting from the toplevelmost node.
Selectors are currently restricted to @litchar{#id} selectors for the
moment.
}

16
scribblings/manual.scrbl
View File

@ -561,7 +561,7 @@ Write a file called @filepath{tick-tock.rkt} with the following content.
;; draw: world view -> view
(define (draw world dom)
(update-view-text (view-focus dom "#counter") world))
(update-view-text (view-focus dom "counter") world))
;; tick: world view -> world
@ -709,7 +709,7 @@ function will be called every time an event occurs.
;; draw: world view -> view
(define (draw world dom)
(update-view-text (view-focus dom "#name-span")
(update-view-text (view-focus dom "name-span")
(world-name world)))
...
(big-bang ...
@ -734,12 +734,14 @@ Common values for @racket[x] include @tech{resource}s.
}
@defproc[(view-focus [v view] [selector String]) view]{
Focuses the view on an element, given the @racket[selector]. The view
will be searched starting from the toplevelmost node.
@defproc[(view-focus? [v view] [id String]) boolean]{
Return true if the view can be focused using the given id.
}
Selectors are currently restricted to @litchar{#id} selectors for the
moment.
@defproc[(view-focus [v view] [id String]) view]{
Focuses the view on an element, given the @racket[id]. The view
will be searched starting from the toplevelmost node.
}

2
tests/more-tests/sharing.rkt
View File

@ -59,7 +59,7 @@
(define-struct person (name friends) #:mutable)
(define-struct person (name friends))
(let-values ([(a b c)
(shared ([a (make-person "jill" (list b c))]
[b (make-person "jack" (list a c))]

4
web-world/examples/attr-animation/attr-animation.rkt
View File

@ -10,10 +10,10 @@
(modulo (add1 w) 10))
;; pick-block: world view -> view
;; pick-block: view number -> view
;; Focus the view on block i.
(define (pick-block v i)
(view-focus v (format "#~a" i)))
(view-focus v (format "~a" i)))
(define (draw w v)

2
web-world/examples/attr-animation/index.html
View File

@ -39,7 +39,7 @@ The program for this is:
;; pick-block: world view -> view
;; Focus the view on block i.
(define (pick-block v i)
(view-focus v (format "#~a" i)))
(view-focus v (format "~a" i)))
(define (draw w v)

6
web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt
View File

@ -26,8 +26,8 @@
;; until we're all done.
(define (draw w dom-view)
(foldl (lambda (name view)
(cond [(view-focus? view (format "#~a" name))
(define focused (view-focus view (format "#~a" name)))
(cond [(view-focus? view name)
(define focused (view-focus view name))
(cond
[(member name w)
view]
@ -44,7 +44,7 @@
;; to each name here.
(define my-view
(foldl (lambda (name view)
(view-bind (view-focus view (format "#~a" name))
(view-bind (view-focus view name)
"click"
hide-on-click))
(->view index.html)

4
web-world/examples/dwarves/dwarves.rkt
View File

@ -26,7 +26,7 @@
;; until we're all done.
(define (draw w dom-view)
(foldl (lambda (name view)
(define focused (view-focus view (format "#~a" name)))
(define focused (view-focus view name))
(cond
[(member name w)
(view-show focused)]
@ -41,7 +41,7 @@
;; to each name here.
(define my-view
(foldl (lambda (name view)
(view-bind (view-focus view (format "#~a" name))
(view-bind (view-focus view name)
"click"
hide-on-click))
(->view index.html)

6
web-world/examples/field/field.rkt
View File

@ -11,18 +11,18 @@
;; When the user clicks on the button, grab at the text of the
;; text-field.
(define (on-click w button-view)
(view-form-value (view-focus button-view "#text-field")))
(view-form-value (view-focus button-view "text-field")))
;; draw: world view -> view
;; Take the view, and replace the template with the world value.
(define (draw w dom)
(update-view-text (view-focus dom "#template")
(update-view-text (view-focus dom "template")
w))
(define my-view (view-bind (view-focus (->view index.html)
"#button")
"button")
"click"
on-click))

2
web-world/examples/redirected/redirected.rkt
View File

@ -9,7 +9,7 @@
;; draw: world view -> view
(define (draw w v)
(update-view-text (view-focus v "#counter") w))
(update-view-text (view-focus v "counter") w))

2
web-world/examples/tick-tock/tick-tock.rkt
View File

@ -7,7 +7,7 @@
;; draw: world view -> view
(define (draw w v)
(update-view-text (view-focus v "#counter") w))
(update-view-text (view-focus v "counter") w))

10
web-world/examples/todo/todo.rkt
View File

@ -36,7 +36,7 @@
;; world view -> world
(define (on-add world view)
(local [(define text (view-form-value (view-focus view "#next-item")))]
(local [(define text (view-form-value (view-focus view "next-item")))]
(cons (new-item text) world)))
@ -50,8 +50,8 @@
;; refresh-item-in-view: item view -> view
(define (refresh-item-in-view item view)
(cond
[(view-focus? view (format "#~a" (item-id item)))
(update-view-css (view-focus view (format "#~a" (item-id item)))
[(view-focus? view (item-id item))
(update-view-css (view-focus view (item-id item))
"text-decoration"
(cond [(item-finished? item)
"line-through"]
@ -59,7 +59,7 @@
"none"]))]
[else
(view-bind
(view-append-child (view-focus view "#items")
(view-append-child (view-focus view "items")
(xexp->dom `(li (@ (id ,(item-id item)))
,(item-content item))))
"click"
@ -74,7 +74,7 @@
(define the-view
(view-bind (view-focus (->view index.html) "#add-button")
(view-bind (view-focus (->view index.html) "add-button")
"click"
on-add))

4
web-world/examples/where-am-i/where-am-i.rkt
View File

@ -23,13 +23,13 @@
(define (draw world dom)
(define v1 (if (coord? (world-real world))
(update-view-text (view-focus dom "#real-location")
(update-view-text (view-focus dom "real-location")
(format "lat=~a, lng=~a"
(coord-lat (world-real world))
(coord-lng (world-real world))))
dom))
(define v2 (if (coord? (world-mock world))
(update-view-text (view-focus v1 "#mock-location")
(update-view-text (view-focus v1 "mock-location")
(format "lat=~a, lng=~a"
(coord-lat (world-mock world))
(coord-lng (world-mock world))))

14
web-world/js-impl.js
View File

@ -72,14 +72,11 @@
// For the moment, we only support selection by id.
var idRegexp = new RegExp("^#");
var selectorMatches = function(selector, node) {
if (selector.match(idRegexp)) {
if (node.nodeType === 1) {
return node.getAttribute('id') === selector.substring(1);
} else {
return false;
}
if (node.nodeType === 1) {
return node.getAttribute('id') === selector;
} else {
return false;
}
return false;
};
@ -107,6 +104,7 @@
this.nonce);
};
MockView.prototype.updateFocus = function(selector) {
selector = selector.toString();
return this.act(
@ -125,7 +123,7 @@
},
function(eventHandlers) { return eventHandlers; },
function(view) {
view.focus = view.top.find(selector);
view.focus = $(document.getElementById(selector));
}
);
};