Author: titmuss
Date: Sun Jan 27 02:48:11 2008
New Revision: 1637
URL: http://svn.slimdevices.com?rev=1637&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1632): bklaas | 2008-01-27 04:39:19 +0000
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:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jan 27 02:48:11 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1631
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1632
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=1637&root=Jive&r1=1636&r2=1637&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Sun
Jan 27 02:48:11 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
