dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed encoding in flash messages, thanks Vlad

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-05-28 13:23:40 -05:00
parent ac864ceaf4
commit 5001a0d16f
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-05-28 13:13:43) dev
Version 2.00.0 (2012-05-28 13:23:14) dev
applications/admin/static/js/ajax_editor.js
+2 -2
View File
@@ -71,7 +71,7 @@ function doClickSave() {
success: function(json,text,xhr){
// show flash message (if any)
var flash=xhr.getResponseHeader('web2py-component-flash');
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
if (flash) jQuery('.flash').html(flash).slideDown();
else jQuery('.flash').hide();
@@ -149,7 +149,7 @@ function doToggleBreakpoint(filename, url) {
success: function(json,text,xhr){
// show flash message (if any)
var flash=xhr.getResponseHeader('web2py-component-flash');
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
if (flash) jQuery('.flash').html(flash).slideDown();
else jQuery('.flash').hide();
try {
applications/admin/static/js/web2py.js
+1 -1
View File
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
var html=xhr.responseText;
var content=xhr.getResponseHeader('web2py-component-content');
var command=xhr.getResponseHeader('web2py-component-command');
var flash=xhr.getResponseHeader('web2py-component-flash');
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
var t = jQuery('#'+target);
if(content=='prepend') t.prepend(html);
else if(content=='append') t.append(html);
applications/examples/static/js/web2py.js
+1 -1
View File
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
var html=xhr.responseText;
var content=xhr.getResponseHeader('web2py-component-content');
var command=xhr.getResponseHeader('web2py-component-command');
var flash=xhr.getResponseHeader('web2py-component-flash');
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
var t = jQuery('#'+target);
if(content=='prepend') t.prepend(html);
else if(content=='append') t.append(html);
applications/welcome/static/js/web2py.js
+1 -1
View File
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
var html=xhr.responseText;
var content=xhr.getResponseHeader('web2py-component-content');
var command=xhr.getResponseHeader('web2py-component-command');
var flash=xhr.getResponseHeader('web2py-component-flash');
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
var t = jQuery('#'+target);
if(content=='prepend') t.prepend(html);
else if(content=='append') t.append(html);
gluon/main.py
+2 -2
View File
@@ -28,6 +28,7 @@ import socket
import tempfile
import random
import string
import urllib2
from fileutils import abspath, write_file, parse_version
from settings import global_settings
from admin import add_path_first, create_missing_folders, create_missing_app_folders
@@ -541,10 +542,9 @@ def wsgibase(environ, responder):
# ##################################################
if request.cid:
if response.flash and not 'web2py-component-flash' in http_response.headers:
http_response.headers['web2py-component-flash'] = \
str(response.flash).replace('\n','')
urllib2.quote(str(response.flash).replace('\n',''))
if response.js and not 'web2py-component-command' in http_response.headers:
http_response.headers['web2py-component-command'] = \
response.js.replace('\n','')