فهرست منبع

Ticket #293 - New loading indicator: RSS.

AntonLV 10 سال پیش
والد
کامیت
36a7112993
3فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 1 1
      inc/js/jquery.dolRSSFeed.js
  2. 4 2
      studio/js/page.js
  3. 1 3
      template/rss_holder.html

+ 1 - 1
inc/js/jquery.dolRSSFeed.js

@@ -23,7 +23,7 @@
 
 			var sFeedURL = (oOptions.forceUrl != undefined) ? oOptions.forceUrl : sUrlRoot + 'get_rss_feed.php?object=' + sRSSObject + '&id=' + iRSSID + '&member=' + iMemID;
 
-            bx_loading_animate($(this).find('.bx-loading-ajax'));
+			bx_loading_content($(this), true, true);
 
             $.getFeed( {
 				url: sFeedURL,

+ 4 - 2
studio/js/page.js

@@ -63,10 +63,10 @@ BxDolStudioPage.prototype.togglePopup = function(sName, oLink) {
 	switch(sName) {
 		case 'help':
 			oPopupOptions = $.extend({}, oPopupOptions, {
-				onShow: function() {
+				onBeforeShow: function() {
 					var oPopup = $(sId);
 					var oPopupRss = oPopup.find('.RSSAggrCont');
-					if(!oPopupRss.find('.bx-loading-ajax').length)
+					if(oPopupRss.contents().length)
 						return;
 
 					oPopupRss.dolRSSFeed({
@@ -78,6 +78,8 @@ BxDolStudioPage.prototype.togglePopup = function(sName, oLink) {
 							oPopup._dolPopupSetPosition(oPopupOptions);
 						}
 					});
+
+					oPopup._dolPopupSetPosition(oPopupOptions);
 				}
 			});
 			break;

+ 1 - 3
template/rss_holder.html

@@ -1,3 +1 @@
-    <div class="RSSAggrCont" rssobject="__rss_object__" rssid="__rss_id__" rssnum="__rss_num__" member="__member_id__">
-        <div class="bx-loading-ajax bx-def-z-index-front bx-def-margin-top bx-def-margin-bottom" style="position:static;"><div class="bx-loading-ajax-rotating"></div></div>
-    </div>
+<div class="RSSAggrCont" rssobject="__rss_object__" rssid="__rss_id__" rssnum="__rss_num__" member="__member_id__"></div>