diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-08-07 15:30:01 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-08-07 15:30:12 +0200 |
| commit | c8b04a1395798404a87e27b7a3f69f5d45859a0c (patch) | |
| tree | 785ab602ee5cead371a5432b07bd0394666b2c23 | |
| parent | 4c9601da0f23027e02bd9922d6dd8a6ccd28a97c (diff) | |
also use title as folder name if text is not on the opml outline element, fix #306
| -rw-r--r-- | css/items.css | 8 | ||||
| -rw-r--r-- | js/app/services/opmlparser.coffee | 3 | ||||
| -rw-r--r-- | js/public/app.js | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/css/items.css b/css/items.css index b99d07789..19abdf909 100644 --- a/css/items.css +++ b/css/items.css @@ -204,7 +204,13 @@ max-width: 770px; font-size: 14px; clear: both; - overflow: auto; + overflow-x: auto; + /*overflow-y: hidden; + height: 80px;*/ + } + + .feed_item .body.opened { + } .feed_item .body p { diff --git a/js/app/services/opmlparser.coffee b/js/app/services/opmlparser.coffee index 904ff2954..4fa2851d2 100644 --- a/js/app/services/opmlparser.coffee +++ b/js/app/services/opmlparser.coffee @@ -70,7 +70,8 @@ angular.module('News').factory 'OPMLParser', -> feed = new Feed($outline.attr('text'), $outline.attr('xmlUrl')) structure.add(feed) else - folder = new Folder($outline.attr('text')) + title = $outline.attr('text') || $outline.attr('title') + folder = new Folder(title) structure.add(folder) @_recursivelyParse($outline, folder) diff --git a/js/public/app.js b/js/public/app.js index 653b857d1..39cd509c4 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -2407,7 +2407,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. }; OPMLParser.prototype._recursivelyParse = function($xml, structure) { - var $outline, feed, folder, outline, _i, _len, _ref, _results; + var $outline, feed, folder, outline, title, _i, _len, _ref, _results; _ref = $xml.children('outline'); _results = []; for (_i = 0, _len = _ref.length; _i < _len; _i++) { @@ -2417,7 +2417,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. feed = new Feed($outline.attr('text'), $outline.attr('xmlUrl')); _results.push(structure.add(feed)); } else { - folder = new Folder($outline.attr('text')); + title = $outline.attr('text') || $outline.attr('title'); + folder = new Folder(title); structure.add(folder); _results.push(this._recursivelyParse($outline, folder)); } |