You know, let's not rebase it, because it does modify the history. We should remove and document why we did it instead, since that would be more transparent. Or we could just leave it in and say "don't do this next time". I'm not that invested in it.
On Thu, Apr 12, 2012 at 4:04 PM, Shazron <[email protected]> wrote: > If we take out that iOS commit in cordova-js (somehow), it should be > fine. cordova-ios 1.6.1 will then just be the same as 1.6.0. > > On Thu, Apr 12, 2012 at 4:02 PM, Filip Maj <[email protected]> wrote: > > > >>Is it too much to drop the new commit that changed the common js API, and > >>reapply it after we tag 1.6.1, and figure this one thing out for 1.7? > > > > That sounds very good to me but I am under the impression that iOS > > requires this commit? Like I said I'm quite confused. > > > >> > >>I also have some cordova-js commits to add to 1.6.1? Although nothing > that > >>modifies any js outside of what is built for wp7. ( ie, all in my > platform > >>specific plugins folder ) > >> > > > > O then it sounds like I tagged the JS 1.6.1 too early anyways.. > > > >> > >> > >> > >>On Thu, Apr 12, 2012 at 3:51 PM, Shazron <[email protected]> wrote: > >> > >>> No - it's about a user's contribution being noted (it exists), I will > >>> move it out of the common code post-1.6.1 (I acknowledge my mistake in > >>> allowing it in the first place). Can we branch off 1.6.0 then > >>> cherry-pick Fil's latest fix for 1.6.1? > >>> > >>> On Thu, Apr 12, 2012 at 3:47 PM, Joe Bowser <[email protected]> wrote: > >>> > OK, so you're proposing that we leave the thing in the common JS, > even > >>> > though it's not supposed to be there. > >>> > > >>> > On Thu, Apr 12, 2012 at 3:45 PM, Shazron <[email protected]> wrote: > >>> > > >>> >> Will rebasing lose that commit? Then, no. > >>> >> > >>> >> On Thu, Apr 12, 2012 at 3:43 PM, Joe Bowser <[email protected]> > >>>wrote: > >>> >> > So, can we just rebase the head, push this out and get this > >>>rolling? > >>> >> > > >>> >> > On Thu, Apr 12, 2012 at 3:43 PM, Filip Maj <[email protected]> wrote: > >>> >> > > >>> >> >> Correct, those iOS-specific parameters (like allow edit and those > >>> ones) > >>> >> >> existed prior to cordova-js, so yeah, we left them in there as we > >>> didn't > >>> >> >> want to remove without deprecation. > >>> >> >> > >>> >> >> If you can deal with the iOS issue without needing an API > >>>extension: > >>> >> then > >>> >> >> do that. If not, leave it in there, but docs need to updated too. > >>> >> >> > >>> >> >> Extending and changing the public API is a long and difficult > >>>process > >>> >> for > >>> >> >> us and will only get tougher with every platform we add support > >>>to. > >>> >> >> > >>> >> >> On 4/12/12 3:37 PM, "Shazron" <[email protected]> wrote: > >>> >> >> > >>> >> >> >Then we have to scrap the other three(?) iOS parameters ones > that > >>> >> >> >already exist in common if you noticed. Don't know how we merge > >>> >> >> >(unmerge?) this one properly because taking those out will break > >>> >> >> >everyone that is using it, but a deprecation is the way to go as > >>>per > >>> >> >> >http://wiki.apache.org/cordova/DeprecationPolicy . We can > remove > >>> this > >>> >> >> >new commit and I'll find a way to get this in somehow. > >>> >> >> > > >>> >> >> > > >>> >> >> > > >>> >> >> >On Thu, Apr 12, 2012 at 3:32 PM, Joe Bowser <[email protected]> > >>> wrote: > >>> >> >> >> The problem is that this parameter doesn't belong in the > common > >>> API. > >>> >> >> >>It'd > >>> >> >> >> be just ignored in Android, but the whole point of cordova-js > >>>is > >>> so > >>> >> that > >>> >> >> >> it's common. It'd look pretty screwed up to add this to the > >>>docs, > >>> >> IMO. > >>> >> >> >> > >>> >> >> >> On Thu, Apr 12, 2012 at 3:26 PM, Shazron <[email protected]> > >>> wrote: > >>> >> >> >> > >>> >> >> >>> To fix two bugs for Camera.takePicture on iOS > >>> >> >> >>> > >>> >> >> >>> On Thu, Apr 12, 2012 at 3:24 PM, Filip Maj <[email protected]> > >>> wrote: > >>> >> >> >>> > so what's the point of this new parameter? > >>> >> >> >>> > > >>> >> >> >>> > On 4/12/12 3:16 PM, "Shazron" <[email protected]> wrote: > >>> >> >> >>> > > >>> >> >> >>> >>I did. Do we want to revert the cordova-js? I can branch > >>>1.6.0 > >>> and > >>> >> >> >>> >>cherry-pick your latest commit for 1.6.1 > >>> >> >> >>> >> > >>> >> >> >>> >>On Thu, Apr 12, 2012 at 3:04 PM, Filip Maj <[email protected]> > >>> wrote: > >>> >> >> >>> >>> I saw something in the iOS commit logs for this. > >>> >> >> >>> >>> > >>> >> >> >>> >>> Shaz can you comment? > >>> >> >> >>> >>> > >>> >> >> >>> >>> On 4/12/12 2:59 PM, "Joe Bowser" <[email protected]> > >>>wrote: > >>> >> >> >>> >>> > >>> >> >> >>> >>>>Can we revert this, since this looks like it's intended > >>>for > >>> both > >>> >> >> >>> Android > >>> >> >> >>> >>>>and iOS, but I don't think it should be in 1.6.1. > >>> >> >> >>> >>>> > >>> >> >> >>> >>>>On Thu, Apr 12, 2012 at 2:52 PM, Filip Maj < > [email protected]> > >>> >> wrote: > >>> >> >> >>> >>>> > >>> >> >> >>> >>>>> I was actually just looking at that myself. > >>> >> >> >>> >>>>> > >>> >> >> >>> >>>>> Looks like it's an iOS-only param.. sigh. We gotta > stop > >>> doing > >>> >> >> >>>that, > >>> >> >> >>> >>>>> especially if we don't update documentation. > >>> >> >> >>> >>>>> > >>> >> >> >>> >>>>> On 4/12/12 2:49 PM, "Joe Bowser" <[email protected]> > >>> wrote: > >>> >> >> >>> >>>>> > >>> >> >> >>> >>>>> >Has anyone tested the cropToSize param for > >>> Camera.getPicture > >>> >> >> >>>yet? I > >>> >> >> >>> >>>>> >didn't > >>> >> >> >>> >>>>> >notice that change until now. > >>> >> >> >>> >>>>> > > >>> >> >> >>> >>>>> >On Thu, Apr 12, 2012 at 2:46 PM, Filip Maj > >>><[email protected] > >>> > > >>> >> >> >>>wrote: > >>> >> >> >>> >>>>> > > >>> >> >> >>> >>>>> >> JS tagged 1.6.1 - the build task in the JS should > >>>work > >>> >> >> >>>properly > >>> >> >> >>> >>>>>now. > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> FYI if anyone has to modify the jake tasks in the > >>>future > >>> >> and > >>> >> >> >>>make > >>> >> >> >>> >>>>>them > >>> >> >> >>> >>>>> >> async, make sure you add the 4th "async" parameter > to > >>> the > >>> >> >> >>>task() > >>> >> >> >>> >>>>> >>function > >>> >> >> >>> >>>>> >> and set it to true, and call complete() when the > >>>task is > >>> >> done. > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> See > >>> http://howtonode.org/intro-to-jake/async-jakefile.jsfor > >>> >> >> >>>an > >>> >> >> >>> >>>>> example. > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> On 4/12/12 2:35 PM, "Joe Bowser" <[email protected] > > > >>> >> wrote: > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> >Ready to tag once cordova-js is tagged 1.6.1. > >>> >> >> >>> >>>>> >> > > >>> >> >> >>> >>>>> >> >On Thu, Apr 12, 2012 at 2:33 PM, Anis KADRI < > >>> >> >> >>> [email protected]> > >>> >> >> >>> >>>>> >>wrote: > >>> >> >> >>> >>>>> >> > > >>> >> >> >>> >>>>> >> >> I will tag my repository to 1.6.1 before end of > >>>day > >>> >> today > >>> >> >> >>>after > >>> >> >> >>> >>>>>some > >>> >> >> >>> >>>>> >> >> thorough testing. > >>> >> >> >>> >>>>> >> >> > >>> >> >> >>> >>>>> >> >> On Thu, Apr 12, 2012 at 2:30 PM, Shazron > >>> >> >> >>><[email protected]> > >>> >> >> >>> >>>>>wrote: > >>> >> >> >>> >>>>> >> >> > >>> >> >> >>> >>>>> >> >> > I also created a 1.6.1 version tag as well in > >>> jira... > >>> >> >> >>> >>>>> >> >> > > >>> >> >> >>> >>>>> >> >> > On Thu, Apr 12, 2012 at 2:29 PM, Shazron > >>> >> >> >>><[email protected]> > >>> >> >> >>> >>>>> wrote: > >>> >> >> >>> >>>>> >> >> > > Alright guys since 1.6.0 was released, I'm > >>>going > >>> to > >>> >> >> >>> >>>>>"Release" > >>> >> >> >>> >>>>>the > >>> >> >> >>> >>>>> >> >> > > 1.6.0 version in jira and move outstanding > >>> issues to > >>> >> >> >>>1.7.0 > >>> >> >> >>> >>>>> >>version > >>> >> >> >>> >>>>> >> >> > > tag. > >>> >> >> >>> >>>>> >> >> > > > >>> >> >> >>> >>>>> >> >> > > > >>> >> >> >>> >>>>> >> >> > > On Thu, Apr 12, 2012 at 2:26 PM, Filip Maj > >>> >> >> >>><[email protected]> > >>> >> >> >>> >>>>> wrote: > >>> >> >> >>> >>>>> >> >> > >> The JS needs patching too. Since adding the > >>> commit > >>> >> ID > >>> >> >> >>>into > >>> >> >> >>> >>>>>the > >>> >> >> >>> >>>>> >> >> packaging > >>> >> >> >>> >>>>> >> >> > >> in the jakefile, the default task isn't > >>>running > >>> >> >> >>>properly. > >>> >> >> >>> >>>>> >> >> > >> > >>> >> >> >>> >>>>> >> >> > >> You can manually run "jake build" and "jake > >>> test" > >>> >> but > >>> >> >> >>>not > >>> >> >> >>> >>>>> >>"jake" on > >>> >> >> >>> >>>>> >> >> its > >>> >> >> >>> >>>>> >> >> > >> own - gonna try to figure it out. > >>> >> >> >>> >>>>> >> >> > >> > >>> >> >> >>> >>>>> >> >> > >> On 4/12/12 2:21 PM, "Shazron" < > >>> [email protected]> > >>> >> >> >>>wrote: > >>> >> >> >>> >>>>> >> >> > >> > >>> >> >> >>> >>>>> >> >> > >>>I'm good with tagging. iOS has a few > commits > >>> (one > >>> >> >> >>>commit > >>> >> >> >>> >>>>>in > >>> >> >> >>> >>>>> >> >> > >>>cordova-js) as well. Aim for first thing > >>> tomorrow > >>> >> for > >>> >> >> >>>you > >>> >> >> >>> >>>>>to > >>> >> >> >>> >>>>> >> >> > >>>repackage? > >>> >> >> >>> >>>>> >> >> > >>> > >>> >> >> >>> >>>>> >> >> > >>>On Thu, Apr 12, 2012 at 2:17 PM, Steven Gill > >>> >> >> >>> >>>>> >> >><[email protected]> > >>> >> >> >>> >>>>> >> >> > >>>wrote: > >>> >> >> >>> >>>>> >> >> > >>>> So a bug has been discovered in Cordova > >>> Android > >>> >> that > >>> >> >> >>> >>>>>requires > >>> >> >> >>> >>>>> >>a > >>> >> >> >>> >>>>> >> >>new > >>> >> >> >>> >>>>> >> >> > tag > >>> >> >> >>> >>>>> >> >> > >>>>and > >>> >> >> >>> >>>>> >> >> > >>>> release. You can check out the bug on the > >>> issue > >>> >> >> >>>tracker > >>> >> >> >>> >>>>>at > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > > >>> >> >> >>> >>>>> >> >> > >>> >> >> >>> >>>>> >> >> > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> > >>> >> >> >>> >>>>> > >>> >> >> >>> > >>> >> >> > >>> > https://issues.apache.org/jira/browse/CB-490?focusedCommentId=13252809# > >>> >> >> >>> >>>>>co > >>> >> >> >>> >>>>> >> >> > >>>>mment-13252809 > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > >>>> It doesn't make sense to just repackage > >>>1.6.0 > >>> >> with > >>> >> >> >>>this > >>> >> >> >>> >>>>>bug > >>> >> >> >>> >>>>> >> >>fixed as > >>> >> >> >>> >>>>> >> >> > we > >>> >> >> >>> >>>>> >> >> > >>>> will have no way to know if people are > >>> >> experiencing > >>> >> >> >>>this > >>> >> >> >>> >>>>>or > >>> >> >> >>> >>>>> >>not. > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > >>>> Anis mentioned Bada also had some major > >>>issues > >>> >> >> >>>which he > >>> >> >> >>> >>>>>has > >>> >> >> >>> >>>>> >>fixed > >>> >> >> >>> >>>>> >> >> now > >>> >> >> >>> >>>>> >> >> > >>>>and > >>> >> >> >>> >>>>> >> >> > >>>> would like in a 1.6.1 release. > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > >>>> Thoughts? > >>> >> >> >>> >>>>> >> >> > >>>> > >>> >> >> >>> >>>>> >> >> > >>>> -Steve > >>> >> >> >>> >>>>> >> >> > >> > >>> >> >> >>> >>>>> >> >> > > >>> >> >> >>> >>>>> >> >> > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> >> > >>> >> >> >>> >>>>> > >>> >> >> >>> >>>>> > >>> >> >> >>> >>> > >>> >> >> >>> > > >>> >> >> >>> > >>> >> >> > >>> >> >> > >>> >> > >>> > > >
