fluid-work IRC Logs-2013-05-15

Owned by Fluid IRC Log Bot
Last updated: May 15, 2013Version comment
3 min read

[15:41:08 CDT(-0500)] <michelled> anastasiac: where do I find the standard order of things in a defaults block?

[15:41:36 CDT(-0500)] <anastasiac> michelled, in the Infusion Documentation (wink)

[15:41:46 CDT(-0500)] <anastasiac> would you be willing to user-test the docs?

[15:41:54 CDT(-0500)] <anastasiac> i.e. could you find them?

[15:43:20 CDT(-0500)] <michelled> oh, it's such a well named page (smile)

[15:43:25 CDT(-0500)] <michelled> http://wiki.fluidproject.org/display/docs/Define+defaults+in+a+consistent+order

[15:43:29 CDT(-0500)] <anastasiac> naming is everything

[17:25:55 CDT(-0500)] <thealphanerd> colinclark: you around?

[17:26:00 CDT(-0500)] <colinclark> I am

[17:26:15 CDT(-0500)] <thealphanerd> did you see the pull request I sent for flocking-node?

[17:26:30 CDT(-0500)] <colinclark> I did, yes

[17:26:36 CDT(-0500)] <thealphanerd> thoughts/

[17:26:37 CDT(-0500)] <thealphanerd> ?

[17:26:42 CDT(-0500)] <colinclark> Two things:

[17:26:50 CDT(-0500)] <colinclark> 1. I just merged the Flocking infusion branch into master last night

[17:26:53 CDT(-0500)] <colinclark> so it's the real deal

[17:27:00 CDT(-0500)] <colinclark> 2. I still wonder if this is the most convenient workflow

[17:27:08 CDT(-0500)] <colinclark> We talked about it on the phone a while ago

[17:27:14 CDT(-0500)] <colinclark> and perhaps you explained this to me

[17:27:27 CDT(-0500)] <colinclark> but what is the idiom for working on changes within the submodule?

[17:27:34 CDT(-0500)] <thealphanerd> you cd into the submodule

[17:27:41 CDT(-0500)] <thealphanerd> make any changes you need to that submodule

[17:27:43 CDT(-0500)] <thealphanerd> then commit

[17:27:46 CDT(-0500)] <thealphanerd> so for example

[17:27:48 CDT(-0500)] <colinclark> But what if it's on a branhc?

[17:27:56 CDT(-0500)] <thealphanerd> checkout a different branch

[17:28:04 CDT(-0500)] <colinclark> And if I want to make a new branch?

[17:28:05 CDT(-0500)] <thealphanerd> then commit that change in the main project

[17:28:15 CDT(-0500)] <thealphanerd> make a new branch and push it to the main repo

[17:28:24 CDT(-0500)] <colinclark> from the submodule?

[17:28:27 CDT(-0500)] <thealphanerd> yup

[17:28:33 CDT(-0500)] <colinclark> it's my understand that submodules have no concept of branches

[17:28:38 CDT(-0500)] <colinclark> is that incorrect?

[17:28:41 CDT(-0500)] <thealphanerd> a submodule is like any clone

[17:28:46 CDT(-0500)] <thealphanerd> you can switch branch's

[17:28:48 CDT(-0500)] <thealphanerd> commit code

[17:28:49 CDT(-0500)] <thealphanerd> push

[17:28:49 CDT(-0500)] <thealphanerd> etc

[17:29:24 CDT(-0500)] <thealphanerd> check the pull request

[17:29:36 CDT(-0500)] <thealphanerd> the flocking submodule now points to the latest master branch

[17:30:02 CDT(-0500)] <thealphanerd> submodule ends up pointing to a particular commit or brnahc

[17:30:15 CDT(-0500)] <colinclark> I'll take a look

[17:30:20 CDT(-0500)] <colinclark> I could have sworn it wasn't quite that smooth

[17:30:24 CDT(-0500)] <colinclark> but that's great if it is

[17:30:27 CDT(-0500)] <colinclark> thanks for the pull request

[17:30:31 CDT(-0500)] <thealphanerd> no prob

[17:30:31 CDT(-0500)] <colinclark> I'm pretty swamped at the moment

[17:30:35 CDT(-0500)] <thealphanerd> I figured (big grin)

[17:30:36 CDT(-0500)] <colinclark> but I will look

[17:30:37 CDT(-0500)] <colinclark> (smile)

[17:30:46 CDT(-0500)] <thealphanerd> it lets you install everything with a single "npm install"

[17:30:59 CDT(-0500)] <thealphanerd> including setting up the submodules

[17:31:07 CDT(-0500)] <thealphanerd> which is nice

[17:33:48 CDT(-0500)] <colinclark> yep, totally

[17:34:11 CDT(-0500)] <thealphanerd> have you worked with grunt at all?

[17:41:20 CDT(-0500)] <colinclark> A little bit

[17:41:23 CDT(-0500)] <colinclark> I will more this week (smile)

[17:53:47 CDT(-0500)] <thealphanerd> colinclark: what do you have planned this week for grunt?

[17:55:25 CDT(-0500)] <colinclark> Build scripts for Flocking

[17:57:01 CDT(-0500)] <thealphanerd> right on

[17:57:07 CDT(-0500)] <thealphanerd> it loks great for that purpose

[17:57:15 CDT(-0500)] <thealphanerd> has cool hooks into qunit too

[17:57:34 CDT(-0500)] <colinclark> yep

[17:58:14 CDT(-0500)] <thealphanerd> let me know when you start implementing that stuff

[17:58:23 CDT(-0500)] <thealphanerd> I'd be interested in contributing… looking for an excuse to learn about it

[17:58:44 CDT(-0500)] <colinclark> cool

[18:00:34 CDT(-0500)] <thealphanerd> I've been looking at it a bunch over the last couple days… was playing with reaveal.js and noticed they were using it

[18:00:38 CDT(-0500)] <thealphanerd> have you seen that project?

[18:00:55 CDT(-0500)] <thealphanerd> it is the slide show framework they used in the emscripten talk

[18:07:57 CDT(-0500)] <colinclark> I can't remember, to be honest

[18:08:05 CDT(-0500)] <colinclark> I just made a demo that actually works for Zicarelli

[18:08:13 CDT(-0500)] <colinclark> I haven't been bothered to try to debug his math

[18:08:19 CDT(-0500)] <colinclark> but it works

[18:08:39 CDT(-0500)] <colinclark> and I find it rather funny-his word-that he thinks Math.sin() creates garbage (wink)

[18:24:41 CDT(-0500)] <thealphanerd> colinclark: what was the problem with his srouce?

[18:25:03 CDT(-0500)] <colinclark> It looks like it was the wraparound conditional

[18:25:48 CDT(-0500)] <colinclark> for his phase