From 588d1948cadd9f443de481b95827c926330547fe Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 02 Sep 2014 03:16:33 -0400 Subject: [PATCH] Don't cancel event on parent focus --- program/js/list.js | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/program/js/list.js b/program/js/list.js index cdb1a46..d1dbbcb 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -131,7 +131,7 @@ } if (this.parent_focus) { - this.list.parentNode.onclick = function(e) { me.focus(e); }; + this.list.parentNode.onclick = function(e) { me.focus(); }; } return this; @@ -1417,7 +1417,8 @@ */ scrollto: function(id) { - var row = this.rows[id].obj; + var row = this.rows[id] ? this.rows[id].obj : null; + if (row && this.frame) { var scroll_to = Number(row.offsetTop), head_offset = 0; @@ -1506,7 +1507,11 @@ $('> ' + self.col_tagname(), self.rows[uid].obj).each(function(n, cell) { if (self.subject_col < 0 || (self.subject_col >= 0 && self.subject_col == n)) { - var subject = $(cell).text(); + // remove elements marked with "skip-on-drag" class + cell = $(cell).clone(); + $(cell).find('.skip-on-drag').remove(); + + var subject = cell.text(); if (subject) { // remove leading spaces -- Gitblit v1.9.1