You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Justin Mclean <ju...@classsoftware.com> on 2013/04/20 03:48:03 UTC
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for dataProvider/selectedIndex supporting components. This covers; Grid, DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Hi,
Think you may of overwrote some (minor) existing changes to Grid.as. Git merge issue?
Double check the diffs on the comments - probably mean ASDocs generation is broken.
https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=blobdiff;f=frameworks/projects/spark/src/spark/components/Grid.as;h=320a34fed0ac32700afdf7a6f95852478d10c5f6;hp=02c71b3c2bf1674ecb883ef0c4d880c565032a47;hb=774cdd7b68759fcc93b40f8854de86824c6e4a97;hpb=531f7f2fe7aa72fa3c998d76c2de7b9b1761ee03
Thanks
Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for
dataProvider/selectedIndex supporting components. This covers; Grid,
DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Mark Kessler <ke...@gmail.com>.
The GridDoubleClickMode versions should be up to the latest because they
will be out with this next release. The setSelectedIndex prob didn't need
to, but I resolved a bug in that one that and it can change how the
selectedIndex reset value for when a dataProvider.
On Fri, Apr 19, 2013 at 10:10 PM, Justin Mclean <ju...@classsoftware.com>wrote:
> Hi,
>
> > Ok I used the Diff GUI to look at the original and the new versions and
> the
> > look correct now. Let me know if you see any new craziness.
>
>
> https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=commitdiff;h=5e6e5c36c6e713d55d4e289ec530cdb09d124002
>
> Think ant doc will work now.
>
> Note you changed the playerversion back as well was that intended?
>
> Thanks,
> Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for dataProvider/selectedIndex supporting components. This covers; Grid, DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> Ok I used the Diff GUI to look at the original and the new versions and the
> look correct now. Let me know if you see any new craziness.
https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=commitdiff;h=5e6e5c36c6e713d55d4e289ec530cdb09d124002
Think ant doc will work now.
Note you changed the playerversion back as well was that intended?
Thanks,
Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for
dataProvider/selectedIndex supporting components. This covers; Grid,
DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Mark Kessler <ke...@gmail.com>.
Ok I used the Diff GUI to look at the original and the new versions and the
look correct now. Let me know if you see any new craziness.
On Fri, Apr 19, 2013 at 10:03 PM, Justin Mclean <ju...@classsoftware.com>wrote:
> Hi,
>
> > Yeah that's weird. very minor merge differences. little things like a
> > </p> and some versioning changes on the ASDOC comments. I'll correct
> them
> > and get them back up.
>
> If you used to SVN double check any merge with Git they may not be what
> you expect. I've found that rebase seems to merge in the opposite way than
> you expect and overwrites other changes - probably just something I don't
> understand but it's annoying. (see the README issue from the other day)
>
> If you want to do a diff to see what a push will before you push try this:
> git diff origin/develop HEAD
>
> Thanks,
> Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for dataProvider/selectedIndex supporting components. This covers; Grid, DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> Yeah that's weird. very minor merge differences. little things like a
> </p> and some versioning changes on the ASDOC comments. I'll correct them
> and get them back up.
If you used to SVN double check any merge with Git they may not be what you expect. I've found that rebase seems to merge in the opposite way than you expect and overwrites other changes - probably just something I don't understand but it's annoying. (see the README issue from the other day)
If you want to do a diff to see what a push will before you push try this:
git diff origin/develop HEAD
Thanks,
Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for
dataProvider/selectedIndex supporting components. This covers; Grid,
DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Mark Kessler <ke...@gmail.com>.
Yeah that's weird. very minor merge differences. little things like a
</p> and some versioning changes on the ASDOC comments. I'll correct them
and get them back up.
On Fri, Apr 19, 2013 at 9:48 PM, Justin Mclean <ju...@classsoftware.com>wrote:
> Hi,
>
> Think you may of overwrote some (minor) existing changes to Grid.as. Git
> merge issue?
>
> Double check the diffs on the comments - probably mean ASDocs generation
> is broken.
>
>
> https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=blobdiff;f=frameworks/projects/spark/src/spark/components/Grid.as;h=320a34fed0ac32700afdf7a6f95852478d10c5f6;hp=02c71b3c2bf1674ecb883ef0c4d880c565032a47;hb=774cdd7b68759fcc93b40f8854de86824c6e4a97;hpb=531f7f2fe7aa72fa3c998d76c2de7b9b1761ee03
>
> Thanks
> Justin
Re: git commit: [flex-sdk] - FLEX-33498: Adding new feature for dataProvider/selectedIndex supporting components. This covers; Grid, DataGrid, ListBase, ComboBox, DropDownList, List, ButtonBar, TabBar, ButtonBarBase
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
Yep "ant doc" is broken in /frameworks/projects/spark.
Looks like the build process is not picking up the error either as it say "BUILD SUCCESSFUL" when it isn't.
Justin