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

tentative fix to ajax problem, thanks Vladyslav, needs test, may break flash=DIV()

Browse Source
This commit is contained in:
mdipierro
2012-07-31 22:03:46 -05:00
parent d259939263
commit 4ffb597954
3 changed files with 6 additions and 5 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-07-31 22:02:48) dev Version 2.00.0 (2012-07-31 22:03:43) dev
applications/admin/static/js/ajax_editor.js
+3 -3
View File
@@ -72,7 +72,7 @@ function doClickSave() {
// show flash message (if any) // show flash message (if any)
var flash=xhr.getResponseHeader('web2py-component-flash'); var flash=xhr.getResponseHeader('web2py-component-flash');
if (flash) jQuery('.flash').html(flash).slideDown(); if (flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
else jQuery('.flash').hide(); else jQuery('.flash').hide();
// reenable disabled submit button // reenable disabled submit button
@@ -149,8 +149,8 @@ function doToggleBreakpoint(filename, url) {
success: function(json,text,xhr){ success: function(json,text,xhr){
// show flash message (if any) // show flash message (if any)
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash')); var flash=xhr.getResponseHeader('web2py-component-flash');
if (flash) jQuery('.flash').html(flash).slideDown(); if (flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
else jQuery('.flash').hide(); else jQuery('.flash').hide();
try { try {
if (json.error) { if (json.error) {
gluon/main.py
+2 -1
View File
@@ -28,6 +28,7 @@ import socket
import tempfile import tempfile
import random import random
import string import string
import urllib2
from fileutils import abspath, write_file, parse_version from fileutils import abspath, write_file, parse_version
from settings import global_settings from settings import global_settings
@@ -548,7 +549,7 @@ def wsgibase(environ, responder):
if request.cid: if request.cid:
if response.flash and not 'web2py-component-flash' in http_response.headers: if response.flash and not 'web2py-component-flash' in http_response.headers:
http_response.headers['web2py-component-flash'] = \ 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: if response.js and not 'web2py-component-command' in http_response.headers:
http_response.headers['web2py-component-command'] = \ http_response.headers['web2py-component-command'] = \
response.js.replace('\n','') response.js.replace('\n','')