Commit 9b960944 authored by yPhil's avatar yPhil

Merge branch 'feed-item'

parents 4d72e035 6575e86b
...@@ -188,7 +188,6 @@ div.dialog { ...@@ -188,7 +188,6 @@ div.dialog {
position:relative; position:relative;
text-align:left; text-align:left;
transition: height .3s ease-in-out; transition: height .3s ease-in-out;
width: 100%;
} }
#console.expanded { #console.expanded {
......
...@@ -213,9 +213,7 @@ PTL.dialog = { ...@@ -213,9 +213,7 @@ PTL.dialog = {
PTL.util.help('dialog'); PTL.util.help('dialog');
}).appendTo($dialog.parent().find('.ui-dialog-titlebar')); }).appendTo($dialog.parent().find('.ui-dialog-titlebar'));
if (isNewFeed) { if (isNewFeed) $killFeedFieldset.remove();
$killFeedFieldset.remove();
}
if (!PTL.util.isMobile()) { if (!PTL.util.isMobile()) {
$guessField.click(function() { $guessField.click(function() {
...@@ -236,7 +234,7 @@ PTL.dialog = { ...@@ -236,7 +234,7 @@ PTL.dialog = {
timeout: 1200 timeout: 1200
}, function() { }, function() {
$guessSpinner.removeClass('spin icon-cog'); $guessSpinner.removeClass('spin icon-cog');
}).done(function(feed, status) { }).done(function(feed) {
$guessField.val(feed); $guessField.val(feed);
...@@ -248,7 +246,7 @@ PTL.dialog = { ...@@ -248,7 +246,7 @@ PTL.dialog = {
.addClass('ui-state-success') .addClass('ui-state-success')
.attr('title', PTL.tr('Valid feed found! Now just press OK')) ; .attr('title', PTL.tr('Valid feed found! Now just press OK')) ;
}).fail(function(feed, status) { }).fail(function() {
guessError(); guessError();
}); });
......
...@@ -221,7 +221,6 @@ PTL.tab = { ...@@ -221,7 +221,6 @@ PTL.tab = {
$column.appendTo($tabPanel); $column.appendTo($tabPanel);
if (PTL.queryString) { if (PTL.queryString) {
PTL.feed.add($column, encodeURI(PTL.queryString), 'mixed', 8, true, true); PTL.feed.add($column, encodeURI(PTL.queryString), 'mixed', 8, true, true);
PTL.queryString = null; PTL.queryString = null;
...@@ -229,16 +228,13 @@ PTL.tab = { ...@@ -229,16 +228,13 @@ PTL.tab = {
if (!newTab) { if (!newTab) {
feeds.forEach(function(feed) { feeds.forEach(function(feed) {
var url = PTL.util.isUrl(feed.url) ? feed.url : PTL.tr('Unrecognized URL'), var type = PTL.feedTypes.includes(feed.type) ? feed.type : 'mixed',
type = PTL.feedTypes.includes(feed.type) ? feed.type : 'mixed',
limit = Number.isInteger(feed.limit) ? feed.limit : 8; limit = Number.isInteger(feed.limit) ? feed.limit : 8;
PTL.feed.add($column, url, type, limit, false, false, progress); PTL.feed.add($column, feed.url, type, limit, false, false, progress);
}); });
} }
if (nbOfColumnsInTab <2) { if (nbOfColumnsInTab <2) $column.find('.col-del').addClass('ui-state-disabled');
$column.find('.col-del').addClass('ui-state-disabled');
}
}); });
...@@ -246,9 +242,6 @@ PTL.tab = { ...@@ -246,9 +242,6 @@ PTL.tab = {
$tabs.tabs('refresh'); $tabs.tabs('refresh');
$tabs.tabs( "option", "active", 0); $tabs.tabs( "option", "active", 0);
// PTL.tab.saveTabs();
// $('#ui-id-1').focus();
}, },
list:function(type) { list:function(type) {
......
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
for="kill-feed-check" for="kill-feed-check"
data-title="Delete feed" data-title="Delete feed"
title="Delete feed" title="Delete feed"
data-content="Delete feed"> data-content="Delete this feed">
Delete Feed Delete this feed
</label> </label>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment