[Laszlo-dev] For Review: Change 20071017-maxcarlson-F Summary: Move html tag fixes to wafflecone

Max Carlson max at openlaszlo.org
Wed Oct 17 17:08:14 PDT 2007


Change 20071017-maxcarlson-F by maxcarlson at plastik on 2007-10-17  
17:03:38 PDT
     in /Users/maxcarlson/openlaszlo/waffleconeclean
     for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone

Summary: Move html tag fixes to wafflecone

New Features:

Bugs Fixed:

Technical Reviewer: promanik
QA Reviewer: jcrowley
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details: plastik:~/openlaszlo/waffleconeclean maxcarlson$ svnmerge.py  
merge -r 6531,6683,6715 -S ../trunk
C    WEB-INF/lps/lfc/services/platform/swf/LzHistory.as
C    lps/includes/source/embednew.js
C    lps/includes/source/lzhistory.js

C    WEB-INF/lps/lfc/services/platform/swf/LzHistory.as
C    lps/includes/source/embednew.js
C    lps/includes/source/lzhistory.js

U    WEB-INF/lps/lfc/kernel/swf/dojo/flash6/DojoExternalInterface.as
U    WEB-INF/lps/lfc/kernel/swf/dojo/Library.lzs
C    WEB-INF/lps/lfc/services/platform/swf/LzHistory.as
U    WEB-INF/lps/lfc/views/LaszloCanvas.lzs
U    lps/components/extensions/test/html.lzx
U    lps/components/extensions/test/html-swf.jsp
C    lps/components/extensions/html.lzx
G    lps/includes/source/embednew.js
C    lps/includes/source/lzhistory.js
U    lps/includes/source/iframemanager.js
U    lps/admin/dev-console.lzx.swf

property 'svnmerge-integrated' set on '.'

Cleaned up conflicts in WEB-INF/lps/lfc/services/platform/swf/ 
LzHistory.as, lps/includes/source/embednew.js, lps/includes/source/ 
lzhistory.js and lps/components/extensions/html.lzx.  Diffed against  
trunk to verify all changes made it.

Tests: http://localhost:8080/trunk-clean/lps/components/extensions/ 
test/html-swf.jsp and http://localhost:8080/trunk-clean/lps/ 
components/extensions/test/html.zlx run in swf7, swf8 and dhtml.   
http://localhost:8080/trunk-clean/test/history/history.lzx passes in  
swf7, swf8 and dhtml.  Tested under IE 6, 7 and Firefox 2 OS X.

Files:
  M     .
M      WEB-INF/lps/lfc/kernel/swf/dojo/flash6/DojoExternalInterface.as
M      WEB-INF/lps/lfc/kernel/swf/dojo/Library.lzs
M      WEB-INF/lps/lfc/services/platform/swf/LzHistory.as
M      WEB-INF/lps/lfc/views/LaszloCanvas.lzs
M      lps/components/extensions/test/html.lzx
M      lps/components/extensions/test/html-swf.jsp
M      lps/components/extensions/html.lzx
M      lps/includes/source/embednew.js
M      lps/includes/source/lzhistory.js
M      lps/includes/source/iframemanager.js
M      lps/admin/dev-console.lzx.swf

Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20071017- 
maxcarlson-F.tar


More information about the Laszlo-dev mailing list