Author: bklaas
Date: Fri Feb 29 14:34:18 2008
New Revision: 2085

URL: http://svn.slimdevices.com?rev=2085&root=Jive&view=rev
Log:
Bug: 6663
Description: show textinput window without performing query on entering window

Modified:
    
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua

Modified: 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2085&root=Jive&r1=2084&r2=2085&view=diff
==============================================================================
--- 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Fri Feb 29 14:34:18 2008
@@ -975,23 +975,30 @@
                                                                                
          _browseSink,
                                                                                
          jsonAction
                                                                                
  )
-                                                               from, qty = 
step.db:missing(step.menu and step.menu:isAccelerated())
-       
-                                                               
jiveMain:lockItem(item,
-                                                                         
function()
-                                                                         
step.cancelled = true
-                                                                 end)
+                                                               if v.input then
+                                                                       
step.window:show()
+                                                                       
_curStep = step
+                                                               else
+                                                                       from, 
qty = step.db:missing(step.menu and step.menu:isAccelerated())
+       
+                                                                       
jiveMain:lockItem(item,
+                                                                               
  function()
+                                                                               
  step.cancelled = true
+                                                                         end)
                
-                                                               step.loaded = 
function()
-                                                                             
jiveMain:unlockItem(item)
+                                                                       
step.loaded = function()
+                                                                               
      jiveMain:unlockItem(item)
                
-                                                                             
_curStep = step
-                                                                             
step.window:show()
-                                                                     end
+                                                                               
      _curStep = step
+                                                                               
      step.window:show()
+                                                                             
end
+                                                               end
                                                        end
                                                end
 
-                                               _performJSONAction(jsonAction, 
from, qty, step, sink)
+                                               if not v.input then
+                                                       
_performJSONAction(jsonAction, from, qty, step, sink)
+                                               end
                                        end
 
                                _playerMenus[item.id] = item

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to