significant code changes
Joe Edelman
I just checked in a little bit of a code reorg. Apologies to Sebastian
if it means you have to change some of the documentation you've written,
and to Matthew if you were just getting oriented.
The biggest change is that code for the palettes is now better
organized.
see http://github.com/jxe/groundcrew-viewer/commit/8e409af03ff9b89a4dcf967a397da9abdd6d61fe
--Joe
--
J.E. -- http://nxhx.org -- 413.250.8007
agent marmorkuchen
* Joe Edelman <joe.e...@gmail.com> [2009-03-03 15:37 -0500]:
>
> I just checked in a little bit of a code reorg. Apologies to Sebastian
> if it means you have to change some of the documentation you've written,
> and to Matthew if you were just getting oriented.
>
> The biggest change is that code for the palettes is now better
> organized.
>
> see http://github.com/jxe/groundcrew-viewer/commit/8e409af03ff9b89a4dcf967a397da9abdd6d61fe
two things i realised so far:
- when i close the welcome window, the alert
'unable to dispatch: show root'
pops up. but the window is closed. furthermore, when i select an
agent via the map, i get the alert
'unable to dispatch: show city'
but the city is shown. when the agent is selected via the flexbar, i
get no such alert.
similar message when i select a target via breadcrumbs.
- the code for limiting the length of the breadcrumb titles is gone.
bye,
marmorkuchen.
--
_ ascii ribbon campaign .oOo. GCSd-s:+aC++ULB+++W++M+PS+++Y+
( )
X Any problem in computer science can be solved with another layer
/ \ of indirection.
Joe Edelman
Matthew Latkiewicz
This is a total designer-who-is-trying-to-run-with-the-big-boys-and-
girls question. It involves doing a merge in Git.
I pulled down the most recent code into my fork by doing a:
git pull [public_clone_url]
It all looks good save for some things that need to merge. When I run
'git status' I get this:
components/organize_app/assignment_editor.html: needs merge
components/organize_app/organize.css: needs merge
I can do the research to figure out how to do the merge, but thought
you might have a short command I can run to take care of it. Is that
true? Is there a simple command to take care of this?
Thanks!
******
Matthew "The" Latkiewicz
Web: http://www.youwillnotbelieve.us
Blog: http://youwillnotbelieve.typepad.com
Joe Edelman
Try "git mergetool". If you have dev. tools installed on your mac it
should bring up a GUI. You will have to point to the lines to keep in
my changes vs. yours, or edit them in the window on the bottom.
Hopefully it will be clear.
agent marmorkuchen
* Joe Edelman <joe.e...@gmail.com> [2009-03-03 20:01 -0500]:
>
> fixed in fcc187f
thanks, seems to work now. alas, the breadcrumb cut-off is still
missing.
bye,
marmorkuchen
> >* Joe Edelman <joe.e...@gmail.com> [2009-03-03 15:37 -0500]:
> >>
> >> I just checked in a little bit of a code reorg. Apologies to Sebastian
> >> if it means you have to change some of the documentation you've written,
> >> and to Matthew if you were just getting oriented.
> >>
> >> The biggest change is that code for the palettes is now better
> >> organized.
> >>
> >> see http://github.com/jxe/groundcrew-viewer/commit/8e409af03ff9b89a4dcf967a397da9abdd6d61fe
> >
> >two things i realised so far:
> >
> >- when i close the welcome window, the alert
> > 'unable to dispatch: show root'
> > pops up. but the window is closed. furthermore, when i select an
> > agent via the map, i get the alert
> > 'unable to dispatch: show city'
> > but the city is shown. when the agent is selected via the flexbar, i
> > get no such alert.
> > similar message when i select a target via breadcrumbs.
> >
> >- the code for limiting the length of the breadcrumb titles is gone.
--
_ ascii ribbon campaign .oOo. GCSd-s:+aC++ULB+++W++M+PS+++Y+
( )
X Trust your technolust!
/ \
Joe Edelman
Matthew Latkiewicz
Thanks!
******
Matthew "The" Latkiewicz
Web: http://www.youwillnotbelieve.us
Blog: http://youwillnotbelieve.typepad.com
agent marmorkuchen
* Joe Edelman <joe.e...@gmail.com> [2009-03-04 11:37 -0500]:
> Doesn't it call trim() now?
yes, it does, but trim only trims whitespaces and doesn't cut off after
a specified length (which is needed to make the breadcrumb shorter).
also it would be nice to have an indicator that a string was cut by
a trailing '...', for example.
bye,
marmorkuchen
X Heute die Welt, morgens das Sonnensystem!
/ \
Joe Edelman
agent marmorkuchen
* Joe Edelman <joe.e...@gmail.com> [2009-03-04 21:07 -0500]:
>
> Oh, I screwed up. How's this?
>
> 0e28f59d350
nope, wrong operator precedence (i believe). this works for me:
http://github.com/marmorkuchen/groundcrew-viewer/commit/d00d91bdf9bbf2c234da1a30affa74a6a3c292fc
cheers,
marmorkuchen
> >* Joe Edelman <joe.e...@gmail.com> [2009-03-04 11:37 -0500]:
> >
> >> Doesn't it call trim() now?
> >
> >yes, it does, but trim only trims whitespaces and doesn't cut off after
> >a specified length (which is needed to make the breadcrumb shorter).
> >also it would be nice to have an indicator that a string was cut by
> >a trailing '...', for example.
> >
> >
> >> >* Joe Edelman <joe.e...@gmail.com> [2009-03-03 20:01 -0500]:
> >> >>
> >> >> fixed in fcc187f
> >> >
> >> >thanks, seems to work now. alas, the breadcrumb cut-off is still
> >> >missing.
> >> >
> >> >
> >> >> >* Joe Edelman <joe.e...@gmail.com> [2009-03-03 15:37 -0500]:
> >> >> >>
> >> >> >> I just checked in a little bit of a code reorg. Apologies to Sebastian
> >> >> >> if it means you have to change some of the documentation you've written,
> >> >> >> and to Matthew if you were just getting oriented.
> >> >> >>
> >> >> >> The biggest change is that code for the palettes is now better
> >> >> >> organized.
> >> >> >>
> >> >> >> see http://github.com/jxe/groundcrew-viewer/commit/8e409af03ff9b89a4dcf967a397da9abdd6d61fe
> >> >> >
> >> >> >two things i realised so far:
> >> >> >
> >> >> >- when i close the welcome window, the alert
> >> >> > 'unable to dispatch: show root'
> >> >> > pops up. but the window is closed. furthermore, when i select an
> >> >> > agent via the map, i get the alert
> >> >> > 'unable to dispatch: show city'
> >> >> > but the city is shown. when the agent is selected via the flexbar, i
> >> >> > get no such alert.
> >> >> > similar message when i select a target via breadcrumbs.
> >> >> >
> >> >> >- the code for limiting the length of the breadcrumb titles is gone.
--
_ ascii ribbon campaign .oOo. GCSd-s:+aC++ULB+++W++M+PS+++Y+
( )
X Any technology distinguishable from magic is insufficiently advanced.
/ \