Just one more issue, the file LzKernelUtils has the same class duplicated a couple of times...
On Sat, Aug 29, 2009 at 11:01 PM, P T Withington <[email protected]> wrote: > Gak. I had a conflict when I upped. > > I believe I have fixed _that_ now, and if there are no more check-ins, you > should be able to revert to ToT, and apply my patch to test. > > Sorry for the confusion. Too much else going on while I developed this > patch! > > > On 2009-08-29, at 20:24, Henry Minsky wrote: > > Now I am seeing these markers in LzSprite.js >> >> <<<<<<< .mine >> ======= >> >> >> >> On Sat, Aug 29, 2009 at 7:15 PM, P T Withington <[email protected]> wrote: >> >> My bad. I updated it. Try again? >>> >>> >>> On 2009-08-29, at 18:23EDT, Henry Minsky wrote: >>> >>> I'm having trouble applying this to top of tree, is it made against an >>> >>>> earlier revision? >>>> >>>> 18:22:32 (328.23 KB/s) - `20090826-ptw-X.tar.1' saved [1454080/1454080] >>>> >>>> 20090826-ptw-X/ >>>> 20090826-ptw-X/apply.sh >>>> 20090826-ptw-X/change.txt >>>> 20090826-ptw-X/files.tar >>>> patching file WEB-INF/lps/lfc/kernel/swf/LzSprite.as >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzTimeKernel.js >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzKeyboardKernel.js >>>> Hunk #3 FAILED at 196. >>>> 1 out of 3 hunks FAILED -- saving rejects to file >>>> WEB-INF/lps/lfc/kernel/dhtml/LzKeyboardKernel.js.rej >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzContextMenuKernel.lzs >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js >>>> Hunk #1 FAILED at 33. >>>> Hunk #2 FAILED at 54. >>>> Hunk #3 FAILED at 71. >>>> Hunk #4 FAILED at 98. >>>> Hunk #5 succeeded at 114 (offset -1 lines). >>>> Hunk #6 succeeded at 214 (offset -1 lines). >>>> Hunk #7 succeeded at 254 (offset -1 lines). >>>> Hunk #8 succeeded at 440 (offset -1 lines). >>>> Hunk #9 succeeded at 503 (offset -1 lines). >>>> Hunk #10 succeeded at 533 (offset -1 lines). >>>> Hunk #11 succeeded at 605 (offset -1 lines). >>>> Hunk #12 succeeded at 663 (offset -1 lines). >>>> Hunk #13 succeeded at 704 (offset -1 lines). >>>> Hunk #14 succeeded at 717 (offset -1 lines). >>>> Hunk #15 succeeded at 736 (offset 3 lines). >>>> Hunk #16 succeeded at 784 (offset 3 lines). >>>> Hunk #17 succeeded at 796 (offset 3 lines). >>>> Hunk #18 succeeded at 809 (offset 3 lines). >>>> Hunk #19 succeeded at 838 (offset 3 lines). >>>> Hunk #20 succeeded at 1081 (offset 3 lines). >>>> Hunk #21 succeeded at 1195 (offset 3 lines). >>>> Hunk #22 succeeded at 1499 (offset 3 lines). >>>> Hunk #23 succeeded at 1542 (offset 3 lines). >>>> Hunk #24 succeeded at 1671 (offset 3 lines). >>>> Hunk #25 succeeded at 1918 (offset 3 lines). >>>> Hunk #26 succeeded at 1929 (offset 3 lines). >>>> Hunk #27 succeeded at 1960 (offset 3 lines). >>>> Hunk #28 succeeded at 1972 (offset 3 lines). >>>> Hunk #29 succeeded at 2290 (offset 3 lines). >>>> Hunk #30 succeeded at 2467 (offset 3 lines). >>>> Hunk #31 succeeded at 2479 (offset 3 lines). >>>> Hunk #32 succeeded at 2623 (offset 3 lines). >>>> 4 out of 32 hunks FAILED -- saving rejects to file >>>> WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js.rej >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzTextSprite.js >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzScreenKernel.js >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js >>>> Hunk #2 succeeded at 171 (offset 7 lines). >>>> Hunk #3 succeeded at 192 (offset 7 lines). >>>> Hunk #4 succeeded at 276 (offset 7 lines). >>>> patching file WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js >>>> patching file WEB-INF/lps/lfc/kernel/swf9/LzSprite.as >>>> patching file WEB-INF/lps/lfc/kernel/Library.lzs >>>> patching file WEB-INF/lps/lfc/kernel/LzKernelUtils.lzs >>>> patching file WEB-INF/lps/lfc/views/LaszloView.lzs >>>> patching file WEB-INF/lps/lfc/views/LaszloCanvas.lzs >>>> patching file WEB-INF/lps/templates/html-response_jp.xslt >>>> patching file WEB-INF/lps/templates/embed-body_jp.xslt >>>> patching file WEB-INF/lps/templates/html-response.xslt >>>> patching file WEB-INF/lps/templates/embed-body.xslt >>>> patching file WEB-INF/lps/templates/app-console_jp.xslt >>>> patching file WEB-INF/lps/templates/app-console.xslt >>>> patching file lps/includes/console.css >>>> patching file lps/includes/source/embednew.js >>>> patching file lps/admin/dev-console.html >>>> patching file lps/admin/dev-console.lzx.js >>>> patching file lps/admin/dev-console.lzx >>>> badtzmaru:trunk6 hqm$ >>>> >>>> On Sat, Aug 29, 2009 at 5:32 PM, P T Withington <[email protected]> wrote: >>>> >>>> [Note this fixes both LPP-6535 (dynamic canvas) and LPP-8402 (suppress >>>> >>>>> scrollbars in unwrapped app). This change reverts r14554 and >>>>> implements >>>>> the >>>>> clipping of the app on the application container div instead of on the >>>>> canvas.] >>>>> >>>>> Change 20090826-ptw-X by [email protected] on 2009-08-26 16:45:10 EDT >>>>> in /Users/ptw/OpenLaszlo/trunk-2 >>>>> for http://svn.openlaszlo.org/openlaszlo/trunk >>>>> >>>>> Summary: Allow canvas resizing >>>>> >>>>> Bugs Fixed: >>>>> LPP-6535 Allow canvas size to be set dynamically to a new physical size >>>>> LPP-8402 DHTML: Extra scrollbar width on Safari and windows firefox and >>>>> IE >>>>> 7 when wrapper has overflow: hidden removed >>>>> >>>>> Technical Reviewer: max (pending) >>>>> QA Reviewer: hminsky (pending) >>>>> >>>>> Documentation: >>>>> The canvas width and height values are no longer read-only. They >>>>> may be set at run time. >>>>> >>>>> Details: >>>>> Basically, changing the canvas dimensions actually changes the >>>>> dimensions of the app container div in the browser. The canvas >>>>> itself, whether a DHTML div or swf <embed> is set to follow the >>>>> size of it's container div. This allows us to set the size >>>>> dynamically to either a pixel dimension or a percentage of the >>>>> browser window (assuming the container app is the top div in the >>>>> <body>). >>>>> >>>>> LzSprite.*: Add static methods setRoot{X,Y,Width,Height} which are >>>>> used to position the canvas container dynamically. In the swf >>>>> runtime, this is done with the help of an ExternalInterface call >>>>> to lz.embed. In DHTML, the div can be directly manipulated. >>>>> >>>>> LzSprite.js, html-response, app-console: Move the clipping of the >>>>> application from the <body> of the responders to the application >>>>> container div (solves LPP-8402). >>>>> >>>>> LzSprite.js, LzTimerKernel, LzKeyboardKernel, LzContextMenuKernel, >>>>> LzTextSprite, LzScreenKernel, LzMouseKernel, LzInputTextSprite, : >>>>> Made quirks a static property, and __updateQuirks a static method, >>>>> so people don't get fooled again. Create an alias for instances >>>>> so they can continue to address quirks through `this`. Removed >>>>> some obsolete quirks. Moved `CSSDimension` to LzKernelUtils, >>>>> since it is needed by all runtimes now, kept an alias on instances >>>>> for access through `this`. >>>>> >>>>> kernel/LzLibrary, LzKernelUtils: Added to hold utility functions >>>>> shared by all runtimes. >>>>> >>>>> LaszloView: Correct fence-post error in `containsPt`. >>>>> >>>>> LaszloCanvas: Use the new kernel sizing features to set the size >>>>> of the canvas container. Always track __windowResize, as this is >>>>> how the canvas actual size is kept in sync with the container. >>>>> Allow canvas dimensions to be set dynamically. >>>>> >>>>> html-response, embed-body, app-console: Move the embedding >>>>> template to an include file so that html and app responders, which >>>>> both need the same code, will not skew. >>>>> >>>>> app-console: Remove cruft that supported the old bootstrap DHTML >>>>> debugger. Share embed code with html-response (don't put DHTML >>>>> apps in an unnecessary iframe). Put the console app in an iframe, >>>>> so it will not pollute the app window. >>>>> >>>>> embednew: Calculate appenddiv early so it can be in both swfargs >>>>> and properties. Initialize the appenddiv size to the canvas >>>>> dimensions. The canvas sizes itself to its container. Support >>>>> resizing the container from swf. >>>>> >>>>> dev-console.*, console.css: Remove unnecessary cruft from >>>>> bootstrap-debugger days. Add javascript to load the console that >>>>> corresponds to the app runtime. Recompile the solo deploys. >>>>> >>>>> Tests: >>>>> Calling canvas.setAttribute('height', ...) or 'width' with various >>>>> values. >>>>> >>>>> Files: >>>>> M WEB-INF/lps/lfc/kernel/swf/LzSprite.as >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzTimeKernel.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzKeyboardKernel.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzContextMenuKernel.lzs >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzTextSprite.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzScreenKernel.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js >>>>> M WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js >>>>> M WEB-INF/lps/lfc/kernel/swf9/LzSprite.as >>>>> M WEB-INF/lps/lfc/kernel/Library.lzs >>>>> A WEB-INF/lps/lfc/kernel/LzKernelUtils.lzs >>>>> M WEB-INF/lps/lfc/views/LaszloView.lzs >>>>> M WEB-INF/lps/lfc/views/LaszloCanvas.lzs >>>>> M WEB-INF/lps/templates/html-response_jp.xslt >>>>> A WEB-INF/lps/templates/embed-body_jp.xslt >>>>> M WEB-INF/lps/templates/html-response.xslt >>>>> A WEB-INF/lps/templates/embed-body.xslt >>>>> M WEB-INF/lps/templates/app-console_jp.xslt >>>>> M WEB-INF/lps/templates/app-console.xslt >>>>> M lps/includes/console.css >>>>> M lps/includes/source/embednew.js >>>>> M lps/admin/dev-console.html >>>>> M lps/admin/dev-console.lzx.js >>>>> M lps/admin/dev-console.lzx.swf >>>>> M lps/admin/dev-console.lzx >>>>> >>>>> Changeset: >>>>> http://svn.openlaszlo.org/openlaszlo/patches/20090826-ptw-X.tar >>>>> >>>>> >>>>> >>>> >>>> -- >>>> Henry Minsky >>>> Software Architect >>>> [email protected] >>>> >>>> >>> >>> >> >> -- >> Henry Minsky >> Software Architect >> [email protected] >> > > -- Henry Minsky Software Architect [email protected]
_______________________________________________ Laszlo-reviews mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-reviews
