Author: max
Date: 2006-11-08 12:19:49 -0800 (Wed, 08 Nov 2006)
New Revision: 2442
Modified:
openlaszlo/branches/legals/WEB-INF/lps/lfc/helpers/Library.lzs
openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzKeys.js
openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzModeManager.lzs
Log:
Change 20061108-maxcarlson-a by [EMAIL PROTECTED] on 2006-11-08 10:19:36 PST
in /Users/maxcarlson/openlaszlo/legals
Summary: Fix menu in DHTML
New Features:
Bugs Fixed: LPP-2934 - Make menu work in Legals, LPP-2798 - DHTML:
examples/components/menu_example.lzx - missing all menus
Technical Reviewer: promanik
QA Reviewer: hminsky
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details: Add LzCommand.lzs to the dhtml build, add more safety checking to
LzModeManager, add dummy method to LzKeys.callOnKeyCombo(). Keyboard
combinations are not currently captured in DHTML -
http://jira.openlaszlo.org/jira/browse/LPP-3034
Tests:
Files:
M WEB-INF/lps/lfc/services/LzModeManager.lzs
M WEB-INF/lps/lfc/services/LzKeys.js
M WEB-INF/lps/lfc/helpers/Library.lzs
Changeset:
http://svn.openlaszlo.org/openlaszlo/patches/20061108-maxcarlson-a.tar
Modified: openlaszlo/branches/legals/WEB-INF/lps/lfc/helpers/Library.lzs
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/lfc/helpers/Library.lzs
2006-11-08 19:58:17 UTC (rev 2441)
+++ openlaszlo/branches/legals/WEB-INF/lps/lfc/helpers/Library.lzs
2006-11-08 20:19:49 UTC (rev 2442)
@@ -9,9 +9,9 @@
#include "helpers/LzFont.lzs"
#include "helpers/LzSelectionManager.lzs"
+#include "helpers/LzCommand.lzs"
if ($as2) {
- #include "helpers/LzCommand.lzs"
} else if ($js1) {
//
} else {
Modified: openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzKeys.js
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzKeys.js
2006-11-08 19:58:17 UTC (rev 2441)
+++ openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzKeys.js
2006-11-08 20:19:49 UTC (rev 2442)
@@ -38,9 +38,14 @@
return LzKeys.downKeysHash[k] == true;
}
+
+LzKeys.callOnKeyCombo = function(who, k) {
+ //TODO: implement
+ Debug.warn("LzKeys.callOnKeyCombo is currently unimplemented");
+}
+
LzKeyboardKernel.setCallback(LzKeys, '__keyboardEvent');
-
LzKeys.keyCodes = {
a : 65 ,
b : 66 ,
Modified: openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzModeManager.lzs
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzModeManager.lzs
2006-11-08 19:58:17 UTC (rev 2441)
+++ openlaszlo/branches/legals/WEB-INF/lps/lfc/services/LzModeManager.lzs
2006-11-08 20:19:49 UTC (rev 2442)
@@ -37,7 +37,8 @@
LzModeManager.makeModal = function ( view ) {
this.modeArray.push( view );
this.onmode.sendEvent( view );
- if ( ! LzFocus.getFocus().childOf( view ) ){
+ var f = LzFocus.getFocus();
+ if ( f && ! f.childOf( view ) ){
LzFocus.clearFocus();
}
}
@@ -53,7 +54,8 @@
this.modeArray.splice( i , this.modeArray.length - i );
var newmode = this.modeArray[ i - 1 ];
this.onmode.sendEvent( newmode || null );
- if ( newmode && ! LzFocus.getFocus().childOf( newmode ) ){
+ var f = LzFocus.getFocus();
+ if ( newmode && f && ! f.childOf( newmode ) ){
LzFocus.clearFocus();
}
return;
@@ -106,7 +108,7 @@
if (view && view.childOf( mView ) ){
break;
- } else {
+ } else if (mView) {
dosend = mView.passModeEvent( eventStr , view );
}
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
