I think that's because the mousewheel.js was the result of an svn move.
untarring files.tar ought to do the trick...
Henry Minsky wrote:
I got this error when applying the patch to trunk
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: lps/includes/source/mousewheel.js
|===================================================================
|--- lps/includes/source/mousewheel.js (revision 9221)
|+++ lps/includes/source/mousewheel.js (working copy)
--------------------------
File to patch:
On Mon, May 19, 2008 at 6:24 PM, Max Carlson <[EMAIL PROTECTED]
<mailto:[EMAIL PROTECTED]>> wrote:
Change 20080519-maxcarlson-5 by [EMAIL PROTECTED] on 2008-05-19
14:39:47 PDT
in /Users/maxcarlson/openlaszlo/trunk-clean
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Get rid of lzOptions hash
New Features:
Bugs Fixed: LPP-5730 - Get rid of lzOptions hash
Technical Reviewer: promanik
QA Reviewer: hminsky
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details: dhtml/LzKeyboardKernel.js - Test
Lz.options.cancelkeyboardcontrol != true instead of
lzOptions.dhtmlKeyboardControl.
dhtml/LzSprite.js - Set dhtmlEmbed() resourceroot and
cancelkeyboardcontrol properties. Call
LzKeyboardKernel.setKeyboardControl(true) when moused over. Use
Lz.options.resourceroot instead of lzOptions.ServerRoot. Look up
Lz.options.resourceroot dynamically.
dhtml/LzInputTextSprite.js - Look up Lz.options.resourceroot
dynamically.
services/LzKeys.lzs - Add ignore argument to gotLastFocus() to
prevent debugger warnings. Use Lz.mousewheel to register for
mousewheel callbacks in dhtml. Check to make sure Lz.mousewheel
exists first for ant lztest.
utils/DeploySOLODHTML.java - Remove lzOptions, update to replace the
resourceroot argument to Lz.dhtmlEmbedLFC() instead of searching for
ServerRoot.
templates/html-response.xslt - Remove lzOptions, move ServerRoot arg
to the second argument of Lz.dhtmlEmbedLFC().
templates/app-console.xslt - Remove lzOptions, move ServerRoot to
the resourceroot property, move dhtmlKeyboardControl to the
cancelkeyboardcontrol property. Turn history off for dhtml embed of
dev-console.
xsl/common-html.js - Remove lzOptions, update DHTML embedding code
to use the new resourceroot and cancelkeyboardcontrol properties.
utils/rhino.js - Remove lzOptions, LzMousewheelKernel declaration.
Move includes/source/LzMousewheelKernel.js to
includes/source/mousewheel.js.
includes/source/embednew.js - Update dhtmlEmbedLFC() doc example.
Add options hash to store resourceroot and cancelkeyboardcontrol
values. Use Lz.mousewheel instead of LzKeyboardKernel. Add
resourceroot argument to dhtmlEmbedLFC() and warn if it's
unspecified or not a string. Update docs for dhtmlEmbed() and store
properties.cancelkeyboardcontrol and properties.resourceroot in the
properties cache. Add warnings if lzOptions.dhtmlKeyboardControl
and/or lzOptions.ServerRoot are specified.
includes/source/embed-library.lzs - Get rid of lzOptions. Include
mousewheel.js instead of LzMousewheelKernel.js.
includes/source/flash.js - Look for Lz.options["forceFlashComm"]
instead of lzOptions["forceFlashComm"].
includes/source/mousewheel.js - Rename from LzMousewheelKernel to
Lz.mousewheel. Test Lz.options.cancelkeyboardcontrol != true
instead of lzOptions.dhtmlKeyboardControl.
lps/admin/dev-console.html - Remove lzOptions. Turn history off for
swf embed of dev-console.
Recompile dev-console.lzx.swf and dev-console.lzx.js.
lps/admin/solo-dhtml-deploy.jsp - Update to replace the resourceroot
argument to Lz.dhtmlEmbedLFC() instead of searching for ServerRoot.
Tests: Both the command-line and jsp versions of the dhtml SOLO
tools work with the new embedding syntax.
http://localhost:8080/trunk-clean/test/lfc/legals/keyboardandmouse.lzx?lzr=dhtml&lzt=html
<http://localhost:8080/trunk-clean/test/lfc/legals/keyboardandmouse.lzx?lzr=dhtml&lzt=html>
continues
to work as before. ant lztest has no warnings and passes (with less
global cruft). cd docs/src;ant clean;ant reference shows the
correct dhtmlEmbedLFC() format in the <head/> tag. DHTML and swf
developer's consoles work as before.
Files:
M WEB-INF/lps/lfc/kernel/dhtml/LzKeyboardKernel.js
M WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
M WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js
M WEB-INF/lps/lfc/services/LzKeys.lzs
M WEB-INF/lps/server/src/org/openlaszlo/utils/DeploySOLODHTML.java
M WEB-INF/lps/templates/html-response.xslt
M WEB-INF/lps/templates/app-console.xslt
M docs/src/xsl/common-html.xsl
M lps/utils/rhino.js
D lps/includes/source/LzMousewheelKernel.js
M lps/includes/source/embednew.js
M lps/includes/source/embed-library.lzs
M lps/includes/source/flash.js
A + lps/includes/source/mousewheel.js
M lps/admin/dev-console.html
M lps/admin/dev-console.lzx.swf
M lps/admin/dev-console.lzx.js
M lps/admin/solo-dhtml-deploy.jsp
Changeset:
http://svn.openlaszlo.org/openlaszlo/patches/20080519-maxcarlson-5.tar
--
Henry Minsky
Software Architect
[EMAIL PROTECTED] <mailto:[EMAIL PROTECTED]>
--
Regards,
Max Carlson
OpenLaszlo.org
