Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve #1448, fix 'no help entry' not popping up in webclient

Browse source
This commit is contained in:
Ryan Stein 2017-10-10 12:51:09 -04:00
parent 70fea693e6
commit 53a4fc0b66
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/default/help.py
View file

@ -267,7 +267,7 @@ class CmdHelp(Command):
return return
# no exact matches found. Just give suggestions. # no exact matches found. Just give suggestions.
self.msg(self.format_help_entry("", "No help entry found for '%s'" % query, None, suggested=suggestions)) self.msg((self.format_help_entry("", "No help entry found for '%s'" % query, None, suggested=suggestions), {"type": "help"}))
def _loadhelp(caller): def _loadhelp(caller):

14
evennia/server/inputfuncs.py
View file

@ -436,9 +436,12 @@ def webclient_options(session, *args, **kwargs):
""" """
account = session.account account = session.account
clientoptions = settings.WEBCLIENT_OPTIONS.copy() clientoptions = account.db._saved_webclient_options
storedoptions = account.db._saved_webclient_options or {} if not clientoptions:
clientoptions.update(storedoptions) # No saved options for this account, copy and save the default.
account.db._saved_webclient_options = settings.WEBCLIENT_OPTIONS.copy()
# Get the _SaverDict created by the database.
clientoptions = account.db._saved_webclient_options
# The webclient adds a cmdid to every kwargs, but we don't need it. # The webclient adds a cmdid to every kwargs, but we don't need it.
try: try:
@ -448,7 +451,8 @@ def webclient_options(session, *args, **kwargs):
if not kwargs: if not kwargs:
# No kwargs: we are getting the stored options # No kwargs: we are getting the stored options
session.msg(webclient_options=clientoptions) # Convert clientoptions to regular dict for sending.
session.msg(webclient_options=dict(clientoptions))
# Create a monitor. If a monitor already exists then it will replace # Create a monitor. If a monitor already exists then it will replace
# the previous one since it would use the same idstring # the previous one since it would use the same idstring
@ -461,5 +465,3 @@ def webclient_options(session, *args, **kwargs):
# kwargs provided: persist them to the account object # kwargs provided: persist them to the account object
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
clientoptions[key] = value clientoptions[key] = value
account.db._saved_webclient_options = clientoptions

2
evennia/web/webclient/static/webclient/css/webclient.css
View file

@ -31,6 +31,8 @@ strong {font-weight: bold;}
div {margin:0px;} div {margin:0px;}
.hidden { display: none; }
/* Utility messages (green) */ /* Utility messages (green) */
.sys { color: #0f0 } .sys { color: #0f0 }

3
evennia/web/webclient/static/webclient/js/webclient_gui.js
View file

@ -289,6 +289,7 @@ function onPrompt(args, kwargs) {
// Called when the user logged in // Called when the user logged in
function onLoggedIn() { function onLoggedIn() {
$('#optionsbutton').removeClass('hidden');
Evennia.msg("webclient_options", [], {}); Evennia.msg("webclient_options", [], {});
} }
@ -323,6 +324,8 @@ function onSilence(cmdname, args, kwargs) {}
// Handle the server connection closing // Handle the server connection closing
function onConnectionClose(conn_name, evt) { function onConnectionClose(conn_name, evt) {
$('#optionsbutton').addClass('hidden');
closePopup("#optionsdialog");
onText(["The connection was closed or lost."], {'cls': 'err'}); onText(["The connection was closed or lost."], {'cls': 'err'});
} }

3
evennia/web/webclient/templates/webclient/webclient.html
View file

@ -11,7 +11,7 @@
<div id="wrapper"> <div id="wrapper">
<div id="toolbar"> <div id="toolbar">
<button id="optionsbutton" type="button">&#x2699;</button> <button id="optionsbutton" type="button" class="hidden">&#x2699;</button>
</div> </div>
<div id="messagewindow" role="log"></div> <div id="messagewindow" role="log"></div>
<div id="inputform"> <div id="inputform">
@ -48,4 +48,3 @@
</div> </div>
{% endblock %} {% endblock %}