[Laszlo-checkins] r14318 - in openlaszlo/trunk: . WEB-INF/lps/lfc/kernel/swf WEB-INF/lps/lfc/services lps/includes/source
ptw@openlaszlo.org
ptw at openlaszlo.org
Mon Jul 13 15:19:50 PDT 2009
Author: ptw
Date: 2009-07-13 15:19:44 -0700 (Mon, 13 Jul 2009)
New Revision: 14318
Modified:
openlaszlo/trunk/
openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzKeyboardKernel.as
openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
openlaszlo/trunk/WEB-INF/lps/lfc/services/LzKeys.lzs
openlaszlo/trunk/lps/includes/source/embednew.js
Log:
Merged revisions 14316 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/branches/4.2
.......
r14316 | ptw | 2009-07-13 16:40:30 -0400 (Mon, 13 Jul 2009) | 17 lines
Change 20090713-ptw-A by ptw at dueling-banjos.home on 2009-07-13 16:36:02 EDT
in /Users/ptw/OpenLaszlo/4.2
for http://svn.openlaszlo.org/openlaszlo/branches/4.2
Summary: Revert r14287
Bugs Fixed: LPP-8283 Alt tab issue when switching tasks in IE7/Win
Technical Reviewer: aalappat at laszlosystems.com (pending)
Details:
Reverting this change. It did not help and it broke tabbing.
Tests:
TBD
.......
Property changes on: openlaszlo/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334
+ /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287,14316 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzKeyboardKernel.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzKeyboardKernel.as 2009-07-13 20:41:28 UTC (rev 14317)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzKeyboardKernel.as 2009-07-13 22:19:44 UTC (rev 14318)
@@ -58,32 +58,10 @@
,__codes: {16: 'shift', 17: 'control', 18: 'alt'}
,__callback: null
,__scope: null
- ,__listeneradded: false
,setCallback: function (scope, funcname) {
this.__scope = scope;
this.__callback = funcname;
- if (LzSprite.prototype.quirks.swf_swallows_focus_events) {
- // Enable focus on sprite root so we can receive onfocus
- // events in IE when the browser window does
- if (this.__listeneradded == false) {
- var listener = {
- onSetFocus: function (o, n) {
- if ((o == null) || (n == null)) {
- var how = '';
-// if ($debug) {
-// how = Debug.formatToString("focus %#w -> %#w", o, n);
-// }
- lz.Keys.__allKeysUp(how);
-// } else if ($debug) {
-// Debug.debug("focus %#w -> %#w", o, n);
- }
- }
- }
- Selection.addListener(listener);
- this.__listeneradded = true;
- }
- }
- }
+ }
// Called by lz.embed when the browser window regains focus
,__allKeysUp: function () {
var delta = null;
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzSprite.as 2009-07-13 20:41:28 UTC (rev 14317)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzSprite.as 2009-07-13 22:19:44 UTC (rev 14318)
@@ -24,14 +24,7 @@
is = _root.attachMovie('empty', 'spriteroot', 1000);
}
this.__LZmovieClipRef = is;
- if (LzSprite.prototype.quirks.swf_swallows_focus_events) {
- is.attachMovie( LzSprite.prototype.__LZclickregion, "$mcB",
- LzSprite.prototype.BUTTON_DEPTH, {_width: 0, _height: 0} );
- if (debug) {
- is.$mcB._dbg_name = 'default focus';
- }
- Selection.setFocus(is.$mcB);
- }
+
this.__LZsvdepth = 1;
} else {
this.__LZdepth = newowner.immediateparent.sprite.__LZsvdepth++;
@@ -57,19 +50,6 @@
};
}
-LzSprite.prototype.quirks = {
- swf_swallows_focus_events: false
-}
-
-LzSprite.prototype.__updateQuirks = function () {
- var quirks = this.quirks;
- if (System.capabilities.os.indexOf('Win') == 0) {
- quirks.swf_swallows_focus_events = true;
- }
-}
-
-LzSprite.prototype.__updateQuirks();
-
LzSprite.prototype.capabilities = {
rotation: true
// Avoid scaling canvas to percentage values - SWF already scales the viewport size, so take window size literally to avoid scaling twice
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/services/LzKeys.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/services/LzKeys.lzs 2009-07-13 20:41:28 UTC (rev 14317)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/services/LzKeys.lzs 2009-07-13 22:19:44 UTC (rev 14318)
@@ -149,10 +149,7 @@
* Trampoline so we can call from lz.embed
* @access private
*/
- function __allKeysUp (how='unknown'):void {
-// if ($debug) {
-// Debug.debug("[%6.2f] __allKeysUp: %s", (new Date).getTime() % 1000000, how);
-// }
+ function __allKeysUp ():void {
LzKeyboardKernel.__allKeysUp();
}
Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js 2009-07-13 20:41:28 UTC (rev 14317)
+++ openlaszlo/trunk/lps/includes/source/embednew.js 2009-07-13 22:19:44 UTC (rev 14318)
@@ -685,20 +685,18 @@
if (d != null) this.callMethod("lz.Keys.__mousewheelEvent(" + d + ")");
}
,/** @access private */
- _gotFocus: function(how='unknown') {
- lz.embed._broadcastMethod('_sendAllKeysUp', how);
+ _gotFocus: function() {
+ lz.embed._broadcastMethod('_sendAllKeysUp');
}
,/** @access private */
- _sendAllKeysUpSWF: function (how='unknown') {
-// if (how is Event) { how = 'event'; }
-// this.callMethod("lz.Keys.__allKeysUp(" + how + ")");
+ _sendAllKeysUpSWF: function () {
this.callMethod("lz.Keys.__allKeysUp()");
}
,/** @access private */
- _sendAllKeysUpDHTML: function (how='unknown') {
+ _sendAllKeysUpDHTML: function () {
// How to deal with multiple DHTML apps on a page?
if (lz['Keys'] && lz.Keys['__allKeysUp']) {
- lz.Keys.__allKeysUp(how);
+ lz.Keys.__allKeysUp();
}
}
,/** @access private */
@@ -876,11 +874,9 @@
lz.embed.attachEventHandler(window, 'beforeunload', lz.embed, '_cleanupHandlers');
// Notice that you got focus
+lz.embed.attachEventHandler(window, 'focus', lz.embed, '_gotFocus');
if (lz.embed.browser.isIE) {
- // attachEventHandler does not work for IE?
- document.onfocusin = function () { lz.embed._gotFocus('document focusin'); }
-} else {
- lz.embed.attachEventHandler(window, 'focus', lz.embed, '_gotFocus');
+ lz.embed.attachEventHandler(window, 'activate', lz.embed, '_gotFocus');
}
// for backward compatibility
More information about the Laszlo-checkins
mailing list