Merge remote-tracking branches 'galenwp/js-updates' and 'joemfb/scry-desks'

talk@c83aedc and tree@51dbab2
adds scry-desks feature to %clay (care %d)
This commit is contained in:
Raymond Pasco 2017-01-05 14:03:27 -05:00
commit e0231fc590
4 changed files with 30 additions and 14 deletions

View File

@ -44,12 +44,13 @@
::
:: Type of request.
::
:: %u checks for existence, %v produces a ++dome of all desk data, %w with a
:: time or label case gets the aeon at that case, %w with a number case is not
:: recommended, %x gets file contents, %y gets a directory listing, and %z gets
:: a recursive hash of the file contents and children.
:: %d produces a set of desks, %u checks for existence, %v produces a ++dome of
:: all desk data, %w with a time or label case gets the aeon at that case, %w
:: with a number case is not recommended, %x gets file contents, %y gets a
:: directory listing, and %z gets a recursive hash of the file contents and
:: children.
::
++ care ?($u $v $w $x $y $z)
:: ++ care ?($d $u $v $w $x $y $z)
::
:: Keeps track of subscribers.
::
@ -1393,6 +1394,9 @@
(~(put by haw.u.ref) p.rav ~)
==
?- p.p.u.rut
$d
~| %totally-temporary-error-please-replace-me
!!
$u
~| %im-thinkin-its-prolly-a-bad-idea-to-request-rang-over-the-network
!!
@ -2118,6 +2122,8 @@
++ read :: read:ze
|= mun/mood :: read at point
^- (unit cage)
?: ?=($d p.mun)
~& %dead-d ~
?: ?=($v p.mun)
[~ %dome !>(dom)] :: dead code
?: &(?=($w p.mun) !?=($ud -.q.mun))
@ -2279,6 +2285,13 @@
^- (unit (unit (each cage lobe)))
?: &(?=($w p.mun) !?=($ud -.q.mun)) :: NB only her speed
?^(r.mun [~ ~] [~ ~ %& %aeon !>(yon)])
?: ?=($d p.mun)
=+ rom=(~(get by fat.ruf) her)
?~ rom
~&(%null-rom-cd [~ ~])
?^ r.mun
~&(%no-cd-path [~ ~])
[~ ~ %& %noun !>(~(key by dos.u.rom))]
?: ?=($u p.mun)
(read-u yon r.mun)
?: ?=($v p.mun)

View File

@ -326,7 +326,7 @@
$% {$delta p/lobe q/{p/mark q/lobe} r/page} :: delta on q
{$direct p/lobe q/page} :: immediate
== ::
++ care ?($u $v $w $x $y $z) :: clay submode
++ care ?($d $u $v $w $x $y $z) :: clay submode
++ case :: ship desk case spur
$% {$da p/@da} :: date
{$tas p/@tas} :: label
@ -408,7 +408,6 @@
{$| p/(list a) q/(list a)} :: p -> q[chunk]
== ::
++ urge |*(a/mold (list (unce a))) :: list change
++ view ?($u $v $w $x $y $z) :: view mode
++ yaki :: commit
$: p/(list tako) :: parents
q/(map path lobe) :: namespace

View File

@ -338,7 +338,7 @@ module.exports = recl({
_handleAudi: function(e) {
var audi;
audi = _.map($(e.target).closest('.path').find('div'), function(div) {
return $(div).text();
return "~" + $(div).text();
});
return this.props._handleAudi(audi);
},

View File

@ -3153,14 +3153,18 @@ module.exports = {
}
},
dateFromAtom: function(date) {
var __, day, hor, min, mon, ref, sec, str, yer;
var __, d, day, hor, min, mon, ref, sec, yer;
ref = date.slice(1).split("."), yer = ref[0], mon = ref[1], day = ref[2], __ = ref[3], hor = ref[4], min = ref[5], sec = ref[6];
if (day != null) {
str = yer + "-" + mon + "-" + day;
if (hor != null) {
str += " " + hor + ":" + min + ":" + sec;
}
return new Date(str);
d = new Date();
d.setYear(yer);
d.setMonth(mon - 1);
d.setDate(day);
}
if (hor != null) {
d.setHours(hor);
d.setMinutes(min);
return d.setSeconds(sec);
}
},
getKeys: function(kids, sortBy) {