) \r\n$]+))"
- return re.sub(regexp, r'\1 ', text)
+ # -> added target to output prevent the web browser from attempting to
+ # change pages (and losing our webclient session).
+ return re.sub(regexp, r'\1', text)
def do_sub(self, m):
"Helper method to be passed to re.sub."
@@ -94,20 +96,6 @@ class TextToHTMLparser(object):
t = m.group().replace('\t', ' '*self.tabstop)
t = t.replace(' ', ' ')
return t
- # else:
- # return m.group('protocol') + ' '
- # url = m.group('protocol')
- # prefix, postfix = '',''
- # if url.startswith(' '):
- # prefix = ' '
- # url = url[1:]
- # if url.endswith(' '):
- # postfix = ' '
- # url = url[:-1]
- # last = m.groups()[-1]
- # if last in ['\n', '\r', '\r\n']:
- # last = '
'
- # return '%s%s%s' % (prefix, url, postfix)
def parse(self, text):
"""
diff --git a/src/web/media/css/webclient.css b/src/web/media/css/webclient.css
index 4844c590ac..cde38ffcd4 100644
--- a/src/web/media/css/webclient.css
+++ b/src/web/media/css/webclient.css
@@ -39,6 +39,23 @@ a:hover, a:active { color: #ccc }
/* Error messages (red) */
.err { color: #f00 }
+/* Style specific classes corresponding to formatted, narative text. */
+.white { color: white; }
+.cyan { color: #00FFFF; }
+.blue { color: blue; }
+.red { color: red; }
+.magenta { color: #FF00FF; }
+.lime { color: lime; }
+.yellow { color: yellow; }
+.gray { color: gray; }
+.teal { color: teal; }
+.navy { color: navy; }
+.maroon { color: maroon; }
+.purple { color: purple; }
+.green { color: green; }
+.olive { color: olive; }
+.underline { text-decoration: underline; }
+
/* Container surrounding entire chat */
#wrapper {
position: relative;
diff --git a/src/web/media/javascript/evennia_webclient.js b/src/web/media/javascript/evennia_webclient.js
index ce162c0ee8..659a659acb 100644
--- a/src/web/media/javascript/evennia_webclient.js
+++ b/src/web/media/javascript/evennia_webclient.js
@@ -35,6 +35,46 @@ contain the 'mode' of the request to be handled by the protocol:
// jQuery must be imported by the calling html page before this script
// There are plenty of help on using the jQuery library on http://jquery.com/
+
+$.fn.appendCaret = function() {
+ /* jQuery extension that will forward the caret to the end of the input, and
+ won't harm other elements (although calling this on multiple inputs might
+ not have the expected consequences).
+
+ Thanks to
+ http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
+ for the good starting point. */
+ return this.each(function() {
+ var range,
+ // Index at where to place the caret.
+ end,
+ self = this;
+
+ if (self.setSelectionRange) {
+ // other browsers
+ end = self.value.length;
+ self.focus();
+ // NOTE: Need to delay the caret movement until after the callstack.
+ setTimeout(function() {
+ self.setSelectionRange(end, end);
+ }, 0);
+ }
+ else if (self.createTextRange) {
+ // IE
+ end = self.value.length - 1;
+ range = self.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', end);
+ range.moveStart('character', end);
+ // NOTE: I haven't tested to see if IE has the same problem as
+ // W3C browsers seem to have in this context (needing to fire
+ // select after callstack).
+ range.select();
+ }
+ });
+};
+
+
// Server communications
var CLIENT_HASH = '0'; // variable holding the client id
@@ -192,10 +232,12 @@ function history_add(input) {
// Catching keyboard shortcuts
$(document).keydown( function(event) {
- // Get the pressed key
- var code = event.keyCode ? event.keyCode : event.which;
+ // Get the pressed key (normalized by jQuery)
+ var code = event.which,
+ inputField = $("#inputfield");
+
// always focus input field no matter which key is pressed
- $("#inputfield")[0].focus();
+ inputField.focus();
// Special keys recognized by client
@@ -204,18 +246,13 @@ $(document).keydown( function(event) {
if (code == 13) { // Enter Key
webclient_input();
event.preventDefault();
- return false;
}
else {
if (code == 38) { // arrow up 38
- $("#inputfield").val(function(index, value){
- return history_step_back();
- });
+ inputField.val(history_step_back()).appendCaret();
}
else if (code == 40) { // arrow down 40
- $("#inputfield").val(function(index, value){
- return history_step_fwd();
- });
+ inputField.val(history_step_fwd()).appendCaret();
}
}
});
diff --git a/src/web/templates/prosimii/webclient.html b/src/web/templates/prosimii/webclient.html
index ddab711f4d..313736329e 100644
--- a/src/web/templates/prosimii/webclient.html
+++ b/src/web/templates/prosimii/webclient.html
@@ -36,7 +36,7 @@
to the local copy.
-