Oleg gridjs

[meh-uk]

Applying a whole bunch of Oleg's changes to the main branch.

[flack]

Great job! I'll take a look and see if I can merge some more.

[bouks]

Have yout tested it ?

Nothing work anymore here. In my projects ( dev of course :) ) and my examples, like :

http://ribouka.com/test/

When i click IN the grid there's a lot of messages in console like :

"click in column resizer: pageX is modified from undefined to 302" or "GBOX: dblclick in column resizer: pageX=525;525, idx=undefined, e.pageX=525, cm.name=null"

[meh-uk]

I didn't have time to test it unfortunately :(.

[meh-uk]

Sorry I should have made that clear.

[bouks]

I think all these merging should have been made by Oleg if he wants to join us, nobody else.

We have encountered the same problem (but minor because less sensible and less commits) with search toolbar when flack re-did my changes.

Everybody should commit their only changes with minor tests also.

[meh-uk]

I think in retrospect you're right.

[bouks]

One could test and commit a little change seen on a fork, no problem. But mass import should be avoided. :)

[bouks]

Ok it seems working. With recent autodetection, datatype was not needed anymore (for remote data). Now it is needed again. That's why it was not functioning here.

[meh-uk]

Lets be clear though that my objection to merging any more of @OlegKi's changes is entirely practical and not at all ideological. Unless Tony has made far fewer improvements than we have in recent weeks I can't believe it is likely to be possible to merge Oleg's changes into the main branch of jqGrid either. We have been trying pretty hard to make merging the branches as easy as we can.

And when it has been near on impossible to merge changes into the main branch of jqGrid for so long it shouldn't be at all surprising that there have been a lot of changes in a short time to this fork.

[flack]

Well, the thing is that Oleg is the most active developer (even more than Tony), and many of his changes are pretty useful, so it would be a shame if we had to duplicate the effort and implement them again manually against our code base.

The good news is that we are currently merging faster than he commits. We were almost 80 commits behind when we started merging, and now we're down to approx. 30 (and ca. 10 of them are README changes). So if possible, I would like to close that gap, and then talk to Oleg again about switching his repo to fork from ours. If he says yes, then all is well. If not, then I guess we will have to go our separate ways, but like I said, IMO it would be a complete waste of resources (not to mention confusing to users) to maintain two different forks of the same codebase.

[meh-uk]

Two forks would definitely be a shame.

[meh-uk]

OK I've made some more progress, there is just one change from the 13th and the changes from the 14th to merge. Plus all the CSS changes which have been skipped.

[flack]

there also seem to be some commits from the 11th which we haven't merged yet:

• https://github.com/OlegKi/jqGrid/commit/21c40976ab19acfe499b3d27154ed3c3ce8c6cc7
• https://github.com/OlegKi/jqGrid/commit/cda5503b6e62ad8dae5310e49f5c703d95299111
• https://github.com/OlegKi/jqGrid/commit/3a2f2b747c612927bab2b930420d08513555bdf0

or are they somehow squashed into other commits?

[meh-uk]

No. I'm incompetent and missed them.

[flack]

Don't be too hard on yourself. I'm sure it was just your subconscious that was trying to protect you from the pain that is manual merging :-)

[meh-uk]

Added those missing commits to #57.