Author: titmuss
Date: Tue Feb 5 04:25:46 2008
New Revision: 1816
URL: http://svn.slimdevices.com?rev=1816&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1811): bklaas | 2008-02-05 04:11:11 +0000
Bug: 6944
Description: pick up special parameters playAction and addAction for when
play/add button
is to provide a new window like a go action would
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:25:46 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1809
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1811
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=1816&root=Jive&r1=1815&r2=1816&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:25:46 2008
@@ -1162,7 +1162,10 @@
sink = _hideMe(_curStep)
elseif item["showBigArtwork"] then
sink = _bigArtworkPopup
- elseif actionName == 'go' then
+ elseif actionName == 'go'
+ -- when we want play or add action to
do the same thing as 'go', and give us a new window
+ or ( item['playAction'] == 'go' and
actionName == 'play' )
+ or ( item['addAction'] == 'go' and
actionName == 'add' ) then
step, sink = _newDestination(_curStep,
item, _newWindowSpec(db, item), _browseSink, jsonAction)
if step.menu then
from, qty =
step.db:missing(step.menu:isAccelerated())
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
