Adium Theme Ubuntu

Merge lp:adium-theme-ubuntu into lp:~tkluck/adium-theme-ubuntu/adium-theme-ubuntu

  1. trunk
  2. Merge into adium-theme-ubuntu
Proposed by Timo Kluck
Status: Needs review
Proposed branch: lp:adium-theme-ubuntu
Merge into: lp:~tkluck/adium-theme-ubuntu/adium-theme-ubuntu
Diff against target: 83 lines (+18/-4)
6 files modified
setup.py (+2/-4)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html (+1/-0)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html (+1/-0)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html (+1/-0)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html (+1/-0)
ubuntu.AdiumMessageStyle/Contents/Resources/Template.html (+12/-0)
To merge this branch: bzr merge lp:adium-theme-ubuntu
Reviewer Review Type Date Requested Status
Timo Kluck Pending
Review via email: mp+284367@code.launchpad.net

Description of the change

Hi there!

I noticed a few visual bugs in the chat history in empathy's conversation view. I traced this down to an issue with prepending messages. The commit+message should be fairly self-explanatory.

Thanks for taking the time to have a look.

To post a comment you must log in.
Revision history for this message
Timo Kluck (tkluck) wrote :

Haha, of course I meant to propose the reverse merge! :) I'll leave this here for now to save a few status change emails; but do let me know if you prefer that I remove this merge proposal and create a new one.

Reply
lp:adium-theme-ubuntu updated
20. By Ken VanDine

Manually merged in patches already uploaded to yakety thanks to Andrew Shadura

Unmerged revisions

20. By Ken VanDine

Manually merged in patches already uploaded to yakety thanks to Andrew Shadura

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2014-02-25 14:17:34 +0000
3+++ setup.py 2016-05-06 15:50:48 +0000
4@@ -9,10 +9,8 @@
5 glob.glob('ubuntu.AdiumMessageStyle/Contents/Info.plist')),
6 ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources',
7 glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/*.*')),
8- ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/balloons',
9- glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/balloons/*.*')),
10- ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/corners',
11- glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/corners/*.*')),
12+ ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/Variants',
13+ glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/Variants/*.*')),
14 ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/images',
15 glob.glob('ubuntu.AdiumMessageStyle/Contents/Resources/images/*.*')),
16 ('share/adium/message-styles/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming',
17
18=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html'
19--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2010-12-15 21:36:51 +0000
20+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2016-05-06 15:50:48 +0000
21@@ -1,4 +1,5 @@
22 <div>
23+ <span id="prepend"></span>
24 <div class="followUp"></div>
25 <div>
26
27
28=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html'
29--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2010-06-13 12:15:37 +0000
30+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2016-05-06 15:50:48 +0000
31@@ -1,3 +1,4 @@
32+ <span id="prepend"></span>
33 <div class="followUp"></div>
34 <div>
35
36
37=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html'
38--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2010-12-15 21:36:51 +0000
39+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2016-05-06 15:50:48 +0000
40@@ -1,4 +1,5 @@
41 <div>
42+ <span id="prepend"></span>
43 <div class="followUp"></div>
44 <div>
45 %message%
46
47=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html'
48--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2010-06-13 12:15:37 +0000
49+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2016-05-06 15:50:48 +0000
50@@ -1,3 +1,4 @@
51+<span id="prepend"></span>
52 <div class="followUp"></div>
53 <div>
54 %message%
55
56=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Template.html'
57--- ubuntu.AdiumMessageStyle/Contents/Resources/Template.html 2014-02-24 22:12:20 +0000
58+++ ubuntu.AdiumMessageStyle/Contents/Resources/Template.html 2016-05-06 15:50:48 +0000
59@@ -33,6 +33,12 @@
60 function appendMessage(html) {
61 var shouldScroll = nearBottom();
62
63+ appendMessageNoScroll(html, shouldScroll);
64+ }
65+
66+ function appendMessageNoScroll(html, shouldScroll) {
67+ shouldScroll = shouldScroll || false;
68+
69 //Remove any existing insertion point
70 var insert = document.getElementById("insert");
71
72@@ -65,6 +71,12 @@
73 function appendNextMessage(html){
74 var shouldScroll = nearBottom();
75
76+ appendNextMessageNoScroll(html, shouldScroll);
77+ }
78+
79+ function appendNextMessageNoScroll(html, shouldScroll){
80+ shouldScroll = shouldScroll || false;
81+
82 //Locate the insertion point
83 var insert = document.getElementById("insert");
84

Subscribers

People subscribed via source and target branches

to all changes: