[Pkg-javascript-commits] [simile-timeline] 03/07: apply patch by Laurent Farcy, #645130

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository simile-timeline.

commit 25e5b325de30a4991e6893e91c7366332d1bc9b7
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sat Jan 17 13:12:41 2015 +0100

    apply patch by Laurent Farcy, #645130
---
 debian/changelog                             |  1 +
 debian/patches/prevent-negative-height.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 475913f..2c4d191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ simile-timeline (2.3.0+dfsg1-1) experimental; urgency=low
 
   * Use quilt format.
   * Remove minified jquery from source, recommend it (Closes: #645135).
+  * Apply patch by Laurent Farcy (Closes: #645130).
 
  -- W. Martin Borgert <debacle at debian.org>  Sat, 17 Jan 2015 11:36:10 +0000
 
diff --git a/debian/patches/prevent-negative-height.patch b/debian/patches/prevent-negative-height.patch
new file mode 100644
index 0000000..b3b1fd8
--- /dev/null
+++ b/debian/patches/prevent-negative-height.patch
@@ -0,0 +1,27 @@
+Description: Prevent ether highlight from getting a negative height
+Author: Laurent Farcy <laurent.farcy at argyl.fr>
+Origin: vendor
+Last-Update: 2015-01-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/webapp/api/scripts/ether-painters.js
++++ b/src/webapp/api/scripts/ether-painters.js
+@@ -563,14 +563,15 @@ Timeline.EtherHighlight = function(timeline, band, theme, backgroundLayer) {
+         var startPixel = Math.round(band.dateToPixelOffset(startDate));
+         var endPixel = Math.round(band.dateToPixelOffset(endDate));
+         var length = Math.max(endPixel - startPixel, 3);
++        var bandWidth = Math.max(band.getViewWidth(), 4); 
+         if (horizontal) {
+             this._highlightDiv.style.left = startPixel + "px";
+-            this._highlightDiv.style.width = length + "px";           
+-            this._highlightDiv.style.height = (band.getViewWidth() - 4) + "px";
++            this._highlightDiv.style.width = length + "px";
++            this._highlightDiv.style.height = (bandWidth - 4) + "px";
+         } else {
+             this._highlightDiv.style.top = startPixel + "px";
+             this._highlightDiv.style.height = length + "px";
+-            this._highlightDiv.style.width = (band.getViewWidth() - 4) + "px";
++            this._highlightDiv.style.width = (bandWidth - 4) + "px";
+         }
+     }
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 10aa251..bb8ac0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ant-build-xml.patch
+prevent-negative-height.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/simile-timeline.git