Patch doesn't work with current socialcalc

Thanks for the notification. I'll look at this very soon.

I am getting this error:

patching file socialcalc/socialcalc-3.js
Hunk #1 succeeded at 4635 (offset 142 lines).
Hunk #2 succeeded at 4936 (offset 142 lines).
patching file socialcalc/socialcalcpopup.js
patching file socialcalc/socialcalcspreadsheetcontrol.js
Hunk #2 succeeded at 2711 (offset 3 lines).
patching file socialcalc/socialcalctableeditor.js
Hunk #1 succeeded at 381 (offset 15 lines).
Hunk #2 succeeded at 1402 (offset 45 lines).
Hunk #3 FAILED at 1949.
Hunk #4 succeeded at 2762 (offset 222 lines).
Hunk #5 succeeded at 3431 (offset 230 lines).
Hunk #6 succeeded at 4613 (offset 1087 lines).
Hunk #7 succeeded at 4688 (offset 1087 lines).
Hunk #8 succeeded at 4740 (offset 1087 lines).
Hunk #9 succeeded at 4750 (offset 1087 lines).
Hunk #10 succeeded at 4777 (offset 1087 lines).
Hunk #11 succeeded at 4811 (offset 1087 lines).
Hunk #12 succeeded at 4833 (offset 1087 lines).
Hunk #13 succeeded at 4895 (offset 1094 lines).
Hunk #14 succeeded at 4916 (offset 1094 lines).
Hunk #15 succeeded at 4962 (offset 1094 lines).
Hunk #16 succeeded at 4981 (offset 1094 lines).
1 out of 16 hunks FAILED -- saving rejects to file socialcalc/socialcalctableeditor.js.rej

The reject file is attached.

I have applied this manually.

Thanks!

I'm getting the same errors as #2. I'm being slow at this issue because there are new features in the latest SocialCalc release that need further patching. Thanks for your patience.

Fixed in the latest dev. Please try it 12 hours from now. The new patch also adds support to the new cell dragging feature.

Sorry - I'm getting the same error on an install from this morning using:

sheetnode-6.x-1.4.tar.gz
DanBricklin-socialcalc-4594429.tar

Here's the output:

patching file socialcalc/socialcalc-3.js
Hunk #1 succeeded at 4635 (offset 142 lines).
Hunk #2 succeeded at 4936 (offset 142 lines).
patching file socialcalc/socialcalcpopup.js
patching file socialcalc/socialcalcspreadsheetcontrol.js
Hunk #2 succeeded at 2711 (offset 3 lines).
patching file socialcalc/socialcalctableeditor.js
Hunk #1 succeeded at 381 (offset 15 lines).
Hunk #2 succeeded at 1402 (offset 45 lines).
Hunk #3 FAILED at 1949.
Hunk #4 succeeded at 2762 (offset 222 lines).
Hunk #5 succeeded at 3431 (offset 230 lines).
Hunk #6 succeeded at 4613 (offset 1087 lines).
Hunk #7 succeeded at 4688 (offset 1087 lines).
Hunk #8 succeeded at 4740 (offset 1087 lines).
Hunk #9 succeeded at 4750 (offset 1087 lines).
Hunk #10 succeeded at 4777 (offset 1087 lines).
Hunk #11 succeeded at 4811 (offset 1087 lines).
Hunk #12 succeeded at 4833 (offset 1087 lines).
Hunk #13 succeeded at 4895 (offset 1094 lines).
Hunk #14 succeeded at 4916 (offset 1094 lines).
Hunk #15 succeeded at 4962 (offset 1094 lines).
Hunk #16 succeeded at 4981 (offset 1094 lines).
1 out of 16 hunks FAILED -- saving rejects to file socialcalc/socialcalctableeditor.js.rej

Here's the reject file contents:

***************
*** 1946,1953 ****
delete result.coltoresize;
return result;
}
- else if (clientX >= editor.verticaltablecontrol.controlborder ||
- clientY >= editor.horizontaltablecontrol.controlborder ||
clientX < editor.gridposition.left || clientY <= editor.gridposition.top) {
return result;
}
--- 1949,1956 ----
delete result.coltoresize;
return result;
}
+ else if (clientX >= editor.verticaltablecontrol.controlborder+editor.relativeoffset.left ||
+ clientY >= editor.horizontaltablecontrol.controlborder+editor.relativeoffset.top ||
clientX < editor.gridposition.left || clientY <= editor.gridposition.top) {
return result;
}

As of today, I've forked SocialCalc to avoid the patching step. Please follow the new instructions on the module page.