reverted revision 2799e09d6bb4, until better idea, because of backward compatibility
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-06-14 15:25:46) dev
|
Version 2.00.0 (2012-06-14 15:42:15) dev
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ function doClickSave() {
|
|||||||
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(flash).slideDown();
|
||||||
else jQuery('.flash').hide();
|
else jQuery('.flash').hide();
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
|
|||||||
var html=xhr.responseText;
|
var html=xhr.responseText;
|
||||||
var content=xhr.getResponseHeader('web2py-component-content');
|
var content=xhr.getResponseHeader('web2py-component-content');
|
||||||
var command=xhr.getResponseHeader('web2py-component-command');
|
var command=xhr.getResponseHeader('web2py-component-command');
|
||||||
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
|
var flash=xhr.getResponseHeader('web2py-component-flash');
|
||||||
var t = jQuery('#'+target);
|
var t = jQuery('#'+target);
|
||||||
if(content=='prepend') t.prepend(html);
|
if(content=='prepend') t.prepend(html);
|
||||||
else if(content=='append') t.append(html);
|
else if(content=='append') t.append(html);
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
|
|||||||
var html=xhr.responseText;
|
var html=xhr.responseText;
|
||||||
var content=xhr.getResponseHeader('web2py-component-content');
|
var content=xhr.getResponseHeader('web2py-component-content');
|
||||||
var command=xhr.getResponseHeader('web2py-component-command');
|
var command=xhr.getResponseHeader('web2py-component-command');
|
||||||
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
|
var flash=xhr.getResponseHeader('web2py-component-flash');
|
||||||
var t = jQuery('#'+target);
|
var t = jQuery('#'+target);
|
||||||
if(content=='prepend') t.prepend(html);
|
if(content=='prepend') t.prepend(html);
|
||||||
else if(content=='append') t.append(html);
|
else if(content=='append') t.append(html);
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ function web2py_ajax_page(method, action, data, target) {
|
|||||||
var html=xhr.responseText;
|
var html=xhr.responseText;
|
||||||
var content=xhr.getResponseHeader('web2py-component-content');
|
var content=xhr.getResponseHeader('web2py-component-content');
|
||||||
var command=xhr.getResponseHeader('web2py-component-command');
|
var command=xhr.getResponseHeader('web2py-component-command');
|
||||||
var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
|
var flash=xhr.getResponseHeader('web2py-component-flash');
|
||||||
var t = jQuery('#'+target);
|
var t = jQuery('#'+target);
|
||||||
if(content=='prepend') t.prepend(html);
|
if(content=='prepend') t.prepend(html);
|
||||||
else if(content=='append') t.append(html);
|
else if(content=='append') t.append(html);
|
||||||
|
|||||||
+2
-2
@@ -28,7 +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
|
||||||
from admin import add_path_first, create_missing_folders, create_missing_app_folders
|
from admin import add_path_first, create_missing_folders, create_missing_app_folders
|
||||||
@@ -544,7 +544,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'] = \
|
||||||
urllib2.quote(str(response.flash).replace('\n',''))
|
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','')
|
||||||
|
|||||||
Reference in New Issue
Block a user