Fix broken feeds

themes/openframeworks/assets/js/gallery.js

@@ -1,6 +1,7 @@
-google.load("feeds", "1");
+//google.load("feeds", "1");
  // Our callback function, for when a feed is loaded.
 function feedCANLoaded(result) {
+    console.log(result);
   if (!result.error) {
     // Grab the container we will put the results into
     var container = document.getElementById("gallery");
@@ -9,8 +10,8 @@ function feedCANLoaded(result) {
     // Loop through the feeds, putting the titles onto the page.
     // Check out the result object for a list of properties returned in each entry.
     // http://code.google.com/apis/ajaxfeeds/documentation/reference.html#JSON
-    for (var i = 0; i < result.xmlDocument.getElementsByTagName('item').length; i++) {
-      var entry = result.xmlDocument.getElementsByTagName('item')[i];
+    for (var i = 0; i < result.getElementsByTagName('item').length && i<10; i++) {
+      var entry = result.getElementsByTagName('item')[i];
       var title = entry.getElementsByTagName("title")[0].textContent;
       var div = document.createElement("div");
       div.className="galleryItem";
@@ -27,20 +28,20 @@ function feedCANLoaded(result) {
       moreLink.href = entry.getElementsByTagName("link")[0].textContent;
       moreLink.className = "moreLink";
       moreLink.appendChild(document.createTextNode("  more >>"));
-      
+
       var content = entry.getElementsByTagNameNS("*","description")[0].textContent;
       var indexOfFirstImg = content.indexOf('<img');
       var endImg = content.indexOf("/>",indexOfFirstImg);
       var imgHTML = content.substr(indexOfFirstImg,endImg-indexOfFirstImg);
       var indexOfSrc = imgHTML.indexOf('src="')+5;
       img.src = imgHTML.substr(indexOfSrc,imgHTML.indexOf('"',indexOfSrc)-indexOfSrc);
-     
+
       var dot = document.createElement("span");
       dot.className = "external-dot";
       dot.appendChild(document.createTextNode("> "));
-      
+
       aImg.appendChild(img);
-      
+
       var shortTitle = "";
       if(title.indexOf('–')!=-1)
           shortTitle = title.substr(0,title.indexOf('–'));
@@ -59,25 +60,31 @@ function feedCANLoaded(result) {
       p.appendChild(document.createTextNode(description));
       p.appendChild(br);
       //p.appendChild(moreLink);
-      
+
       div.appendChild(h2);
       //div.appendChild(br);
       div.appendChild(aImg);
       div.appendChild(p);
       container.appendChild(div);
-      /*if(i<result.xmlDocument.getElementsByTagName('item').length-1) 
+      /*if(i<result.xmlDocument.getElementsByTagName('item').length-1)
         container.appendChild(hr);*/
     }
   }
 }
-    
-function OnLoad() {
+
+/*function OnLoad() {
     var feedCAN = new google.feeds.Feed("http://www.creativeapplications.net/category/openframeworks/feed/");
     feedCAN.setNumEntries(10);
     feedCAN.setResultFormat(google.feeds.Feed.XML_FORMAT);
     // Calling load sends the request off.  It requires a callback function.
     feedCAN.load(feedCANLoaded);
-    
+
 }
 
-google.setOnLoadCallback(OnLoad);
+google.setOnLoadCallback(OnLoad);*/
+
+
+
+$(document).ready(function(){
+    jQuery.get("/gallery_feed/", feedCANLoaded);
+});

themes/openframeworks/assets/js/home.js

@@ -1,7 +1,7 @@
 
 
-    
-function OnLoad() {
+
+/*function OnLoad() {
     var feedGithub = new google.feeds.Feed("https://github.com/openframeworks/openFrameworks/commits/master.atom");
     feedGithub.setNumEntries(20);
     feedGithub.setResultFormat(google.feeds.Feed.XML_FORMAT);
@@ -16,13 +16,15 @@ function OnLoad() {
     var feedFlickr = new google.feeds.Feed("http://api.flickr.com/services/feeds/groups_pool.gne?id=476246@N23&lang=es-us&format=rss_200");
     feedFlickr.setNumEntries(30);
     feedFlickr.load(feedFlickrLoaded);
-    
+
     var feedVimeo = new google.feeds.Feed("http://vimeo.com/tag:openframeworks/rss");
     feedVimeo.setNumEntries(20);
     feedVimeo.setResultFormat(google.feeds.Feed.XML_FORMAT);
     feedVimeo.load(feedVimeoLoaded);
-}
-
-google.setOnLoadCallback(OnLoad);
-
+}*/
 
+$(document).ready(function(){
+    jQuery.getJSON("https://api.github.com/repos/openframeworks/openFrameworks/commits", feedGithubLoaded);
+    jQuery.get("/forum_feed", feedForumLoaded);
+    jQuery.get("/flickr_feed", feedFlickrLoaded);
+});