Page Comparison

[08:30:55 CDT(-0500)] <colinclark> Justin_o: I'm just trying to wrangle my to do list
[08:31:04 CDT(-0500)] <colinclark> and since you're the King, you have the biggest say in it
[08:31:35 CDT(-0500)] <Justin_o> colinclark: Okay... which part are you looking at?
[08:31:51 CDT(-0500)] <colinclark> It seems to me that one of my top priorities is code reviewing pull requests at the moment
[08:31:59 CDT(-0500)] <colinclark> since I'm sure you don't want a backlog of those
[08:32:08 CDT(-0500)] <Justin_o> colinclark: yes.. definitely not
[08:32:30 CDT(-0500)] <colinclark> So, I see a pull request from last night from amb26
[08:32:42 CDT(-0500)] <Justin_o> colinclark: i was actually just looking at that one
[08:32:46 CDT(-0500)] <colinclark> excellent!
[08:32:46 CDT(-0500)] <Justin_o> for the renderOnInit
[08:32:53 CDT(-0500)] <colinclark> yep, that one
[08:32:56 CDT(-0500)] <colinclark> I'll be happy to see that
[08:33:17 CDT(-0500)] <Justin_o> colinclark: yes, me too..
[08:33:21 CDT(-0500)] <colinclark> It seems like Antranig's code review of cindyli's and my Image Gallery was helpful from a framework perspective
[08:33:48 CDT(-0500)] <colinclark> So, I think there were two pull requests from mlam
[08:34:17 CDT(-0500)] <colinclark> FLUID-4256, the Uploader FormData issue in Firefox 3.6
[08:34:20 CDT(-0500)] <Justin_o> colinclark: he's has 3 open
[08:34:23 CDT(-0500)] <colinclark> Iokay
[08:34:31 CDT(-0500)] <colinclark> which are the other two?
[08:34:36 CDT(-0500)] <Justin_o> FLUID-4243
[08:34:50 CDT(-0500)] <Justin_o> which can also close out FLUID-4242 and FLUID-4241 I think
[08:35:03 CDT(-0500)] <Justin_o> and FLUID-4240
[08:35:16 CDT(-0500)] <colinclark> ok
[08:35:24 CDT(-0500)] <colinclark> Just for the record, I love Firefox app tabs
[08:35:38 CDT(-0500)] <Justin_o> colinclark: somehow i lost all of mine..
[08:35:46 CDT(-0500)] <Justin_o> must have reset the cache or something
[08:35:54 CDT(-0500)] <colinclark> eek
[08:35:55 CDT(-0500)] <colinclark> that sucks
[08:36:02 CDT(-0500)] <colinclark> I'm now using Tab Groups, too
[08:36:11 CDT(-0500)] <Justin_o> colinclark: are they working for you?
[08:36:22 CDT(-0500)] <colinclark> even though a beta version ate all my tabs, it seems to be a good workaround for the fact that Firefox gets really slow with more than 20 or so tabs
[08:36:27 CDT(-0500)] <colinclark> especially if there is Flash in any of them
[08:37:05 CDT(-0500)] <Justin_o> colinclark: yes.. i've found firefox to eat up lots of my ram
[08:37:14 CDT(-0500)] <Justin_o> although that might have been firebug
[08:37:27 CDT(-0500)] <Justin_o> how does firebug work with the tab groups
[08:37:59 CDT(-0500)] <Justin_o> if you accidentally leave it on and switch groups
[08:38:06 CDT(-0500)] <colinclark> I haven't tried it
[08:38:12 CDT(-0500)] <colinclark> I tend to keep one tab group for code
[08:38:17 CDT(-0500)] <colinclark> other for various types of research or reading
[08:38:23 CDT(-0500)] <Justin_o> colinclark: that makes sense
[08:38:43 CDT(-0500)] <colinclark> So, Justin_o, my code review to do list now looks like this: FLUID-4240, FLUID-4243, FLUID-4256
[08:38:47 CDT(-0500)] <colinclark> anything else I should add to it?
[08:42:19 CDT(-0500)] <Justin_o> colinclark: FLUID-3878
[08:43:08 CDT(-0500)] <Justin_o> colinclark: did you want me to take care of FLUID-4259? it seems like it could just go in, if it works
[08:43:53 CDT(-0500)] <colinclark> Does the code look good?
[08:45:11 CDT(-0500)] <Justin_o> colinclark: it doesn't really do much.. it just checks if the renderOnInit option is truethy and will call that.refreshView() if it is
[08:45:12 CDT(-0500)] <Justin_o> https://github.com/amb26/infusion/commit/774b1efb660f4727a8a1b9eb0c43a3620ecd65e5
[08:45:19 CDT(-0500)] <colinclark> I figured
[08:45:48 CDT(-0500)] <colinclark> He's got a unit test for it
[08:45:49 CDT(-0500)] <colinclark> it's fine
[08:45:50 CDT(-0500)] <colinclark> go for it
[08:46:03 CDT(-0500)] <Justin_o> colinclark: okay.. thanks... i'll get it in shortly then
[08:49:08 CDT(-0500)] <colinclark> thanks, Justin_o
[09:02:11 CDT(-0500)] <mpolizzotti> Morning everyone. I'm using the simple inline edit component with infusion 1.3 and and I am running into an issue where the text I enter into the input field seems to be mis-handled some how and becomes stored in the DOM (flc-inlineEdit-textEditButton) container as Edit text [object Object]. Has anyone experienced this before?
[09:05:08 CDT(-0500)] <Justin_o> mpolizzotti: do you have an example running somewhere, or have some code you could point us at?
[09:06:35 CDT(-0500)] <mpolizzotti> I have the code running on my local environment. Its tough to show you because its running inside of a portal and I have not been able to replicate this issue outside of the portal.
[09:07:00 CDT(-0500)] <mpolizzotti> I was just wondering if any one could shed some light on what might cause that to happen.
[09:07:34 CDT(-0500)] <mpolizzotti> It feels like the portal is some how conflicting with the component.
[09:08:10 CDT(-0500)] <Justin_o> mpolizzotti: could be.. it seems that you are getting an object instead of text passed in.. so it could be something wrong with components model or path into it
[09:09:35 CDT(-0500)] <mpolizzotti> Okay. I'm going to keep playing with it. I will let you know if I can provide a more concrete example.
[09:09:40 CDT(-0500)] <mpolizzotti> Thank you.
[09:09:42 CDT(-0500)] <heidi_> Justin_o we'll have to add comic sans to our fss-text.css
[09:09:51 CDT(-0500)] <heidi_> cindyli is implementing the new UIO styles now
[09:09:56 CDT(-0500)] <Justin_o> mpolizzotti: sure.. sorry i couldn't be more helpful
[09:10:35 CDT(-0500)] <Justin_o> heidi_: okay.. will it be added as part of the jira that cindyli is working on?
[09:10:46 CDT(-0500)] <Justin_o> heidi_: also is that font cross browser compliant?
[09:11:06 CDT(-0500)] <mpolizzotti> No problem. I am going to try to replicate the portal env. in an example file to see if I am getting the same error.
[09:11:24 CDT(-0500)] <heidi_> Justin_o that would be great. also could you investigate where we're at with theme choices. i haven't had a chance to look at anastasiac's yellow/black additions
[09:11:39 CDT(-0500)] <heidi_> cindyli is wondering about which themes are black/white white/black too
[09:12:14 CDT(-0500)] <Justin_o> heidi_,cindyli: the current black/whie and white/black are the hc and hci themes.. those are high contrast and high contrast inverted
[09:12:32 CDT(-0500)] <cindyli> ic. thx, Justin_o
[09:12:43 CDT(-0500)] <heidi_> right .. so cindyli: black on white is HCI and white on black is HCI inverted
[09:12:54 CDT(-0500)] <Justin_o> heidi_: i think jameswy will review all the themes.. he gave a pass over the yellow and black one already for anastasiac
[09:12:56 CDT(-0500)] <cindyli> thx, heidi_
[09:13:07 CDT(-0500)] <heidi_> great, thanks jameswy
[09:13:10 CDT(-0500)] <cindyli> Justin_o: heidi_, and which theme for "simplify layout". the "fl-layout-linear" we used previously does not work any more
[09:13:33 CDT(-0500)] <heidi_> cindyli fl-layout-linear is the correct one. Justin_o is the new linear in the trunk?
[09:14:20 CDT(-0500)] <Justin_o> heidi_: it should be
[09:14:32 CDT(-0500)] <Justin_o> heidi_, cindyli: yes it is
[09:16:42 CDT(-0500)] <Justin_o> cindyli, heidi_, michelled_: I pushed in Bosmon's changes for FLUID-4259
[09:17:38 CDT(-0500)] <Justin_o> you can now specify an option "renderOnInit" so you don't need to always call that.refreshView() manually in your final init anymore...
[09:18:09 CDT(-0500)] <cindyli> awsome
[09:20:06 CDT(-0500)] <cindyli> Justin_o: do u know if i still can use this option is that.refreshView() needs to be called in the callback func of fluid.fetchResources()?
[09:20:21 CDT(-0500)] <cindyli> sorry, not "is", if
[09:25:11 CDT(-0500)] <Justin_o> cindyli: i'm not sure.. i guess it depends on where that function is called
[09:27:25 CDT(-0500)] <Justin_o> cindyli: https://github.com/fluid-project/infusion/blob/master/src/webapp/framework/renderer/js/RendererUtilities.js#L211-213
[09:27:59 CDT(-0500)] <Justin_o> you can see from there, that it is called right at the end of the initRendererComponent function, right before it returns that
[09:28:41 CDT(-0500)] <Justin_o> cindyli: so i would assume that in the case you mentioned you wouldn't be able to replace the callback
[09:30:27 CDT(-0500)] <cindyli> ic. thanks, Justin_o
[10:06:37 CDT(-0500)] <colinclark> mlam: I just saw your note on FLUID-3999
[10:06:48 CDT(-0500)] <colinclark> About http://issues.fluidproject.org/browse/FLUID-4223
[10:07:01 CDT(-0500)] <colinclark> I was fairly certain that this was fixed last week
[10:07:05 CDT(-0500)] <colinclark> Are they still failing?
[10:07:54 CDT(-0500)] <mlam> ah crap. i put the wrong JIRA number. I meant FLUID-4238..sorry.
[10:08:03 CDT(-0500)] <mlam> too many JIRA numbers. thanks for catching that.
[10:08:21 CDT(-0500)] <colinclark> While we're at it, can you double-check FLUID-4223 and resolve it if they are passing now?
[10:08:25 CDT(-0500)] <colinclark> I should have done that, I'm sorry
[10:08:33 CDT(-0500)] <mlam> Yup, I will
[10:08:43 CDT(-0500)] <colinclark> I'll work on FLUID-4238 asap
[10:09:03 CDT(-0500)] <colinclark> But in the meantime, my branch is working quite nicely in IE6
[10:09:20 CDT(-0500)] <colinclark> an occasional error in IE8 and rumours of other problems in IE7
[10:09:43 CDT(-0500)] <colinclark> but if you just need to do some testing, my branch should resolve FLUID-4238 under most circumstances
[10:09:56 CDT(-0500)] <colinclark> https://github.com/colinbdclark/image-gallery
[10:10:20 CDT(-0500)] <mlam> ah, ok, cool
[10:10:56 CDT(-0500)] <colinclark> cindyli: So, I'm still slightly puzzled by the troubles you were having with the refactored image-gallery and file type filtering the other day
[10:11:06 CDT(-0500)] <colinclark> Since I did merge mlam's new API into the project repo
[10:11:38 CDT(-0500)] <colinclark> I'll take a look as soon as I can, but you're super sure that you were using the latest version of Infusion from the project repo when you were doing your tests?
[10:11:47 CDT(-0500)] <cindyli> colinclark: what i had was with IE 7 & 8
[10:11:59 CDT(-0500)] <cindyli> one sec, bringing up ie
[10:12:08 CDT(-0500)] <colinclark> You noticed three issues with IE
[10:12:15 CDT(-0500)] <colinclark> 1. File types weren't getting filtered correctly
[10:12:22 CDT(-0500)] <colinclark> 2. IE8 was causing an error
[10:12:47 CDT(-0500)] <colinclark> 3. IE7 was still infinitely looping
[10:12:53 CDT(-0500)] <colinclark> #2 is definitely an issue
[10:12:58 CDT(-0500)] <colinclark> I haven't tried #3 yet myself
[10:13:02 CDT(-0500)] <colinclark> and #1 I couldn't reproduce
[10:13:15 CDT(-0500)] <colinclark> So mlam's changes involved standardizing on a format like this for fileTypes:
[10:13:24 CDT(-0500)] <colinclark> ["image/jpeg", "image/png"]
[10:13:32 CDT(-0500)] <colinclark> this gives us a consistent, cross-version API for file types
[10:13:35 CDT(-0500)] <cindyli> colinclark: umm.. tried again with ie8, cannot reproduce
[10:13:40 CDT(-0500)] <colinclark> ah, interesting
[10:13:41 CDT(-0500)] <cindyli> let me try more
[10:13:44 CDT(-0500)] <colinclark> maybe that's good news
[10:14:00 CDT(-0500)] <cindyli> certainly. hope it persists
[10:14:05 CDT(-0500)] <colinclark> and then the Flash strategy converts that back into the old ".jpg;.jpeg;*.png" format that SWFUpload requires
[10:14:43 CDT(-0500)] <colinclark> So, in the Image Gallery's "settings" component, what I do is just join(",") and split(",") that array of file types for presentation in the UI
[10:14:54 CDT(-0500)] <colinclark> not a nice UI for real users, but good enough for testing, I hope
[10:16:28 CDT(-0500)] <cindyli> colinclark: confirmed that "file types filtering" issue is gone.
[10:16:32 CDT(-0500)] <colinclark> yay
[10:16:34 CDT(-0500)] <colinclark>
[10:16:40 CDT(-0500)] <colinclark> One down, two to go
[10:16:54 CDT(-0500)] <cindyli> one step further
[11:25:20 CDT(-0500)] <athena> hey folks
[11:25:46 CDT(-0500)] <athena> i'm debugging a uportal inline edit issue and wondering if the documentation just needs an update or if something odd is going on
[11:26:04 CDT(-0500)] <athena> the onFinishEdit event looks like the first two parameters should be strings
[11:26:21 CDT(-0500)] <athena> but the first parameter (newValue) appears to be the whole inline edit HTML element
[11:29:38 CDT(-0500)] <mpolizzotti> Hey Jen. Are you trying to debug the [object Object] issue that shows up in the inline edit component?
[11:30:14 CDT(-0500)] <mpolizzotti> I commented out the events and I was still seeing the issue.
[11:32:06 CDT(-0500)] <athena> yeah, looks like there are a couple things going on
[11:32:35 CDT(-0500)] <mpolizzotti> It looks like some conflict is happening.
[11:32:42 CDT(-0500)] <mpolizzotti> I couldn't figure out where though.
[11:34:03 CDT(-0500)] <mpolizzotti> I also turned off the other tab interactions to see if they were causing the issue.
[11:36:06 CDT(-0500)] <athena> dunno
[11:36:15 CDT(-0500)] <athena> this tutorial hasn't been updated since 1.2, so not sure if there are changes
[11:36:34 CDT(-0500)] <mpolizzotti> so, i was able to find updates for 1.3
[11:36:45 CDT(-0500)] <mpolizzotti> I'll grab it...
[11:38:03 CDT(-0500)] <mpolizzotti> http://fluidproject.org/releases/1.3.1/demos/inlineEdit/simple/demo.html
[11:38:27 CDT(-0500)] <mpolizzotti> http://wiki.fluidproject.org/display/fluid/Simple+Text+Inline+Edit+API
[11:38:36 CDT(-0500)] <mpolizzotti> The api page has updates for 1.3.1
[11:38:40 CDT(-0500)] <athena> thanks
[11:38:44 CDT(-0500)] <mpolizzotti> Is that what your looking at?
[11:39:04 CDT(-0500)] <athena> yeah, pretty much
[11:39:56 CDT(-0500)] <mpolizzotti> Is it possible the portal's jQuery library and version of fluid we are using is causing the issues?
[11:41:19 CDT(-0500)] <athena> i don't think so
[11:41:45 CDT(-0500)] <athena> i believe fluid 1.4 is targeted to jquery 1.5
[11:41:53 CDT(-0500)] <colinclark> 16.1, actually
[11:41:59 CDT(-0500)] <colinclark> sorry, 1.6.1
[11:42:04 CDT(-0500)] <athena> ah, thanks colinclark
[11:42:06 CDT(-0500)] <colinclark> Let's hope there is never a jQuery version 16
[11:42:11 CDT(-0500)] <athena> in that case i should get us updated
[11:42:29 CDT(-0500)] <colinclark> We just pushed fixes for 1.6.1 a few days ago as part of the Infusion 1.4 bug parade
[11:42:46 CDT(-0500)] <colinclark> things are changing fast and furiously
[11:43:07 CDT(-0500)] <colinclark> Unfortunately there were quite a number of API changes in jQuery between 1.4-1.6.1
[11:43:16 CDT(-0500)] <colinclark> and they seemed to make new ones for each version in between
[11:43:34 CDT(-0500)] <colinclark> So there's some risk that your existing code could potentially break like ours did on the way to 1.6.1
[11:43:37 CDT(-0500)] <colinclark> which really sucks
[11:43:51 CDT(-0500)] <athena> ugh
[11:43:58 CDT(-0500)] <mpolizzotti> Could that be part of our problem. Colin, have you seen an issue with the inline edit component where the text entered appears mis-handled and renders as [object Object]?
[11:44:11 CDT(-0500)] <athena> what version of jquery ui do we need to be using?
[11:45:13 CDT(-0500)] <colinclark> If you're using the latest out of our Git project repo, here's what you need:
[11:45:16 CDT(-0500)] <colinclark> jQuery 1.6.1
[11:45:18 CDT(-0500)] <colinclark> jQuery UI 1.8.12
[11:45:28 CDT(-0500)] <colinclark> As for the Inline Edit issue, no
[11:45:31 CDT(-0500)] <colinclark> that sounds pretty wild
[11:45:38 CDT(-0500)] <colinclark> any chance you've been able to reproduce it in a simpler context?
[11:45:59 CDT(-0500)] <mpolizzotti> Not yet.
[11:46:09 CDT(-0500)] <colinclark> ok
[11:46:13 CDT(-0500)] <athena> i'll do a quick update for jquery / jquery ui
[11:46:20 CDT(-0500)] <colinclark> Anything I can do in the interim?
[11:46:24 CDT(-0500)] <colinclark> I'm happy to help if I can
[11:46:25 CDT(-0500)] <athena> this problem existed when we had fluid 1.3 as well though
[11:46:42 CDT(-0500)] <mpolizzotti> But did not at fluid 1.2...right?
[11:46:46 CDT(-0500)] <athena> correct
[11:46:52 CDT(-0500)] <colinclark> ah, interesting
[11:47:14 CDT(-0500)] <colinclark> let me have a look at the changes to Inline Edit between 1.2 and 1.3.1
[11:47:19 CDT(-0500)] <colinclark> were you running 1.3 or 1.3.1?
[11:47:26 CDT(-0500)] <colinclark> I'm sure it wouldn't make a difference, but who knows?
[11:47:43 CDT(-0500)] <mpolizzotti> I tested yesterday against 1.3 and the 1.4 beta
[11:48:07 CDT(-0500)] <mpolizzotti> The issue happened in both cases.
[11:53:25 CDT(-0500)] <colinclark> Inline Edit certainly changed a lot in 1.3, with lots of new accessibility features, etc.
[11:53:34 CDT(-0500)] <colinclark> but the API should have stayed consistent
[11:53:51 CDT(-0500)] <colinclark> I remember Justin_o and mlam agonizing over not breaking backwards API compatibility
[11:53:59 CDT(-0500)] <colinclark> I don't see anything noteworthy in the diff
[12:01:45 CDT(-0500)] <athena> thanks
[13:59:19 CDT(-0500)] <colinclark> mlam: Any requests for which pull request I start with?
[14:24:58 CDT(-0500)] <mlam> colinclark: anyone is fine. lots of the newer ones are small
[14:25:07 CDT(-0500)] <mlam> although the error handler would be nice to have in
[14:26:54 CDT(-0500)] <colinclark> yeah, that one is going to need some work
[14:26:59 CDT(-0500)] <colinclark> so I'm going to do the small ones first
[14:27:06 CDT(-0500)] <mlam> ok
[14:27:52 CDT(-0500)] <colinclark> So, I'm looking at FLUID-4243 at the moment
[14:27:57 CDT(-0500)] <colinclark> Removing the buttons from the demo
[14:28:01 CDT(-0500)] <colinclark> I'm just sort of thinking about it
[14:28:13 CDT(-0500)] <colinclark> I don't imagine the demo looked like this before the buttons were added?
[14:28:33 CDT(-0500)] <colinclark> Our demos are really quick ways to teach our users how use a component
[14:29:11 CDT(-0500)] <colinclark> I wonder if this is sort of overly complex? https://github.com/mlam/infusion/blob/FLUID-4243/src/webapp/demos/uploader/js/uploader.js
[14:31:11 CDT(-0500)] <mlam> Yah, I'm not sure what it looked like before. It's definitely a little complex for what we need.
[14:31:17 CDT(-0500)] <colinclark> Like, for example, the bizarre indirection
[14:31:25 CDT(-0500)] <colinclark> of makeInitUploaderFunc
[14:31:40 CDT(-0500)] <colinclark> which just wraps a call to fluid.uploader()
[14:31:54 CDT(-0500)] <colinclark> I can't imagine this is how we want to showcase the Uploader, eh?
[14:32:29 CDT(-0500)] <mlam> Right
[14:33:51 CDT(-0500)] <colinclark> Okay
[14:33:55 CDT(-0500)] <colinclark> I'll finish this
[14:34:39 CDT(-0500)] <mlam> ok, cool
[14:54:51 CDT(-0500)] <colinclark> mlam: How's this? https://github.com/fluid-project/infusion/blob/master/src/webapp/demos/uploader/js/uploader.js
[14:55:12 CDT(-0500)] <mlam>
[14:55:48 CDT(-0500)] <mlam> much better
[14:56:19 CDT(-0500)] <colinclark> okay, great
[14:56:20 CDT(-0500)] <colinclark> I'll j
[14:56:20 CDT(-0500)] <colinclark> u
[14:56:21 CDT(-0500)] <colinclark> st
[14:56:23 CDT(-0500)] <colinclark> wow
[14:56:26 CDT(-0500)] <colinclark> my IRC client sucks
[14:56:32 CDT(-0500)] <colinclark> I'll just test it on IE6
[15:02:39 CDT(-0500)] <mlam> ok
[15:05:32 CDT(-0500)] <colinclark> mlam and Justin_o: FLUID-4243 is reviewed, merged, resolved and committed
[15:05:52 CDT(-0500)] <mlam> awesome
[15:06:01 CDT(-0500)] <Justin_o> colinclark: great
[15:10:40 CDT(-0500)] <colinclark> Justin_o: you must be glad not to have to tend to the bug parade emails anymore
[15:11:19 CDT(-0500)] <Justin_o> colinclark: yes.. it's nice not to have to try to keep up with all the changes
[15:13:06 CDT(-0500)] <colinclark> ack Justin_o
[15:13:13 CDT(-0500)] <colinclark> I just did a merge and forgot --no-ff
[15:13:16 CDT(-0500)] <colinclark> Did I just flip the graph?
[15:13:18 CDT(-0500)] <Justin_o> colinclark: are you looking at the graph
[15:13:24 CDT(-0500)] <Justin_o> yes.. i was just looking at that..
[15:13:27 CDT(-0500)] <colinclark> shoot
[15:13:31 CDT(-0500)] <Justin_o> okay if no one commits we can fix this pretty easily
[15:13:36 CDT(-0500)] <Justin_o> or updates
[15:13:38 CDT(-0500)] <colinclark> cool
[15:13:40 CDT(-0500)] <colinclark> what's my next step?
[15:13:52 CDT(-0500)] <Justin_o> colinclark: so first you will want to reset to the commit before the merge
[15:13:55 CDT(-0500)] <Justin_o> git reset commit hash
[15:14:21 CDT(-0500)] <Justin_o> colinclark: did you want me to do that.. get the master branch back to where it was?
[15:14:32 CDT(-0500)] <Justin_o> then you can redo the merge?
[15:14:34 CDT(-0500)] <colinclark> I'm happy to do it if you're willing to walk me through it
[15:14:42 CDT(-0500)] <Justin_o> colinclark: no problem
[15:14:53 CDT(-0500)] <Justin_o> okay... so let me know when you have your master reset
[15:14:57 CDT(-0500)] <colinclark> Looks to me like that has should be a1a9981e8ee9cffd781e
[15:15:06 CDT(-0500)] <colinclark> You merged FLUID-4259
[15:15:15 CDT(-0500)] <colinclark> Does that look correct?
[15:15:19 CDT(-0500)] <Justin_o> colinclark: yep i think that's right
[15:15:31 CDT(-0500)] <Justin_o> oh and when you reset use the --hard flag
[15:16:12 CDT(-0500)] <colinclark> ok, done
[15:16:45 CDT(-0500)] <Justin_o> okay now go the infusion repo in github.. go to the admin section and change the default branch to the mfss-firefox one
[15:17:01 CDT(-0500)] <colinclark> yep
[15:17:02 CDT(-0500)] <colinclark> done
[15:17:13 CDT(-0500)] <Justin_o> now delete the master repo from github
[15:17:17 CDT(-0500)] <colinclark> oh wow
[15:17:19 CDT(-0500)] <colinclark> scary
[15:17:28 CDT(-0500)] <Justin_o> colinclark: yes.. but don't worry.. we all have copies
[15:17:49 CDT(-0500)] <colinclark> I'm cloning a backup just in case
[15:17:50 CDT(-0500)] <colinclark>
[15:17:59 CDT(-0500)] <Justin_o> colinclark: always good to be careful
[15:19:11 CDT(-0500)] <colinclark> So, to delete the master branch from github
[15:19:20 CDT(-0500)] <colinclark> you want me to push nothing master?
[15:19:26 CDT(-0500)] <colinclark> like git push origin :master
[15:19:27 CDT(-0500)] <colinclark> ?
[15:19:56 CDT(-0500)] <colinclark> Justin_o ^
[15:20:06 CDT(-0500)] <Justin_o> colinclark: yes
[15:20:10 CDT(-0500)] <colinclark> hokay
[15:21:02 CDT(-0500)] <colinclark> okay, what next, Justin_o?
[15:23:37 CDT(-0500)] <mlam> Justin_o: I think we're still having a JIRA workflow problem from Needs commit to Closed. The latest JIRA that colinclark closed, FLUID-4243, isn't updated as FIXED in the Bug Parade list.
[15:24:11 CDT(-0500)] <Justin_o> colinclark: sorry.. okay.. so now push up your master
[15:24:23 CDT(-0500)] <Justin_o> and then reset the default branch back to the master branch
[15:24:34 CDT(-0500)] <Justin_o> then you can remerge locally and push that up to the project repo
[15:24:54 CDT(-0500)] <colinclark> okay, and now time has been rewound by 6 hours
[15:25:03 CDT(-0500)] <colinclark> thanks, king
[15:25:11 CDT(-0500)] <Justin_o> np
[15:33:22 CDT(-0500)] <colinclark> Justin_o: Do you remember if the code view in the demo portal has always been broken in IE6?
[15:33:33 CDT(-0500)] <Justin_o> colinclark: yes
[15:33:38 CDT(-0500)] <colinclark> ok, cool
[15:33:39 CDT(-0500)] <Justin_o> it doesn't work so well in IE in general
[15:33:43 CDT(-0500)] <colinclark> i'm all about IE6 these days
[15:33:47 CDT(-0500)] <colinclark> it makes me feel so retro
[15:33:59 CDT(-0500)] <Justin_o> back in the '90s
[15:34:04 CDT(-0500)] <colinclark> like how people wear clothes nowadays that look like they're from the'80s
[15:34:06 CDT(-0500)] <colinclark> yeah, exactly
[15:34:31 CDT(-0500)] <Justin_o> now i'm thinking about the Jays winning the world series
[15:34:41 CDT(-0500)] <colinclark> yay!
[15:34:46 CDT(-0500)] <colinclark> jessm: Back2Back!
[15:34:57 CDT(-0500)] <colinclark> jessm was all like...
[15:35:02 CDT(-0500)] <colinclark> "Y'all have a baseball team?"
[15:35:40 CDT(-0500)] <colinclark> wow, so Justin_o
[15:35:55 CDT(-0500)] <colinclark> my pushing up the master caused all of Infusion's history to be replayed on the commits list
[15:36:01 CDT(-0500)] <colinclark> tell me I didn't screw something else up
[15:36:25 CDT(-0500)] <colinclark> Speaking of retro
[15:37:09 CDT(-0500)] <Justin_o> colinclark: hmm.. not sure why that happend.. i don't remember that happening when i pushed things back up, but i guess there was actually a change then
[15:37:36 CDT(-0500)] <colinclark> well, I'm the bug parade dunce for the day
[15:37:37 CDT(-0500)] <Justin_o> colinclark: the project repo looks okay though
[15:37:41 CDT(-0500)] <colinclark> cool
[15:37:45 CDT(-0500)] <colinclark> so I'm safe to repush?
[15:37:52 CDT(-0500)] <Justin_o> colinclark: i think so
[15:38:25 CDT(-0500)] <Justin_o> colinclark: i always push to my own github repo first to make sure everything is okay, before pushing up to the project repo
[15:38:57 CDT(-0500)] <colinclark> for every change, Justin_o?
[15:39:04 CDT(-0500)] <colinclark> or just when you're reinventing the entire history of the repo?
[15:39:06 CDT(-0500)] <colinclark>
[15:40:55 CDT(-0500)] <Justin_o> colinclark: before i ever push to the project repo
[15:40:57 CDT(-0500)] <Justin_o> for anything
[15:41:03 CDT(-0500)] <colinclark> that's pretty smart
[15:41:13 CDT(-0500)] <colinclark> so, walk me through that workflow, then
[15:41:31 CDT(-0500)] <Justin_o> colinclark: so let's say i'm going to merge in a pull request
[15:41:43 CDT(-0500)] <Justin_o> 1) check out the code test it, etc..
[15:41:58 CDT(-0500)] <Justin_o> 2) make sure my master is up-to-date
[15:42:06 CDT(-0500)] <Justin_o> 3) merge the remote branch into my master
[15:42:12 CDT(-0500)] <Justin_o> 4) push to my own project repo
[15:42:21 CDT(-0500)] <Justin_o> 5) verify everything is okay there
[15:42:40 CDT(-0500)] <Justin_o> 6) if that is all okay, push to the upstream repo
[15:42:45 CDT(-0500)] <Justin_o> 7) verify that's okay
[15:42:52 CDT(-0500)] <Justin_o> I think that's about it
[15:43:19 CDT(-0500)] <colinclark> okay, that seems pretty reasonable
[15:47:52 CDT(-0500)] <lahabana> hello all
[15:48:17 CDT(-0500)] <colinclark> Hi lahabana
[15:48:28 CDT(-0500)] <lahabana> hi colin
[15:49:07 CDT(-0500)] <lahabana> I'm on the videoPlayer seen the Jira page you sent me earlier
[15:50:07 CDT(-0500)] <lahabana> I've been working on this issue : "Display the length of the video to the user in minutes and seconds"
[15:50:26 CDT(-0500)] <lahabana> and I've also tried to know how I should act when I get in something
[15:50:40 CDT(-0500)] <lahabana> should I comment to say I'm on it ?
[15:51:12 CDT(-0500)] <lahabana> I'm sorry that might be a stupid question but it's the first time I take part in a large free software organisation
[15:51:30 CDT(-0500)] <lahabana> so I don't really know how to do
[15:51:43 CDT(-0500)] <lahabana> I've searched on the wiki but didn't find anything
[15:53:22 CDT(-0500)] <lahabana> I would be greatful if you could explain me briefly how I should do through the fixing of an issue
[16:06:44 CDT(-0500)] <lahabana> would it be better for me to fork the code and make pull requests or to submit patches ?
[16:25:54 CDT(-0500)] <colinclark> shoot, I missed lahabana
[16:26:05 CDT(-0500)] <colinclark> oh well, hopefully he'll be back
[16:50:49 CDT(-0500)] <colinclark> Bosmon: I just wanted to follow up about your code review from last night
[16:51:10 CDT(-0500)] <colinclark> Your first point, about the "undefined" test on line 140
[16:51:20 CDT(-0500)] <colinclark> this code:
[16:51:22 CDT(-0500)] <colinclark> if (typeof (that.uploader.strategy.engine) !== "undefined") {
[16:51:41 CDT(-0500)] <colinclark> I think it was poorly thought out