Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added a missing image for the web feed widget and fix the mobile view not working when ajax call fails #30

Merged
merged 3 commits into from
May 30, 2012
Merged

Added a missing image for the web feed widget and fix the mobile view not working when ajax call fails #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db50bc8
Added the missing ajax loading icon for the web feeds
LaurentGoderre May 30, 2012
25ec10f
Fixed a bug with the mobile vuew not fully loading when an ajax loadi…
LaurentGoderre May 30, 2012
c90720d
Merge branch 'master' of git://github.com/wet-boew/wet-boew
LaurentGoderre May 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added build/js/images/webfeeds/ajax-loader.gif
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/js/images/webfeeds/ajax-loader.gif
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/js/pe-ap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/js/workers/webwidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down