odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] some MSIE8 stuff 

bzr revid: xmo@openerp.com-20120117144359-k9l1289wq8ngb3pr
This commit is contained in:
Xavier Morel 2012-01-17 15:43:59 +01:00
parent 425b6b4b33 c82878388a
commit 517862aa45
8 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/controllers/main.py
View File

@ -99,7 +99,7 @@ html_template = """<!DOCTYPE html>
});
</script>
</head>
<body></body>
<body class="openerp" id="oe"></body>
</html>
"""
@ -207,7 +207,7 @@ class WebClient(openerpweb.Controller):
'js': js,
'css': css,
'modules': simplejson.dumps(self.server_wide_modules(req)),
'init': 'new s.web.WebClient().replace($("body"));',
'init': 'new s.web.WebClient().start();',
}
return r

16
addons/web/static/lib/qweb/qweb-benchmark.html
View File

@ -5,11 +5,25 @@
<script type="text/javascript" src="qweb.js"></script>
<script type="text/javascript" src="qweb2.js"></script>
<script type="text/javascript">
(function (c) {
if (c.time) { return; }
var d = {};
c.time = function (key) {
d[key] = Date.now();
};
c.timeEnd = function (key) {
var end = Date.now(),
origin = d[key];
delete d[key];
if (!origin) { return; }
console.log(key + ': ' + (end - origin) + 'ms');
};
})(window.console);
var dict = {
session : true,
testing : 'yes',
name : 'AGR'
}
};
console.time("Load template with QWeb");
QWeb.add_template("qweb-benchmark.xml");
console.timeEnd("Load template with QWeb");

6
addons/web/static/src/css/base.css
View File

@ -1,4 +1,5 @@
body.openerp {
body { padding: 0; margin: 0; }
.openerp {
padding: 0;
margin: 0;
height: 100%;
@ -7,7 +8,8 @@ body.openerp {
font-family: Ubuntu, Helvetica, sans-serif;
}
body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget {
.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option,
.openerp button, .openerp .ui-widget {
font-family: Ubuntu, Helvetica, sans-serif;
font-size:85%;
}

14
addons/web/static/src/js/chrome.js
View File

@ -205,7 +205,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
buttons: buttons
}).open();
dialog.$element.html(QWeb.render('CrashManagerError', {session: openerp.connection, error: error}));
},
}
});
openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{
@ -649,7 +649,7 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
}
}
});
},
}
});
openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# */{
@ -1062,13 +1062,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
this._current_state = null;
},
render_element: function() {
this.$element = $('<body/>');
this.$element.attr("id", "oe");
this.$element.addClass("openerp");
},
start: function() {
var self = this;
this.$element = $(document.body);
if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
this.$element.addClass("kitten-mode-activated");
this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
@ -1092,7 +1088,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
self.bind_hashchange();
if (!self.session.openerp_entreprise) {
self.$element.find('.oe_footer_powered').append('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">Unsupported/Community Version</a></span>');
$('title').html('OpenERP - Unsupported/Community Version');
document.title = _t("OpenERP - Unsupported/Community Version");
}
});
},
@ -1215,7 +1211,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
self.am.do_action(action);
});
},
}
});

6
addons/web/static/src/js/core.js
View File

@ -491,7 +491,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
dataType: 'json',
contentType: 'application/json',
data: JSON.stringify(payload),
processData: false,
processData: false
}, url);
if (this.synch)
ajax.async = false;
@ -502,7 +502,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
// extracted from payload to set on the url
var data = {
session_id: this.session_id,
id: payload.id,
id: payload.id
};
url.url = this.get_url(url.url);
var ajax = _.extend({
@ -864,7 +864,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
} finally {
this.synch = synch;
}
},
}
});
/**

4
addons/web/static/src/js/data.js
View File

@ -829,9 +829,9 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
model: this.model_name,
method: method,
args: args,
kwargs: kwargs,
kwargs: kwargs
});
},
}
});
openerp.web.CompoundContext = openerp.web.Class.extend({

12
addons/web/static/src/js/view_editor.js
View File

@ -806,7 +806,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'},
'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'},
'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'},
'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'}
};
var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []);
this.edit_node_dialog.$element.append('<table id="rec_table" style="width:400px" class="oe_forms"></table>');
@ -928,7 +928,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
type: 'ir.actions.act_window',
target: "new",
flags: {
action_buttons: true,
action_buttons: true
}
}
var action_manager = new openerp.web.ActionManager(self);
@ -982,7 +982,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
},
render: function() {
return _.str.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
},
}
});
openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
template : "vieweditor_boolean",
@ -1084,7 +1084,7 @@ var _PROPERTIES = {
'action' : ['name', 'string', 'colspan', 'groups'],
'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
'graph' : ['string', 'type'],
'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode']
};
var _CHILDREN = {
'form': ['notebook', 'group', 'field', 'label', 'button','board', 'newline', 'separator'],
@ -1100,7 +1100,7 @@ var _CHILDREN = {
'label': [],
'button' : [],
'newline': [],
'separator': [],
'separator': []
};
var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
@ -1134,6 +1134,6 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti',
'selection' : 'openerp.web.ViewEditor.FieldSelect',
'char' : 'openerp.web.ViewEditor.FieldChar',
'float' : 'openerp.web.ViewEditor.FieldFloat',
'float' : 'openerp.web.ViewEditor.FieldFloat'
});
};

4
addons/web/static/src/js/view_form.js
View File

@ -1284,7 +1284,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
this.definition_options = JSON.parse(str);
}
return this.definition_options;
},
}
});
openerp.web.form.FieldChar = openerp.web.form.Field.extend({
@ -2427,7 +2427,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
var self = this;
var def = $.Deferred().then(callback).then(function() {self.o2m.view.reload();});
return this._super(name, id, _.bind(def.resolve, def));
},
}
});
openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({