Author: bklaas
Date: Sat Jan 26 20:39:19 2008
New Revision: 1632
URL: http://svn.slimdevices.com?rev=1632&root=Jive&view=rev
Log:
Bug: 6798
Description: do not show popup window for text input windows that don't
specifically ask for one
change _searchInProgress to the more general _inputInProgress
allow label if one is given from SC
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1632&root=Jive&r1=1631&r2=1632&view=diff
==============================================================================
---
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Sat Jan 26 20:39:19 2008
@@ -489,12 +489,16 @@
end
end
--- _searchInProgress
--- full screen popup that appears until search is complete
-local function _searchInProgress(self)
+-- _inputInProgress
+-- full screen popup that appears until action from text input is complete
+local function _inputInProgress(self, msg)
local popup = Popup("popupIcon")
local icon = Icon("iconConnecting")
popup:addWidget(icon)
+ if msg then
+ local label = Label("text", msg)
+ popup:addWidget(label)
+ end
popup:show()
end
@@ -1403,7 +1407,11 @@
item['_inputDone'] = value
-- popup time
- _searchInProgress(self)
+ local displayPopup = _safeDeref(item, 'input',
'processingPopup')
+ local displayPopupText = _safeDeref(item,
'input', 'processingPopup', 'text')
+ if displayPopup then
+ _inputInProgress(self, displayPopupText)
+ end
-- now we should perform the action !
_actionHandler(nil, nil, db, nil, nil, 'go',
item)
-- close the text input if this is a "do"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
