Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug fix for reading from XML feed

  • Loading branch information...
commit cc23fd516713f640bdc0d535a0e951b9ceebe068 1 parent 645242c
@rhodimus authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 includes/jquery.ticker.js
View
8 includes/jquery.ticker.js
@@ -177,7 +177,10 @@
}
});
}
- setupContentAndTriggerDisplay();
+ // we may have to wait for the ajax call to finish here
+ if (!opts.ajaxFeed) {
+ setupContentAndTriggerDisplay();
+ }
}
/* Start to process the content for this ticker */
@@ -186,7 +189,7 @@
if (settings.contentLoaded == false) {
// construct content
if (opts.ajaxFeed) {
- if (opts.feedType == 'xml') {
+ if (opts.feedType == 'xml') {
$.ajax({
url: opts.feedUrl,
cache: false,
@@ -230,6 +233,7 @@
return false;
}
settings.contentLoaded = true;
+ setupContentAndTriggerDisplay();
}
});
}
Please sign in to comment.
Something went wrong with that request. Please try again.