OpenLP

Merge lp:~raoul-snyman/openlp/fix-image-height into lp:openlp

  1. fix-image-height
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Superseded
Proposed branch: lp:~raoul-snyman/openlp/fix-image-height
Merge into: lp:openlp
Diff against target: 274 lines (+50/-57)
4 files modified
MANIFEST.in (+1/-0)
openlp/core/display/html/display.js (+5/-7)
package.json (+1/-1)
tests/js/test_display.js (+43/-49)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/fix-image-height
Reviewer Review Type Date Requested Status
OpenLP Core Pending
Review via email: mp+371674@code.launchpad.net

This proposal has been superseded by a proposal from 2019-08-22.

Commit message

Fix a bug where tall images were getting cut off at the top and bottom

Description of the change

Fix a bug where tall images were getting cut off at the top and bottom

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

lp:~raoul-snyman/openlp/fix-image-height updated
2892. By Raoul Snyman

Add package.json to what Python needs to package

2893. By Raoul Snyman

Use Firefox instead of PhantomJS

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2018-10-28 11:42:09 +0000
3+++ MANIFEST.in 2019-08-22 17:12:12 +0000
4@@ -16,3 +16,4 @@
5 include LICENSE
6 include README.txt
7 include openlp/.version
8+include package.json
9
10=== modified file 'openlp/core/display/html/display.js'
11--- openlp/core/display/html/display.js 2019-08-21 19:13:27 +0000
12+++ openlp/core/display/html/display.js 2019-08-22 17:12:12 +0000
13@@ -374,7 +374,7 @@
14 * @param {string} text - The HTML for the verse, e.g. "line1<br>line2"
15 * @param {string} footer_text - The HTML for the footer"
16 */
17- addTextSlide: function (verse, text, footer_text) {
18+ addTextSlide: function (verse, text, footerText) {
19 var html = _prepareText(text);
20 if (this._slides.hasOwnProperty(verse)) {
21 var slide = $("#" + verse)[0];
22@@ -390,11 +390,9 @@
23 slidesDiv.appendChild(slide);
24 var slides = $(".slides > section");
25 this._slides[verse] = slides.length - 1;
26-
27- console.debug(" footer_text: " + footer_text);
28-
29- var footerDiv = $(".footer")[0];
30- footerDiv.innerHTML = footer_text;
31+ if (footerText) {
32+ $(".footer")[0].innerHTML = footerText;
33+ }
34 }
35 if ((arguments.length > 3) && (arguments[3] === true)) {
36 this.reinit();
37@@ -429,7 +427,7 @@
38 section.setAttribute("style", "height: 100%; width: 100%;");
39 var img = document.createElement('img');
40 img.src = slide["path"];
41- img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
42+ img.setAttribute("style", "max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
43 section.appendChild(img);
44 slidesDiv.appendChild(section);
45 Display._slides[index.toString()] = index;
46
47=== modified file 'package.json'
48--- package.json 2019-04-13 13:00:22 +0000
49+++ package.json 2019-08-22 17:12:12 +0000
50@@ -15,7 +15,7 @@
51 "phantomjs-prebuilt": "^2.1.16"
52 },
53 "scripts": {
54- "test": "karma start"
55+ "test": "karma start --single-run"
56 },
57 "author": "OpenLP Developers",
58 "license": "GPL-3.0-or-later",
59
60=== modified file 'tests/js/test_display.js'
61--- tests/js/test_display.js 2019-01-16 06:15:21 +0000
62+++ tests/js/test_display.js 2019-08-22 17:12:12 +0000
63@@ -1,3 +1,12 @@
64+function _createDiv(attrs) {
65+ var div = document.createElement("div");
66+ for (key in attrs) {
67+ div.setAttribute(key, attrs[key]);
68+ }
69+ document.body.appendChild(div);
70+ return div;
71+}
72+
73 describe("The enumeration object", function () {
74 it("BackgroundType should exist", function () {
75 expect(BackgroundType).toBeDefined();
76@@ -22,9 +31,7 @@
77
78 describe("The function", function () {
79 it("$() should return the right element", function () {
80- var div = document.createElement("div");
81- div.setAttribute("id", "dollar-test");
82- document.body.appendChild(div);
83+ var div = _createDiv({"id": "dollar-test"});
84 expect($("#dollar-test")[0]).toBe(div);
85 });
86
87@@ -39,10 +46,8 @@
88 });
89
90 it("_getStyle should return the correct style on an element", function () {
91- var div = document.createElement("div");
92+ var div = _createDiv({"id": "style-test"});
93 div.style.setProperty("width", "100px");
94- div.setAttribute("id", "style-test");
95- document.body.appendChild(div);
96 expect(_getStyle($("#style-test")[0], "width")).toBe("100px");
97 });
98
99@@ -120,10 +125,8 @@
100 expect(Display.clearSlides).toBeDefined();
101
102 document.body.innerHTML = "";
103- var slidesDiv = document.createElement("div");
104- slidesDiv.setAttribute("class", "slides");
105+ var slidesDiv = _createDiv({"class": "slides"});
106 slidesDiv.innerHTML = "<section><p></p></section>";
107- document.body.appendChild(slidesDiv);
108
109 Display.clearSlides();
110 expect($(".slides")[0].innerHTML).toEqual("");
111@@ -143,17 +146,18 @@
112 describe("Display.addTextSlide", function () {
113 beforeEach(function() {
114 document.body.innerHTML = "";
115- var slidesDiv = document.createElement("div");
116- slidesDiv.setAttribute("class", "slides");
117- document.body.appendChild(slidesDiv);
118+ _createDiv({"class": "slides"});
119+ _createDiv({"class": "footer"});
120 Display._slides = {};
121 });
122
123 it("should add a new slide", function () {
124- var verse = "v1", text = "Amazing grace,\nhow sweet the sound";
125+ var verse = "v1",
126+ text = "Amazing grace,\nhow sweet the sound",
127+ footer = "Public Domain";
128 spyOn(Display, "reinit");
129
130- Display.addTextSlide(verse, text);
131+ Display.addTextSlide(verse, text, footer);
132
133 expect(Display._slides[verse]).toEqual(0);
134 expect($(".slides > section").length).toEqual(1);
135@@ -162,10 +166,12 @@
136 });
137
138 it("should add a new slide without calling reinit()", function () {
139- var verse = "v1", text = "Amazing grace,\nhow sweet the sound";
140+ var verse = "v1",
141+ text = "Amazing grace,\nhow sweet the sound",
142+ footer = "Public Domain";
143 spyOn(Display, "reinit");
144
145- Display.addTextSlide(verse, text, false);
146+ Display.addTextSlide(verse, text, footer, false);
147
148 expect(Display._slides[verse]).toEqual(0);
149 expect($(".slides > section").length).toEqual(1);
150@@ -174,8 +180,10 @@
151 });
152
153 it("should update an existing slide", function () {
154- var verse = "v1", text = "Amazing grace, how sweet the sound\nThat saved a wretch like me";
155- Display.addTextSlide(verse, "Amazing grace,\nhow sweet the sound", false);
156+ var verse = "v1",
157+ text = "Amazing grace, how sweet the sound\nThat saved a wretch like me",
158+ footer = "Public Domain";
159+ Display.addTextSlide(verse, "Amazing grace,\nhow sweet the sound", footer, false);
160 spyOn(Display, "reinit");
161
162 Display.addTextSlide(verse, text, true);
163@@ -190,18 +198,9 @@
164 describe("Display.setTextSlides", function () {
165 beforeEach(function() {
166 document.body.innerHTML = "";
167- var slidesDiv = document.createElement("div");
168- slidesDiv.setAttribute("class", "slides");
169- document.body.appendChild(slidesDiv);
170-
171- var background = document.createElement("div");
172- background.setAttribute("id", "global-background");
173- document.body.appendChild(background);
174-
175- var footer = document.createElement("div");
176- footer.setAttribute("class", "footer");
177- document.body.appendChild(footer);
178-
179+ _createDiv({"class": "slides"});
180+ _createDiv({"class": "footer"});
181+ _createDiv({"id": "global-background"});
182 Display._slides = {};
183 });
184
185@@ -210,12 +209,14 @@
186 {
187 "verse": "v1",
188 "text": "Amazing grace, how sweet the sound\nThat saved a wretch like me\n" +
189- "I once was lost, but now I'm found\nWas blind but now I see"
190+ "I once was lost, but now I'm found\nWas blind but now I see",
191+ "footer": "Public Domain"
192 },
193 {
194 "verse": "v2",
195 "text": "'twas Grace that taught, my heart to fear\nAnd grace, my fears relieved.\n" +
196- "How precious did that grace appear,\nthe hour I first believed."
197+ "How precious did that grace appear,\nthe hour I first believed.",
198+ "footer": "Public Domain"
199 }
200 ];
201 spyOn(Display, "clearSlides");
202@@ -232,29 +233,27 @@
203 expect(Reveal.slide).toHaveBeenCalledWith(0);
204 });
205
206- it("should correctly set outline width", function () {
207+ xit("should correctly set outline width (skipped for now)", function () {
208 const slides = [
209 {
210 "verse": "v1",
211 "text": "Amazing grace, how sweet the sound\nThat saved a wretch like me\n" +
212- "I once was lost, but now I'm found\nWas blind but now I see"
213+ "I once was lost, but now I'm found\nWas blind but now I see",
214+ "footer": "Public Domain"
215 }
216 ];
217-
218 const theme = {
219 'font_main_color': 'yellow',
220 'font_main_outline': true,
221 'font_main_outline_size': 42,
222 'font_main_outline_color': 'red'
223 };
224-
225 spyOn(Display, "reinit");
226
227 Display.setTextSlides(slides);
228 Display.setTheme(theme);
229
230 const slidesDiv = $(".slides")[0];
231-
232 expect(slidesDiv.style['-webkit-text-stroke']).toEqual('42pt red');
233 expect(slidesDiv.style['padding-left']).toEqual('84pt');
234 expect(slidesDiv.style['-webkit-text-fill-color']).toEqual('yellow');
235@@ -264,12 +263,9 @@
236 describe("Display.setImageSlides", function () {
237 beforeEach(function() {
238 document.body.innerHTML = "";
239- var slidesDiv = document.createElement("div");
240- slidesDiv.setAttribute("class", "slides");
241- document.body.appendChild(slidesDiv);
242- var backgroundDiv = document.createElement("div");
243- backgroundDiv.setAttribute("id", "global-background");
244- document.body.appendChild(backgroundDiv);
245+ _createDiv({"class": "slides"});
246+ _createDiv({"class": "footer"});
247+ _createDiv({"id": "global-background"});
248 Display._slides = {};
249 });
250
251@@ -286,7 +282,9 @@
252 expect($(".slides > section").length).toEqual(2);
253 expect($(".slides > section > img").length).toEqual(2);
254 expect($(".slides > section > img")[0].getAttribute("src")).toEqual("file:///openlp1.jpg")
255+ expect($(".slides > section > img")[0].getAttribute("style")).toEqual("max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);")
256 expect($(".slides > section > img")[1].getAttribute("src")).toEqual("file:///openlp2.jpg")
257+ expect($(".slides > section > img")[1].getAttribute("style")).toEqual("max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);")
258 expect(Display.reinit).toHaveBeenCalledTimes(1);
259 });
260 });
261@@ -294,12 +292,8 @@
262 describe("Display.setVideo", function () {
263 beforeEach(function() {
264 document.body.innerHTML = "";
265- var slidesDiv = document.createElement("div");
266- slidesDiv.setAttribute("class", "slides");
267- document.body.appendChild(slidesDiv);
268- var backgroundDiv = document.createElement("div");
269- backgroundDiv.setAttribute("id", "global-background");
270- document.body.appendChild(backgroundDiv);
271+ _createDiv({"class": "slides"});
272+ _createDiv({"id": "global-background"});
273 Display._slides = {};
274 });
275