Merge pull request #30 from LaurentGoderre/master

Added a missing image for the web feed widget and fix the mobile view not working when ajax call fails
wet-boew · May 30, 2012 · 254ca8b · 254ca8b
2 parents 211b0f4 + c90720d
commit 254ca8b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/build/js/images/webfeeds/ajax-loader.gif b/build/js/images/webfeeds/ajax-loader.gif
diff --git a/build/js/pe-ap-min.js b/build/js/pe-ap-min.js
diff --git a/src/js/images/webfeeds/ajax-loader.gif b/src/js/images/webfeeds/ajax-loader.gif
diff --git a/src/js/pe-ap.js b/src/js/pe-ap.js
@@ -96,7 +96,7 @@
 					}
 					$o.append($(data));
 				}, "html");
-			})).done(function () {
+			})).always(function () {
 				//Wait for localisation and ajax content to load plugins
 				$(document).bind("languageloaded", function () {
 					pe.dance();

diff --git a/src/js/workers/webwidget.js b/src/js/workers/webwidget.js
@@ -178,7 +178,7 @@
 				}
 				return $(this).attr("href");
 			});
-			$response = $("<ul class=\"widget-content\"><li class=\"widget-state-loading\"><img src=\"" + pe.add.liblocation + "/images/ajax-loader.gif" + "\" /><span class=\"wb-invisible\">" + pe.dic.get('%loading') + "</span></li></ul>");
+			$response = $("<ul class=\"widget-content\"><li class=\"widget-state-loading\"><img src=\"" + pe.add.liblocation + "/images/webfeeds/ajax-loader.gif" + "\" alt=\"" + pe.dic.get('%loading') + "\" /></li></ul>");
 			$elm.find(".widget-content").replaceWith($response);
 			$.extend({}, _pe.fn.webwidget[type]).exec(feeds, limit, $response);
 			return;