Author: vdichev
Date: Tue Sep 22 21:06:24 2009
New Revision: 817841
URL: http://svn.apache.org/viewvc?rev=817841&view=rev
Log:
Separate the message processing javascript of main page into a separate file.
Added:
incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
(with props)
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Added: incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=817841&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
(added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js Tue
Sep 22 21:06:24 2009
@@ -0,0 +1,101 @@
+ // <![CDATA[
+ /*
+ * displayMessages called by lift:comet, type="Timeline" and
type="PublicTimeline"
+ */
+
+ function msgDateCompare(msg1, msg2)
+ {
+ return parseInt(msg1.message.when) - parseInt(msg2.message.when);
+ }
+
+ function displayMessages(msgArray, elementId)
+ {
+ // Select the first element in table id="timeline_messages"
+ // with id="message" as the message template
+ if (msgTemplate == null) {
+ // var msgTemplate =
jQuery('span.'+spanId+' message:first');
+ var msgTemplate = jQuery('#'+elementId+' #message:first');
+ var tagTemplate = msgTemplate.find('#tag:first');
+ var msgInsertPt = jQuery('#'+elementId);
+
+ // Now we have the template, make the existing instances invisible
+ jQuery('#'+elementId+' *[id=message]').hide();
+ }
+
+ // Sort the messages into date order
+ msgArray.sort(msgDateCompare);
+
+ for (var msgIndex in msgArray)
+ {
+ // Marshall the data from the Comet-supplied message
+ var cometMsg = msgArray[msgIndex].message;
+ var cometReason = msgArray[msgIndex].reason;
+ var cometResent = msgArray[msgIndex].resent;
+ var msgId = "message_"+cometMsg.id;
+
+ // Only do this if the message is not already in the table
+ if (jQuery('#'+elementId+' #'+msgId).size() == 0)
+ {
+ var msgAuthor = cometMsg.author;
+ var msgBody = jQuery(cometMsg.text).find('body').html();
+ var msgDateObj = new Date(parseInt(cometMsg.when));
+ var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
+ ' ' + msgDateObj.toLocaleTimeString();
+ var msgPool = '';
+ if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
+ var msgSource = cometMsg.source;
+ var msgReason = ""
+ for (r in cometReason) {
+ if (r == "resent_from")
+ msgReason = "resent by " + cometReason[r].nickname;
+ else
+ msgReason = "caused by " + r;
+ break
+ }
+ var msgTags = jQuery(cometMsg.text).find('tags > tag').get();
+ for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
+ // Replace each tag element with the plain tag text
+ msgTags[tagIndex] = jQuery(msgTags[tagIndex]).attr('name');
+ }
+
+ // Put the marshalled data into a copy of the template
+ var newMsg = msgTemplate.clone(true).attr('id',msgId);
+
+ newMsg.find('#author').text(msgAuthor.nickname);
+
+ var avatar = newMsg.find('#avatar')
+ .attr('src', msgAuthor.imageurl)
+ .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
+
+ newMsg.find('#body').html(msgBody);
+ newMsg.find('#pool').text(msgPool);
+ newMsg.find('#source').text(msgSource);
+ newMsg.find('#reason').text(msgReason);
+ newMsg.find('#when').text(msgDateStr);
+ var id = cometMsg.id;
+ var resendButton = newMsg.find('#resend');
+ if (cometResent) {
+ resendButton.css("display", "none");
+ } else {
+ resendButton.attr('id', 'resend_' + id).
+ attr('onclick', 'javascript:resend_msg(' + id + ');' +
+ 'clearResend("resend_' + id + '")');
+ }
+ for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
+ var newTag =
tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
+ newTag.find('a')
+ .attr('href','tag/'+msgTags[tagIndex])
+ .text(msgTags[tagIndex]);
+ newTag.insertBefore(newMsg.find('#tag:first'));
+ }
+
+ // Remove any old tags from the template
+ newMsg.find('*[id=tag]').remove();
+
+ // Insert the updated copy of the message into the page
+ newMsg.prependTo(msgInsertPt).show();
+ }
+ }
+ }
+ // ]]>
+
Propchange:
incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
------------------------------------------------------------------------------
svn:executable = *
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=817841&r1=817840&r2=817841&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
(original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Tue Sep 22 21:06:24 2009
@@ -8,108 +8,7 @@
<script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
<script id="json" src="/classpath/json.js" type="text/javascript"/>
- <script>
- // <![CDATA[
- /*
- * displayMessages called by lift:comet, type="Timeline" and
type="PublicTimeline"
- */
-
- function msgDateCompare(msg1, msg2)
- {
- return parseInt(msg1.message.when) - parseInt(msg2.message.when);
- }
-
- function displayMessages(msgArray, elementId)
- {
- // Select the first element in table id="timeline_messages"
- // with id="message" as the message template
- if (msgTemplate == null) {
- // var msgTemplate =
jQuery('span.'+spanId+' message:first');
- var msgTemplate = jQuery('#'+elementId+' #message:first');
- var tagTemplate = msgTemplate.find('#tag:first');
- var msgInsertPt = jQuery('#'+elementId);
-
- // Now we have the template, make the existing instances invisible
- jQuery('#'+elementId+' *[id=message]').hide();
- }
-
- // Sort the messages into date order
- msgArray.sort(msgDateCompare);
-
- for (var msgIndex in msgArray)
- {
- // Marshall the data from the Comet-supplied message
- var cometMsg = msgArray[msgIndex].message;
- var cometReason = msgArray[msgIndex].reason;
- var cometResent = msgArray[msgIndex].resent;
- var msgId = "message_"+cometMsg.id;
-
- // Only do this if the message is not already in the table
- if (jQuery('#'+elementId+' #'+msgId).size() == 0)
- {
- var msgAuthor = cometMsg.author;
- var msgBody = jQuery(cometMsg.text).find('body').html();
- var msgDateObj = new Date(parseInt(cometMsg.when));
- var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
- ' ' + msgDateObj.toLocaleTimeString();
- var msgPool = '';
- if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
- var msgSource = cometMsg.source;
- var msgReason = ""
- for (r in cometReason) {
- if (r == "resent_from")
- msgReason = "resent by " + cometReason[r].nickname;
- else
- msgReason = "caused by " + r;
- break
- }
- var msgTags = jQuery(cometMsg.text).find('tags > tag').get();
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- // Replace each tag element with the plain tag text
- msgTags[tagIndex] = jQuery(msgTags[tagIndex]).attr('name');
- }
-
- // Put the marshalled data into a copy of the template
- var newMsg = msgTemplate.clone(true).attr('id',msgId);
-
- newMsg.find('#author').text(msgAuthor.nickname);
-
- var avatar = newMsg.find('#avatar')
- .attr('src', msgAuthor.imageurl)
- .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
-
- newMsg.find('#body').html(msgBody);
- newMsg.find('#pool').text(msgPool);
- newMsg.find('#source').text(msgSource);
- newMsg.find('#reason').text(msgReason);
- newMsg.find('#when').text(msgDateStr);
- var id = cometMsg.id;
- var resendButton = newMsg.find('#resend');
- if (cometResent) {
- resendButton.css("display", "none");
- } else {
- resendButton.attr('id', 'resend_' + id).
- attr('onclick', 'javascript:resend_msg(' + id + ');' +
- 'clearResend("resend_' + id + '")');
- }
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- var newTag =
tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
- newTag.find('a')
- .attr('href','tag/'+msgTags[tagIndex])
- .text(msgTags[tagIndex]);
- newTag.insertBefore(newMsg.find('#tag:first'));
- }
-
- // Remove any old tags from the template
- newMsg.find('*[id=tag]').remove();
-
- // Insert the updated copy of the message into the page
- newMsg.prependTo(msgInsertPt).show();
- }
- }
- }
- // ]]>
- </script>
+ <script src="/scripts/display_messages.js" type="text/javascript"/>
</head>
<body>
