Merge branch 'master' of git://factorcode.org/git/factor
commit
0d9b0753dd
|
@ -111,7 +111,7 @@ CHLOE: form
|
|||
|
||||
STRING: button-tag-markup
|
||||
<t:form class="inline" xmlns:t="http://factorcode.org/chloe/1.0">
|
||||
<div><button type="submit"></button></div>
|
||||
<div style="display: inline;"><button type="submit"></button></div>
|
||||
</t:form>
|
||||
;
|
||||
|
||||
|
|
|
@ -15,35 +15,39 @@ namespaces tools.test present kernel ;
|
|||
>>url
|
||||
request set
|
||||
|
||||
[ "http://www.apple.com:80/xxx/bar" ] [
|
||||
[ "http://www.apple.com/xxx/bar" ] [
|
||||
<url> relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.apple.com:80/xxx/baz" ] [
|
||||
[ "http://www.apple.com/xxx/baz" ] [
|
||||
<url> "baz" >>path relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.apple.com:80/xxx/baz?c=d" ] [
|
||||
[ "http://www.apple.com/xxx/baz?c=d" ] [
|
||||
<url> "baz" >>path { { "c" "d" } } >>query relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.apple.com:80/xxx/bar?c=d" ] [
|
||||
[ "http://www.apple.com/xxx/bar?c=d" ] [
|
||||
<url> { { "c" "d" } } >>query relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.apple.com:80/flip" ] [
|
||||
[ "http://www.apple.com/flip" ] [
|
||||
<url> "/flip" >>path relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.apple.com:80/flip?c=d" ] [
|
||||
[ "http://www.apple.com/flip?c=d" ] [
|
||||
<url> "/flip" >>path { { "c" "d" } } >>query relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.jedit.org:80/" ] [
|
||||
[ "http://www.jedit.org/" ] [
|
||||
"http://www.jedit.org" >url relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.jedit.org:80/?a=b" ] [
|
||||
[ "http://www.jedit.org/?a=b" ] [
|
||||
"http://www.jedit.org" >url { { "a" "b" } } >>query relative-to-request present
|
||||
] unit-test
|
||||
|
||||
[ "http://www.jedit.org:1234/?a=b" ] [
|
||||
"http://www.jedit.org:1234" >url { { "a" "b" } } >>query relative-to-request present
|
||||
] unit-test
|
||||
] with-scope
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version='1.0' ?>
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
||||
|
|
Loading…
Reference in New Issue