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

some fixes 

bzr revid: nicolas.vanhoren@openerp.com-20130116164853-4opi6fhmozascoqh
This commit is contained in:
niv-openerp 2013-01-16 17:48:53 +01:00
parent 203818d7db
commit e62ba339e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/live_support/static/ext/static/js/livesupport.js
View File

@ -3,13 +3,13 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
var livesupport = {};
var templateEngine = new nova.TemplateEngine();
templateEngine.setEnvironment({"toUrl", _.bind(require.toUrl, require)});
templateEngine.extendEnvironment({"toUrl": _.bind(require.toUrl, require)});
var connection;
livesupport.main = function(server_url, db, login, password) {
templateEngine.loadFile(require.toUrl("./livesupport_templates.html")).then(function() {
connection = new oeclient.Connection(new oeclient.JsonpRPCConnector(server_url), db, login, password);
// don't know
console.log("hello");
});
};
@ -67,7 +67,7 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
this.ting = new Audio(new Audio().canPlayType("audio/ogg; codecs=vorbis") ?
require.toUrl("../audio/Ting.ogg") :
require.toUrl("../audio/Ting.mp3")
));
);
},
window_focus_change: function() {
if (this.get("window_focus")) {
@ -122,7 +122,7 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
},
});
livesupport.Conversation = instance.web.Widget.extend({
livesupport.Conversation = nova.Widget.$extend({
tagClass: "oe_im_chatview",
events: {
"keydown input": "send_message",