Commit 77f7ee83d231a5c869489290529fed95d6b88e0c

  • avatar
  • egaudet
  • Tue Sep 29 05:01:09 CEST 2009
Ported to 1.2.0 by HattCzech
messaging/charcounter.patch
(84 / 102)
  
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,6 +160,11 @@ var ChatviewAssistant = Class.create({
1diff -ur /usr/palm/app-original/com.palm.app.messaging/app/controllers/chatview-assistant.js /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2--- /usr/palm/app-original/com.palm.app.messaging/app/controllers/chatview-assistant.js 2009-09-13 23:09:56.000000000 -0500
3+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js 2009-09-28 15:29:40.000000000 -0500
4@@ -187,6 +187,11 @@
65 segmentCountContainer: this.controller.get('segmentCounterContainer'),
76 segmentCountElement: this.controller.get('segmentCounter'),
87 setTextFieldValueFn: this.setTextFieldValue.bind(this)
98+ },
10+ charCounter: {
11+ charCountContainer: this.controller.get('charCounterContainer'),
12+ charCountElement: this.controller.get('charCounter'),
13+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
9+ charCounter: {
10+ charCountContainer: this.controller.get('charCounterContainer'),
11+ charCountElement: this.controller.get('charCounter'),
12+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
1413 }
1514 };
1615
17diff --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
18index e023a89..2d4c30d 100644
19--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
20+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
21@@ -140,6 +140,11 @@ var ComposeAssistant = Class.create({
16diff -ur /usr/palm/app-original/com.palm.app.messaging/app/controllers/compose-assistant.js /usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
17--- /usr/palm/app-original/com.palm.app.messaging/app/controllers/compose-assistant.js 2009-09-13 23:09:56.000000000 -0500
18+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js 2009-09-28 15:30:36.000000000 -0500
19@@ -140,6 +140,11 @@
2220 segmentCountContainer: this.controller.get('segmentCounterContainer'),
2321 segmentCountElement: this.controller.get('segmentCounter'),
2422 setTextFieldValueFn: this.setTextFieldValue.bind(this)
2523+ },
26+ charCounter: {
27+ charCountContainer: this.controller.get('charCounterContainer'),
28+ charCountElement: this.controller.get('charCounter'),
29+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
24+ charCounter: {
25+ charCountContainer: this.controller.get('charCounterContainer'),
26+ charCountElement: this.controller.get('charCounter'),
27+ setTextFieldValueFn: this.setTextFieldValue.bind(this)
3028 }
3129 };
3230
33diff --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
34index 9e0cbc6..ea22829 100644
35--- a/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
36+++ b/usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
37@@ -39,6 +39,10 @@ var CharacterCounter = Class.create({
31diff -ur /usr/palm/app-original/com.palm.app.messaging/app/utilities/CharacterCounter.js /usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js
32--- /usr/palm/app-original/com.palm.app.messaging/app/utilities/CharacterCounter.js 2009-09-13 23:09:56.000000000 -0500
33+++ /usr/palm/applications/com.palm.app.messaging/app/utilities/CharacterCounter.js 2009-09-28 15:34:44.000000000 -0500
34@@ -58,6 +58,10 @@
3835 containerElement: null,
3936 valueElement: null
4037 };
41+ var charCounterUI = {
42+ containerElement: null,
43+ valueElement: null
44+ };
38+ var charCounterUI = {
39+ containerElement: null,
40+ valueElement: null
41+ };
4542
4643
4744 // TODO: eventually we might want to implement some cleverness that counts
48@@ -51,6 +55,11 @@ var CharacterCounter = Class.create({
49 var message = textAreaElement.value;
50 return {count:message.length, message:message};
51 };
52+ var charCounterUI = {
53+ containerElement: null,
54+ valueElement: null
55+ };
56+
57
58 var setOverLimit = function(isOver) {
59 if (isOver) {
60@@ -185,6 +194,20 @@ var CharacterCounter = Class.create({
45@@ -291,6 +295,20 @@
6146 }
6247 };
6348
64+ var setCurrentCharCount = function(newCharCount) {
65+ if(charCounterUI.valueElement)
66+ charCounterUI.valueElement.update(newCharCount);
67+ if(charCounterUI.containerElement) {
68+ if (newCharCount == 0) {
69+ if (charCounterUI.containerElement.visible())
70+ charCounterUI.containerElement.hide();
71+ } else {
72+ if (!charCounterUI.containerElement.visible())
73+ charCounterUI.containerElement.show();
74+ }
75+ }
76+ };
77+
49+ var setCurrentCharCount = function(newCharCount) {
50+ if(charCounterUI.valueElement)
51+ charCounterUI.valueElement.update(newCharCount);
52+ if(charCounterUI.containerElement) {
53+ if (newCharCount == 0) {
54+ if (charCounterUI.containerElement.visible())
55+ charCounterUI.containerElement.hide();
56+ } else {
57+ if (!charCounterUI.containerElement.visible())
58+ charCounterUI.containerElement.show();
59+ }
60+ }
61+ };
62+
7863 return {
7964
8065 init: function(controller,platform,textElement,params) {
81@@ -265,7 +288,13 @@ var CharacterCounter = Class.create({
66@@ -451,7 +469,13 @@
8267 setTextFieldValueFn = params.segmentCounter.setTextFieldValueFn;
8368 }
8469 }
8570-
86+ if (params.charCounter) {
87+ charCounterUI.containerElement = params.charCounter.charCountContainer;
88+ charCounterUI.valueElement = params.charCounter.charCountElement;
89+ if (params.charCounter.setTextFieldValueFn) {
90+ setTextFieldValueFn = params.charCounter.setTextFieldValueFn;
91+ }
92+ }
71+ if(params.charCounter) {
72+ charCounterUI.containerElement = params.charCounter.charCountContainer;
73+ charCounterUI.valueElement = params.charCounter.charCountElement;
74+ if(params.charCounter.setTextFieldValueFn) {
75+ setTextFieldValueFn = params.charCounter.setTextFieldValueFn;
76+ }
77+ }
9378 }
9479 },
9580
96@@ -304,6 +333,7 @@ var CharacterCounter = Class.create({
97 var rawCharacterData = getRawCharacterData();
98 var messageData = parseMessage(rawCharacterData.message,rawCharacterData.count,_maxLength,true);
81@@ -517,6 +541,7 @@
82
83 var messageData = parseMessage(rawCharacterData.message,rawCharacterData.count,true);
9984 adjustedCharacterCount = messageData.adjustedCharacterCount;
100+ setCurrentCharCount(rawCharacterData.count);
101 if (_maxLength > 0)
85+ setCurrentCharCount(rawCharacterData.count);
86 if (adjustedMaxLen > 0)
10287 setOverLimit(messageData.isOverLimit);
10388 setCurrentSegmentCount(messageData.segmentCount);
104diff --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
105index d0d8745..7ecb65a 100644
106--- a/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
107+++ b/usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
89diff -ur /usr/palm/app-original/com.palm.app.messaging/app/views/chatview/chatview-scene.html /usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html
90--- /usr/palm/app-original/com.palm.app.messaging/app/views/chatview/chatview-scene.html 2009-09-13 23:09:57.000000000 -0500
91+++ /usr/palm/applications/com.palm.app.messaging/app/views/chatview/chatview-scene.html 2009-09-28 15:35:16.000000000 -0500
10892@@ -22,6 +22,10 @@
10993 <div id="messageContainer" class='palm-row'>
11094 <div class="palm-row-wrapper textfield-group focused">
11195 <div class="title">
112+ <div id="charCounterContainer">
113+ <div id="charCounter">
114+ </div>
115+ </div>
96+ <div id="charCounterContainer" style="display: none;">
97+ <div id="charCounter">
98+ </div>
99+ </div>
116100 <div id="attachmentContainer" style="display: none;">
117101 <div id="cancelAttachment">
118102 </div>
119diff --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
120index 30daa88..238d597 100644
121--- a/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
122+++ b/usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
103diff -ur /usr/palm/app-original/com.palm.app.messaging/app/views/compose/compose-scene.html /usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html
104--- /usr/palm/app-original/com.palm.app.messaging/app/views/compose/compose-scene.html 2009-09-13 23:09:57.000000000 -0500
105+++ /usr/palm/applications/com.palm.app.messaging/app/views/compose/compose-scene.html 2009-09-28 15:36:15.000000000 -0500
123106@@ -6,6 +6,10 @@
124107 <div id="messageContainer" class='palm-row'>
125108 <div class="palm-row-wrapper textfield-group focused">
126109 <div class="title">
127+ <div id="charCounterContainer">
128+ <div id="charCounter">
129+ </div>
130+ </div>
110+ <div id="charCounterContainer" style="display: none;">
111+ <div id="charCounter">
112+ </div>
113+ </div>
131114 <div id="attachmentContainer" style="display: none;">
132115 <div id="cancelAttachment">
133116 </div>
134diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
135index fe6127a..ae0c424 100644
136--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
137+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
138@@ -837,6 +837,23 @@ img.avatar-overlay {
117diff -ur /usr/palm/app-original/com.palm.app.messaging/stylesheets/messaging.css /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
118--- /usr/palm/app-original/com.palm.app.messaging/stylesheets/messaging.css 2009-09-13 23:10:04.000000000 -0500
119+++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css 2009-09-28 15:37:25.000000000 -0500
120@@ -837,6 +837,23 @@
139121 #messageContainer.palm-row .icon.right {
140122 height: 61px;
141123 }
142+#messageContainer #charCounterContainer {
143+ line-height: 20px;
144+ display:block;
145+ height: 20px;
146+ border-width: 0px 10px 0px 9px;
147+ -webkit-border-image: url(../images/message-segment-badge.png) 0 10 0 9 stretch stretch;
148+ position: absolute;
149+ z-index: 3;
150+ top: 2px;
151+ left: 2px;
124+#messageContainer #charCounterContainer {
125+ line-height: 20px;
126+ display:block;
127+ height: 20px;
128+ border-width: 0px 10px 0px 9px;
129+ -webkit-border-image: url(../images/message-segment-badge.png) 0 10 0 9 stretch stretch;
130+ position: absolute;
131+ z-index: 3;
132+ top: 2px;
133+ left: 2px;
152134+}
153135+#messageContainer #charCounterContainer #charCounter {
154+ font-size: 12px;
155+ font-weight: bold;
156+ color: #679BC2;
157+ margin: 0px -4px 3px -3px;
136+ font-size: 12px;
137+ font-weight: bold;
138+ color: #679BC2;
139+ margin: 0px -4px 3px -3px;
158140+}
159141 #messageContainer #attachmentContainer {
160142 position: relative;