Reader/Feed.bjs

Reader/Feed.js
Reader/templates/Feed.html

diff --git a/Reader/Feed.bjs b/Reader/Feed.bjs
index 5b99d38..23ec1ce 100644 (file)
--- a/Reader/Feed.bjs
+++ b/Reader/Feed.bjs
@@ -110,7 +110,7 @@
       "render" : "function (_self)\n{\n  _this.articleCtr = this;\n}"
      },
      "xtype" : "Element",
-     "| function loadArticle" : "function(pos) { \n    \n\n    if (pos < 0) {\n        Roo.MessageBox.alert(\"error\", \"show article got < 0\");\n    }\n        \n    //    Roo.select('.hover-nav').show();\n    _this.table.hide(); // hopefully...\n    this.show();\n    \n    var rec = _this.table.store.getAt(pos);\n    if (typeof(rec.data.rss_body) == 'undefined') {\n\n            \n        new Pman.Request({\n            method: 'GET',\n            mask : 'Fetching Article',\n            url : baseURL + '/FeedBody/' + id,\n            success : function(res) {\n                rec.data.rss_body = res.responseText;\n                _this.article_ctr.showArticle(pos);\n                \n              \n            }\n        });\n        return;\n        \n    }\n\n    _this.articleBody.el.update(rec.data.rss_body || \"Body has not been loaded\",false, function() {\n        //Roo.log(\"body loaded\");\n        (function() { \n            var w = Roo.lib.Dom.getViewportWidth();\n\n            // resize the images... \n            _this.articleBody.el.select('img', true).each(function(im) {\n                if (im.getWidth() > w) {\n                    var sf = w/im.getWidth()  \n                    im.setSize(w, im.getHeight() * sf);\n                }\n                \n                    \n            });\n        }).defer(100);\n            \n    });\n    // hide the summary...\n    \n    \n    \n    \n    \n    Roo.get(document.body).unmask();\n    \n    Roo.select('.rss-art-count').first().update((this.pos +1) +'/' + this.articles.elements.length);\n   \n    // flag it as read...\n    \n    Roo.Ajax.request({\n        method: 'GET',\n        url : baseURL + '/FeedBody/' + id,\n        params : { flag_read : 1 }, \n        success : function(res) { },\n        scope : this\n    });\n    \n    Roo.select('.rss-list-article-' +id +\n               ' .count').first().dom.innerHTML =  'Read';\n\n    Roo.select('.rss-list-article-' +id).addClass('rss-list-article-read-status-1');\n    \n    Roo.select('.rss-list-article-' +id +\n               ' .count').show();\n    \n    Roo.select('.rss-list-article-' +id +\n               ' .count').first().dom.innerHTML =  'Read';\n\n    Roo.select('.rss-list-article-' +id +\n               ' .chevron').first().hide();\n    \n   \n        //Roo.select('header h2').first().dom.innerHTML = this.feed_title + ' - ' +\n        //        art.select('.rss-title').first().dom.innerH\n}",
+     "| function loadArticle" : "function(pos) { \n    \n\n    if (pos < 0) {\n        Roo.MessageBox.alert(\"error\", \"show article got < 0\");\n    }\n        \n    //    Roo.select('.hover-nav').show();\n    _this.table.hide(); // hopefully...\n    this.show();\n    \n    var rec = _this.table.store.getAt(pos);\n    if (typeof(rec.data.rss_body) == 'undefined') {\n\n            \n        new Pman.Request({\n            method: 'GET',\n            mask : 'Fetching Article',\n            url : baseURL + '/FeedBody/' + id,\n            success : function(res) {\n                rec.data.rss_body = res.responseText;\n                _this.article_ctr.showArticle(pos);\n                \n              \n            }\n        });\n        return;\n        \n    }\n\n    _this.articleBody.el.update(rec.data.rss_body || \"Body has not been loaded\",false, function() {\n        //Roo.log(\"body loaded\");\n        (function() { \n            var w = Roo.lib.Dom.getViewportWidth();\n\n            // resize the images... \n            _this.articleBody.el.select('img', true).each(function(im) {\n                if (im.getWidth() > w) {\n                    var sf = w/im.getWidth()  \n                    im.setSize(w, im.getHeight() * sf);\n                }\n                \n                    \n            });\n        }).defer(100);\n            \n    });\n    // hide the summary...\n    \n    \n    \n    \n    \n    //Roo.get(document.body).unmask();\n    \n    //Roo.select('.rss-art-count').first().update((this.pos +1) +'/' + this.articles.elements.length);\n   \n    // flag it as read...\n    \n    new Pman.Request({\n        method: 'GET',\n        url : baseURL + '/FeedBody/' + id,\n        params : { flag_read : 1 }, \n        success : function(res) { }\n    });\n    rec.set('has_read', 1);\n        \n    //Roo.select('.rss-list-article-' +id +\n    //           ' .count').show();\n    \n    //Roo.select('.rss-list-article-' +id +\n    //           ' .count').first().dom.innerHTML =  'Read';\n\n    //Roo.select('.rss-list-article-' +id +\n    //           ' .chevron').first().hide();\n    \n   \n        //Roo.select('header h2').first().dom.innerHTML = this.feed_title + ' - ' +\n        //        art.select('.rss-title').first().dom.innerH\n}",
      "$ xns" : "Roo.bootstrap",
      "Boolean hidden" : false,
      "items" : [

diff --git a/Reader/Feed.js b/Reader/Feed.js
index 857a02a..166480c 100644 (file)
--- a/Reader/Feed.js
+++ b/Reader/Feed.js
@@ -211,33 +211,28 @@ Feed = new Roo.XComponent({
          
          
          
-         Roo.get(document.body).unmask();
+         //Roo.get(document.body).unmask();
          
-         Roo.select('.rss-art-count').first().update((this.pos +1) +'/' + this.articles.elements.length);
+         //Roo.select('.rss-art-count').first().update((this.pos +1) +'/' + this.articles.elements.length);
         
          // flag it as read...
          
-         Roo.Ajax.request({
+         new Pman.Request({
              method: 'GET',
              url : baseURL + '/FeedBody/' + id,
              params : { flag_read : 1 }, 
-             success : function(res) { },
-             scope : this
+             success : function(res) { }
          });
+         rec.set('has_read', 1);
+             
+         //Roo.select('.rss-list-article-' +id +
+         //           ' .count').show();
          
-         Roo.select('.rss-list-article-' +id +
-                    ' .count').first().dom.innerHTML =  'Read';
-     
-         Roo.select('.rss-list-article-' +id).addClass('rss-list-article-read-status-1');
-         
-         Roo.select('.rss-list-article-' +id +
-                    ' .count').show();
-         
-         Roo.select('.rss-list-article-' +id +
-                    ' .count').first().dom.innerHTML =  'Read';
+         //Roo.select('.rss-list-article-' +id +
+         //           ' .count').first().dom.innerHTML =  'Read';
      
-         Roo.select('.rss-list-article-' +id +
-                    ' .chevron').first().hide();
+         //Roo.select('.rss-list-article-' +id +
+         //           ' .chevron').first().hide();
          
         
              //Roo.select('header h2').first().dom.innerHTML = this.feed_title + ' - ' +