[Laszlo-checkins] r10638 - openlaszlo/trunk/lps/includes/source

[max@openlaszlo.org]

Author: max
Date: 2008-08-07 20:19:02 -0700 (Thu, 07 Aug 2008)
New Revision: 10638

Modified:
   openlaszlo/trunk/lps/includes/source/embednew.js
   openlaszlo/trunk/lps/includes/source/lzhistory.js
Log:
Change 20080807-maxcarlson-x by maxcarlson at Roboto on 2008-08-07 15:33:12 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Prevent history from updating when disabled

Bugs Fixed: LPP-6813 - history mechanism should prevent updates when disabled.

Technical Reviewer: promanik
QA Reviewer: hminsky

Details: embednew.js - Set lz.embed.history.active flag to false when an app is embedded with history: false.

lzhistory.js - Add active flag.  If active != true, return immediately in set().

Tests: Apps show as before in swf8/9/dhtml



Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js	2008-08-08 02:56:48 UTC (rev 10637)
+++ openlaszlo/trunk/lps/includes/source/embednew.js	2008-08-08 03:19:02 UTC (rev 10638)
@@ -132,7 +132,9 @@
             ,_setCanvasAttributeDequeue: lz.embed._setCanvasAttributeDequeue
         }
         // listen for history unless properties.history == false
-        if (properties.history != false) {
+        if (properties.history == false) {
+            lz.embed.history.active = false;
+        } else {
             app._onload.push(lz.embed.history.init);
         }
         // for callbacks onload

Modified: openlaszlo/trunk/lps/includes/source/lzhistory.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/lzhistory.js	2008-08-08 02:56:48 UTC (rev 10637)
+++ openlaszlo/trunk/lps/includes/source/lzhistory.js	2008-08-08 03:19:02 UTC (rev 10638)
@@ -7,7 +7,8 @@
   */
 
 lz.embed.history = {
-    _currentstate: null 
+    active: true 
+    ,_currentstate: null 
     ,_apps: []
     ,_intervalID: null
     ,init: function(app) {
@@ -112,6 +113,7 @@
     }
     ,/** */
     set: function(s) {
+        if (lz.embed.history.active != true) return;
         if (s == null) s = '';
         if (lz.embed.history._currentstate == s) return;
         lz.embed.history._currentstate = s;