Author: titmuss
Date: Mon Apr 21 12:55:35 2008
New Revision: 2304
URL: http://svn.slimdevices.com?rev=2304&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2303): titmuss | 2008-04-21 20:55:20 +0100
[EMAIL PROTECTED] (orig r2302): bklaas | 2008-04-21 19:38:56 +0100
Bug: 6349
Description: move the hidePopup local functions above any place where they
are (or may be) called. In Lua you need to define a local function above any
place it's called.
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Apr 21 12:55:35 2008
@@ -1,5 +1,5 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2297
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2298
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2302
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2303
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2304&root=Jive&r1=2303&r2=2304&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Apr 21 12:55:35 2008
@@ -489,6 +489,37 @@
popup:show()
end
+-- _hideConnectingToPlayer
+-- hide the full screen popup that appears until menus are loaded
+local function _hideConnectingToPlayer()
+ if _connectingPopup then
+ log:info("_connectingToPlayer popup hide")
+ _connectingPopup:hide()
+ _connectingPopup = nil
+ end
+end
+
+-- _hideUserUpdatePopup
+-- hide the full screen popup that appears until player is updated
+local function _hideUserUpdatePopup()
+ if _userUpdatePopup then
+ log:info("_userUpdatePopup popup hide")
+ _userUpdatePopup:hide()
+ _userUpdatePopup = false
+ end
+end
+
+
+-- _hidePlayerUpdating
+-- hide the full screen popup that appears until player is updated
+local function _hidePlayerUpdating()
+ if _updatingPlayerPopup then
+ log:info("_updatingPlayer popup hide")
+ _updatingPlayerPopup:hide()
+ _updatingPlayerPopup = false
+ end
+end
+
-- _connectingToPlayer
-- full screen popup that appears until menus are loaded
@@ -620,38 +651,6 @@
popup:show()
_updatingPlayerPopup = popup
-end
-
-
--- _hideConnectingToPlayer
--- hide the full screen popup that appears until menus are loaded
-local function _hideConnectingToPlayer()
- if _connectingPopup then
- log:info("_connectingToPlayer popup hide")
- _connectingPopup:hide()
- _connectingPopup = nil
- end
-end
-
--- _hideUserUpdatePopup
--- hide the full screen popup that appears until player is updated
-local function _hideUserUpdatePopup()
- if _userUpdatePopup then
- log:info("_userUpdatePopup popup hide")
- _userUpdatePopup:hide()
- _userUpdatePopup = false
- end
-end
-
-
--- _hidePlayerUpdating
--- hide the full screen popup that appears until player is updated
-local function _hidePlayerUpdating()
- if _updatingPlayerPopup then
- log:info("_updatingPlayer popup hide")
- _updatingPlayerPopup:hide()
- _updatingPlayerPopup = false
- end
end
-- _bigArtworkPopup
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
