[livejournal] r17276: LJSUP-6692: JS for LJ LIVE.
Committer: pkornilov
LJSUP-6692: JS for LJ LIVE.U trunk/htdocs/js/contextualhover.js
Modified: trunk/htdocs/js/contextualhover.js
===================================================================
--- trunk/htdocs/js/contextualhover.js 2010-09-03 06:53:32 UTC (rev 17275)
+++ trunk/htdocs/js/contextualhover.js 2010-09-03 08:09:46 UTC (rev 17276)
@@ -340,7 +340,7 @@
ippu.element.append('<div class="Inner">Loading...</div>');
return;
} else if (!data.username || !data.success || data.noshow) {
- ippu.hide();
+ ContextualPopup.hidePopup();
return;
}
@@ -702,6 +702,12 @@
dataType: 'json',
success: function(data)
{
+ if (data.error) {
+ ContextualPopup.hidePopup();
+ t.showNote(data.error, target);
+ return;
+ }
+
t.cachedResults[String(data.userid)] =
t.cachedResults[data.username] =
t.cachedResults[data.url_userpic] = data;
@@ -711,11 +717,6 @@
t.cachedResults[target.up_url] = data;
}
- if (data.error) {
- !data.noshow && t.showNote(data.error, target);
- return;
- }
-
t.currentRequests[popup_id] = null;
if (t.currentId == popup_id) {
