Commit b8b492637af50fecc557863bd0d5475f82eef426.diff

  • avatar
  • egaudet
  • Sun Sep 27 08:55:34 CEST 2009
Re-generated patch to create correct chunk headers
messaging/charcounter.patch
(96 / 74)
  
1diff -ur /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js /usr/palm/app-modified/com.palm.app.messaging/app/controllers/chatview-assistant.js
2--- /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js 2009-07-18 00:22:14.000000000 -0500
3+++ /usr/palm/app-modified/com.palm.app.messaging/app/controllers/chatview-assistant.js 2009-07-23 23:13:19.000000000 -0500
4@@ -160,6 +160,11 @@
1diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2index 0c816ba..e69aa92 100644
3--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
4+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
5@@ -160,7 +160,12 @@ var ChatviewAssistant = Class.create({
56 segmentCountContainer: this.controller.get('segmentCounterContainer'),
67 segmentCountElement: this.controller.get('segmentCounter'),
78 setTextFieldValueFn: this.setTextFieldValue.bind(this)
9- }
810+ },
9+ charCounter: {
10+ charCountContainer: this.controller.get('charCounterContainer'),
11+ charCountElement: this.controller.get('charCounter'),
12+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
13 }
11+ charCounter: {
12+ charCountContainer: this.controller.get('charCounterContainer'),
13+ charCountElement: this.controller.get('charCounter'),
14+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
15+ }
1416 };
1517
16diff -ur /usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js /usr/palm/app-modified/com.palm.app.messaging/app/controllers/compose-assistant.js
17--- /usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js 2009-07-18 00:22:14.000000000 -0500
18+++ /usr/palm/app-modified/com.palm.app.messaging/app/controllers/compose-assistant.js 2009-07-23 23:14:11.000000000 -0500
19@@ -140,6 +140,11 @@
18 this.characterCounter = new CharacterCounter(this.controller,this.Messaging.messagingPrefs.platformType,this.messageTextElement,charCounterParams);
19@@ -2115,4 +2120,4 @@ var ChatviewAssistant = Class.create({
20 this.controller.sceneScroller.mojo.revealBottom();
21 this.controller.sceneScroller.mojo.revealBottom();
22 }
23-});
24\ No newline at end of file
25+});
26diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
27index e023a89..2d4c30d 100644
28--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
29+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
30@@ -140,7 +140,12 @@ var ComposeAssistant = Class.create({
2031 segmentCountContainer: this.controller.get('segmentCounterContainer'),
2132 segmentCountElement: this.controller.get('segmentCounter'),
2233 setTextFieldValueFn: this.setTextFieldValue.bind(this)
34- }
2335+ },
24+ charCounter: {
25+ charCountContainer: this.controller.get('charCounterContainer'),
26+ charCountElement: this.controller.get('charCounter'),
27+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
28 }
36+ charCounter: {
37+ charCountContainer: this.controller.get('charCounterContainer'),
38+ charCountElement: this.controller.get('charCounter'),
39+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
40+ }
2941 };
3042
31diff -ur /usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html /usr/palm/app-modified/com.palm.app.messaging/app/views/chatview/chatview-scene.html
32--- /usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html 2009-07-18 00:22:14.000000000 -0500
33+++ /usr/palm/app-modified/com.palm.app.messaging/app/views/chatview/chatview-scene.html 2009-07-23 23:16:55.000000000 -0500
34@@ -22,6 +22,10 @@
35 <div id="messageContainer" class='palm-row'>
36 <div class="palm-row-wrapper textfield-group focused">
37 <div class="title">
38+ <div id="charCounterContainer">
39+ <div id="charCounter">
40+ </div>
41+ </div>
42 <div id="attachmentContainer" style="display: none;">
43 <div id="cancelAttachment">
44 </div>
45diff -ur /usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html /usr/palm/app-modified/com.palm.app.messaging/app/views/compose/compose-scene.html
46--- /usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html 2009-07-18 00:22:14.000000000 -0500
47+++ /usr/palm/app-modified/com.palm.app.messaging/app/views/compose/compose-scene.html 2009-07-23 23:17:14.000000000 -0500
48@@ -6,6 +6,10 @@
49 <div id="messageContainer" class='palm-row'>
50 <div class="palm-row-wrapper textfield-group focused">
51 <div class="title">
52+ <div id="charCounterContainer">
53+ <div id="charCounter">
54+ </div>
55+ </div>
56 <div id="attachmentContainer" style="display: none;">
57 <div id="cancelAttachment">
58 </div>
59diff -ur /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css /usr/palm/app-modified/com.palm.app.messaging/stylesheets/messaging.css
60--- /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css 2009-07-18 00:22:22.000000000 -0500
61+++ /usr/palm/app-modified/com.palm.app.messaging/stylesheets/messaging.css 2009-07-23 23:19:25.000000000 -0500
62@@ -837,6 +837,23 @@
63 #messageContainer.palm-row .icon.right {
64 height: 61px;
65 }
66+#messageContainer #charCounterContainer {
67+ line-height: 20px;
68+ display:block;
69+ height: 20px;
70+ border-width: 0px 10px 0px 9px;
71+ -webkit-border-image: url(../images/message-segment-badge.png) 0 10 0 9 stretch stretch;
72+ position: absolute;
73+ z-index: 3;
74+ top: 2px;
75+ left: 2px;
76+}
77+#messageContainer #charCounterContainer #charCounter {
78+ font-size: 12px;
79+ font-weight: bold;
80+ color: #679BC2;
81+ margin: 0px -4px 3px -3px;
82+}
83 #messageContainer #attachmentContainer {
84 position: relative;
85 margin-top:10px;
86
43 this.characterCounter = new CharacterCounter(this.controller,this.Messaging.messagingPrefs.platformType,this.messageTextElement,charCounterParams);
8744diff --git a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js b/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
8845index 9e0cbc6..ea22829 100644
8946--- a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
……
119119-});
120120\ No newline at end of file
121121+});
122diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
123index d0d8745..7ecb65a 100644
124--- a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
125+++ b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
126@@ -22,6 +22,10 @@
127 <div id="messageContainer" class='palm-row'>
128 <div class="palm-row-wrapper textfield-group focused">
129 <div class="title">
130+ <div id="charCounterContainer">
131+ <div id="charCounter">
132+ </div>
133+ </div>
134 <div id="attachmentContainer" style="display: none;">
135 <div id="cancelAttachment">
136 </div>
137diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html b/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
138index 30daa88..238d597 100644
139--- a/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
140+++ b/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
141@@ -6,6 +6,10 @@
142 <div id="messageContainer" class='palm-row'>
143 <div class="palm-row-wrapper textfield-group focused">
144 <div class="title">
145+ <div id="charCounterContainer">
146+ <div id="charCounter">
147+ </div>
148+ </div>
149 <div id="attachmentContainer" style="display: none;">
150 <div id="cancelAttachment">
151 </div>
152diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
153index fe6127a..ae0c424 100644
154--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
155+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
156@@ -837,6 +837,23 @@ img.avatar-overlay {
157 #messageContainer.palm-row .icon.right {
158 height: 61px;
159 }
160+#messageContainer #charCounterContainer {
161+ line-height: 20px;
162+ display:block;
163+ height: 20px;
164+ border-width: 0px 10px 0px 9px;
165+ -webkit-border-image: url(../images/message-segment-badge.png) 0 10 0 9 stretch stretch;
166+ position: absolute;
167+ z-index: 3;
168+ top: 2px;
169+ left: 2px;
170+}
171+#messageContainer #charCounterContainer #charCounter {
172+ font-size: 12px;
173+ font-weight: bold;
174+ color: #679BC2;
175+ margin: 0px -4px 3px -3px;
176+}
177 #messageContainer #attachmentContainer {
178 position: relative;
179 margin-top:10px;
180@@ -1152,4 +1169,4 @@ img.avatar-overlay {
181 }
182 #im-links .palm-row .title {
183 padding: 9px 14px;
184-}
185\ No newline at end of file
186+}