move jq_ajax.js
bzr revid: al@openerp.com-20111215133305-c7jgyqdes33drllk
This commit is contained in:
Antony Lesuisse
parent
f02301776f
commit
8ae093bf49
|
|
@ -36,7 +36,6 @@
|
|||
"static/lib/underscore/underscore.string.js",
|
||||
"static/lib/labjs/LAB.src.js",
|
||||
"static/lib/py.parse/lib/py.js",
|
||||
"static/src/js/jq_ajax.js",
|
||||
"static/src/js/boot.js",
|
||||
"static/src/js/core.js",
|
||||
"static/src/js/dates.js",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import logging
|
|||
import urllib
|
||||
import os
|
||||
import pprint
|
||||
#import re
|
||||
import sys
|
||||
import threading
|
||||
import traceback
|
||||
|
|
|
|||
|
|
@ -1014,7 +1014,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
|
|||
this._super.apply(this, arguments);
|
||||
var self = this;
|
||||
openerp.connection.bind(function() {
|
||||
|
||||
var params = {};
|
||||
if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
|
||||
self.$element.addClass("kitten-mode-activated");
|
||||
|
|
@ -1022,8 +1021,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
|
|||
self.$element.html(QWeb.render("Interface", params));
|
||||
openerp.connection.session_restore();
|
||||
|
||||
|
||||
// TODO nivification of menu Widget !!!
|
||||
self.menu = new openerp.web.Menu(self, "oe_menu", "oe_secondary_menu");
|
||||
self.menu.on_action.add(self.on_menu_action);
|
||||
|
||||
|
|
|
|||
|
|
@ -342,6 +342,183 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(/** @lends openerp.web.Ca
|
|||
}
|
||||
});
|
||||
|
||||
$.ajaxSetup({
|
||||
converters: {
|
||||
"json oe-jsonp": true,
|
||||
"json oe-json": true,
|
||||
}
|
||||
});
|
||||
|
||||
// common preconditions checks
|
||||
$.ajaxPrefilter("oe-json oe-jsonp", function(options, originalOptions, jqXHR) {
|
||||
if (!$.isPlainObject(options.openerp)) {
|
||||
console.error(options.openerp);
|
||||
$.error('"openerp" option is required.');
|
||||
}
|
||||
|
||||
if (!$.isPlainObject(options.data)) {
|
||||
$.error('data must not be serialized');
|
||||
}
|
||||
options.processData = false;
|
||||
});
|
||||
|
||||
$.ajaxPrefilter("oe-json", function(options, originalOptions, jqXHR) {
|
||||
options.data = JSON.stringify({
|
||||
jsonrpc: '2.0',
|
||||
method: 'call',
|
||||
params: options.data,
|
||||
id: _.uniqueId('browser-client-')
|
||||
});
|
||||
|
||||
return 'json';
|
||||
});
|
||||
|
||||
$.ajaxPrefilter("oe-jsonp", function(options, originalOptions, jqXHR) {
|
||||
|
||||
options.crossDomain = true;
|
||||
|
||||
var data = null;
|
||||
if (options.data) {
|
||||
data = $.param({r:JSON.stringify(options.data)});
|
||||
}
|
||||
|
||||
|
||||
|
||||
var max_url_length = options.max_url_length || 1000,
|
||||
absolute_url, full_url;
|
||||
/*
|
||||
var r_has_protocol = /^https?:\/\//,
|
||||
r_absolute_internal = /^\/[^\/]/; // starts with / (but not //)
|
||||
|
||||
|
||||
if (r_has_protocol.test(options.url)) {
|
||||
if (!_(options.url).startsWith(options.openerp.server + '/')) {
|
||||
$.error('can only contact openerp.server');
|
||||
}
|
||||
absolute_url = options.url;
|
||||
} else if (r_absolute_internal.test(options.url)) {
|
||||
absolute_url = options.openerp.server + options.url;
|
||||
} else { // relative url
|
||||
var parts = document.location.pathname.split('/');
|
||||
parts.pop();
|
||||
parts.push(options.url);
|
||||
absolute_url = options.openerp.server + parts.join('/');
|
||||
}
|
||||
// */
|
||||
|
||||
var absolute_url = options.openerp.get_absolute_url(options.url);
|
||||
|
||||
/// now, made the same url changes that jQuery will do...
|
||||
var rquery = /\?/,
|
||||
rts = /([?&])_=[^&]*/;
|
||||
|
||||
full_url = absolute_url;
|
||||
if (data) {
|
||||
full_url += (rquery.test(full_url) ? "&" : "?") + data;
|
||||
}
|
||||
|
||||
// Add anti-cache in url if needed
|
||||
if (!options.cache) {
|
||||
var ts = $.now(),
|
||||
// try replacing _= if it is there
|
||||
ret = full_url.replace(rts, "$1_=" + ts);
|
||||
|
||||
// if nothing was replaced, add timestamp to the end
|
||||
full_url = ret + ((ret === full_url) ? (rquery.test(full_url) ? "&" : "?") + "_=" + ts : "");
|
||||
}
|
||||
|
||||
options.url = absolute_url;
|
||||
|
||||
if (full_url.length < max_url_length) {
|
||||
options.type = "GET";
|
||||
options.data = data;
|
||||
return "jsonp"; // classic jsonp query...
|
||||
}
|
||||
});
|
||||
|
||||
$.ajaxTransport("oe-jsonp", function(options, originalOptions, jqXHR) {
|
||||
|
||||
var $iframe = null;
|
||||
var $form = $('<form>')
|
||||
.attr('method', 'POST')
|
||||
.attr('enctype', "multipart/form-data")
|
||||
.attr('action', options.openerp.server + "/web/jsonp/post")
|
||||
.hide()
|
||||
.appendTo($('body'))
|
||||
;
|
||||
|
||||
function cleanUp() {
|
||||
if ($iframe) {
|
||||
$iframe.unbind("load").attr("src", "javascript:false;").remove();
|
||||
}
|
||||
$form.remove();
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
send: function(headers, completeCallback) {
|
||||
|
||||
var ifid = _.uniqueId('oe_jsonp_iframe_');
|
||||
var request_id = _.uniqueId('browser-client-');
|
||||
var oe_callback = _.uniqueId('oe_callback_');
|
||||
|
||||
window[oe_callback] = function(result) {
|
||||
completeCallback(200, 'success', {json: result});
|
||||
};
|
||||
|
||||
|
||||
var display = options.openerp.debug ? 'block' : 'none';
|
||||
$iframe = $(_.str.sprintf("<iframe src='javascript:false;' name='%s' id='%s' style='display:%s'></iframe>", ifid, ifid, display));
|
||||
|
||||
|
||||
// the first bind is fired up when the iframe is added to the DOM
|
||||
$iframe.bind('load', function() {
|
||||
// the second bind is fired up when the result of the form submission is received
|
||||
$iframe.unbind('load').bind('load', function() {
|
||||
// we cannot access the content of remote iframe.
|
||||
// but we don't care, we try to get the result in any cases
|
||||
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: options.url,
|
||||
dataType: 'jsonp',
|
||||
jsonp: false, // do not append callback=? argument on query string
|
||||
jsonpCallback: oe_callback,
|
||||
data: {
|
||||
sid: options.openerp.session_id,
|
||||
rid: request_id,
|
||||
},
|
||||
}).always(function() {
|
||||
cleanUp();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
// now that the iframe can receive data, we fill and submit the form
|
||||
var params = JSON.stringify(options.data);
|
||||
|
||||
$form
|
||||
.append($('<input type="hidden" name="session_id" />').attr('value', options.openerp.session_id))
|
||||
.append($('<input type="hidden" name="request_id" />').attr('value', request_id))
|
||||
.append($('<input type="hidden" name="params" />').attr('value', params))
|
||||
.append($('<input type="hidden" name="callback" />').attr('value', oe_callback))
|
||||
.submit()
|
||||
;
|
||||
|
||||
});
|
||||
|
||||
$form.attr('target', ifid) // set the iframe as target of the form
|
||||
.after($iframe); // append the iframe to the DOM (will trigger the first load)
|
||||
|
||||
},
|
||||
abort: function() {
|
||||
cleanUp();
|
||||
},
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
|
||||
/**
|
||||
* @constructs openerp.web.Connection
|
||||
|
|
@ -351,10 +528,6 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
|
|||
* @param {String} [port] JSON-RPC endpoint port
|
||||
*/
|
||||
init: function() {
|
||||
|
||||
// FIXME need to be a real singleton.
|
||||
// create more than one Connection on the same instance will not works
|
||||
|
||||
this._super();
|
||||
this.server = null;
|
||||
this.debug = ($.deparam($.param.querystring()).debug != undefined);
|
||||
|
|
|
|||
Loading…
Reference in New Issue