Le mirroring des dépôts vers Github est maintenant natif dans Gitlab (et donc Framagit). Merci de passer à la fonction native pour que nous puissions couper notre solution maison. Détails sur https://docs.gitlab.com/ee/workflow/repository_mirroring.html#pushing-to-a-remote-repository (pensez à supprimer le webhook de notre solution maison).

Commit d8ee51a0 by yPhil

Merge branch 'dev'

parents 771f9e56 88de4230
Pipeline #41469 passed with stage
in 31 seconds
......@@ -43,6 +43,7 @@ PTL.menu = {
$newSourceButton.click(function() {
var $openGroupPanel = $($('.ui-tabs-active').find('a').attr('href')).find('.tabSort');
console.log('$openGroupPanel: ', $openGroupPanel.attr('class'));
$overlay.removeClass('visible');
$menu.removeClass('expanded');
PTL.feed.make($openGroupPanel, 'New Feed', 'mixed', 8, true);
......
PTL.tab = {
init:function() {
init:function(qstring) {
var $tabs = $('#tabs').tabs({
heightStyle: 'content',
......@@ -25,6 +25,10 @@ PTL.tab = {
}
});
if (qstring) {
PTL.qstring = qstring;
}
$tabs.on('mouseup', '.ui-tabs-active a', function(e){
e.preventDefault();
if (e.which === 1) {
......@@ -161,7 +165,7 @@ PTL.tab = {
},
make:function($tabs, name, feeds, progress) {
$tabs.tabs();
// $tabs.tabs();
$('#noSourcesButton').fadeOut('fast');
......@@ -174,6 +178,7 @@ PTL.tab = {
// .css('columns', 'auto ' + PTL.prefs.readConfig('columns'))
.attr('id', 'sortable' + tabIndex);
var $tabCloser = $('<i>')
.attr('class', 'icon-cancel tabCloser translate dangerous')
.data('title', PTL.tr('Delete the [%1] tab', name))
......@@ -229,6 +234,11 @@ PTL.tab = {
$sortable.appendTo($tabPanel);
$tabPanel.appendTo($tabs);
if (PTL.qstring) {
PTL.feed.make($('.tabSort').first(), PTL.qstring, 'mixed', 8, true);
PTL.qstring = null;
}
var $thisTabLink = $('<a href="#tab-' + tabIndex + '">' + name + '</a>');
var $thisTab = $('<li>')
......
......@@ -8,7 +8,7 @@ var feedrat = require('feedrat');
// require('request').debug = true;
router.get('/', function(req, res) {
res.render('index');
res.render('index', {qstring:req.query.source});
});
router.use(function(req,res,next){
......
......@@ -102,11 +102,21 @@
PTL.menu.top();
PTL.menu.side();
var qstring = "<%= qstring %>";
setTimeout(
function() {
PTL.tab.init();
PTL.tab.init(qstring);
// if (qstring) {
// var $openGroupPanel = $('#sortable1');
// console.log('qstring: %s, $openGroupPanel: ', qstring, $openGroupPanel.get())
// }
}, 500);
</script>
</body>
......
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