Author: titmuss
Date: Tue Feb 5 04:26:00 2008
New Revision: 1817
URL: http://svn.slimdevices.com?rev=1817&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1812): bklaas | 2008-02-05 04:41:01 +0000
Bug: 6908
Description: add textarea window when data.networkerror comes down the browse
sink
also fixes endless loop of requests when networkerror occurs
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Feb 5 04:26:00 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1811
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1812
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1817&root=Jive&r1=1816&r2=1817&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Tue
Feb 5 04:26:00 2008
@@ -693,7 +693,16 @@
if step.window and data and data.goNow then
_goNow(data.goNow)
end
- if step.window and data and data.window and
data.window.textArea then
+ if data.networkerror then
+ if step.menu then
+ step.window:removeWidget(step.menu)
+ end
+ local textArea = Textarea("textarea", data.networkerror)
+ if step.window then
+
step.window:setTitle(_string("SLIMBROWSER_PROBLEM_CONNECTING"), 'settingstitle')
+ step.window:addWidget(textArea)
+ end
+ elseif step.window and data and data.window and
data.window.textArea then
if step.menu then
step.window:removeWidget(step.menu)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
