Author: titmuss
Date: Fri Feb 1 13:56:45 2008
New Revision: 1752
URL: http://svn.slimdevices.com?rev=1752&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1738): bklaas | 2008-02-01 20:21:46 +0000
Bug: 5761
Description: allow for rendering of a textArea sent in the window.textArea key
of SC slimbrowse data
when this item is sent the menu widget for this window is forcibly removed
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 1 13:56:45 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1737
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1738
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=1752&root=Jive&r1=1751&r2=1752&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Fri
Feb 1 13:56:45 2008
@@ -268,7 +268,9 @@
["icon-id"] = _priorityAssign('icon-id',
item["icon-id"], iWindow, bWindow),
["icon"] = _priorityAssign('icon',
item["icon"], iWindow, bWindow),
}
-end
+
+end
+
-- _staticArtworkThumbUri
-- helper method for cobbling together a properly formed url for static content
@@ -635,13 +637,17 @@
else
data = chunk.data
end
-
if logd:isDebug() then
debug.dump(chunk, 8)
end
- -- if our window has a menu - some windows don't :(
- if step.menu then
+ if step.window and data and data.window and
data.window.textArea then
+ if step.menu then
+ step.window:removeWidget(step.menu)
+ end
+ local textArea = Textarea("textarea",
data.window.textArea)
+ step.window:addWidget(textArea)
+ elseif step.menu then
step.menu:setItems(step.db:menuItems(data))
-- update the window properties
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
