-
+
-
-
-
\ No newline at end of file
diff --git a/addons/im_livechat/loader.js b/addons/im_livechat/loader.js
index e5ea5b2c4f5..d2580ab272a 100644
--- a/addons/im_livechat/loader.js
+++ b/addons/im_livechat/loader.js
@@ -13,6 +13,7 @@ require.config({
openerp: "web/static/src/js/openerpframework",
"jquery.achtung": "im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung",
livesupport: "im_livechat/static/ext/static/js/livesupport",
+ im_common: "im/static/src/js/im_common"
},
shim: {
underscore: {
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.mp3 b/addons/im_livechat/static/ext/static/audio/Ting.mp3
deleted file mode 100644
index ffbb77144b2..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.mp3 and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.ogg b/addons/im_livechat/static/ext/static/audio/Ting.ogg
deleted file mode 100644
index 74ee13a4e5a..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.ogg and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg b/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg
deleted file mode 100644
index 7168794022e..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/button-gloss.png b/addons/im_livechat/static/ext/static/img/button-gloss.png
deleted file mode 100755
index 6f3957702fe..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/button-gloss.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png
deleted file mode 100755
index 3bf6484a29d..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png
deleted file mode 100755
index a9969993201..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/green.png b/addons/im_livechat/static/ext/static/img/green.png
deleted file mode 100644
index 01fb373c251..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/green.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/logo.png b/addons/im_livechat/static/ext/static/img/logo.png
deleted file mode 100644
index aca5f4c60d8..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/logo.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/wood.png b/addons/im_livechat/static/ext/static/img/wood.png
deleted file mode 100644
index 22f2450d3ad..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/wood.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/js/livechat.xml b/addons/im_livechat/static/ext/static/js/livechat.xml
new file mode 100644
index 00000000000..1c7b00466d9
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/livechat.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/livesupport.js b/addons/im_livechat/static/ext/static/js/livesupport.js
index 86b2d8a4c7b..fd5cecfe7d9 100644
--- a/addons/im_livechat/static/ext/static/js/livesupport.js
+++ b/addons/im_livechat/static/ext/static/js/livesupport.js
@@ -3,8 +3,8 @@
This file must compile in EcmaScript 3 and work in IE7.
*/
-define(["openerp", "underscore", "require", "jquery",
- "jquery.achtung"], function(openerp, _, require, $) {
+define(["openerp", "im_common", "underscore", "require", "jquery",
+ "jquery.achtung"], function(openerp, im_common, _, require, $) {
/* jshint es3: true */
"use strict";
@@ -12,44 +12,37 @@ define(["openerp", "underscore", "require", "jquery",
var livesupport = {};
- _.extend(openerp.qweb.default_dict, {
- 'toUrl': _.bind(require.toUrl, require)
- });
-
- var connection;
-
- var defaultInputPlaceholder;
- var userName;
-
livesupport.main = function(server_url, db, login, password, channel, options) {
- var defs = [];
options = options || {};
_.defaults(options, {
buttonText: _t("Chat with one of our collaborators"),
inputPlaceholder: _t("How may I help you?"),
defaultMessage: null,
auto: false,
- userName: _t("Anonymous")
+ userName: _t("Anonymous"),
+ anonymous_mode: true
});
- defaultInputPlaceholder = options.inputPlaceholder;
- userName = options.userName;
- // TODO : load QwebTemplates
- defs.push(add_css("im_livechat/static/ext/static/css/livesupport.css"));
- defs.push(add_css("im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css"));
- return $.when.apply($, defs).then(function() {
- console.log("starting live support customer app");
- connection = new openerp.Session(null, server_url, { override_session: true });
- return connection.session_authenticate(db, login, password);
- }).then(function() {
- return connection.rpc('/web/proxy/load', {path: '/im_livechat/static/ext/static/js/livesupport_templates.xml'}).then(function(xml) {
+ im_common.notification = notification;
+
+ console.log("starting live support customer app");
+ im_common.connection = new openerp.Session(null, server_url, { override_session: true });
+ return im_common.connection.session_authenticate(db, login, password).then(function() {
+ var defs = [];
+ defs.push(add_css("/im/static/src/css/im_common.css"));
+ defs.push(add_css("/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css"));
+ defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im_livechat/static/ext/static/js/livechat.xml'}).then(function(xml) {
openerp.qweb.add_template(xml);
- });
+ }));
+ defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im/static/src/xml/im_common.xml'}).then(function(xml) {
+ openerp.qweb.add_template(xml);
+ }));
+ return $.when.apply($, defs);
}).then(function() {
- return connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
+ return im_common.connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
if (! activated & ! options.auto)
return;
- var button = new livesupport.ChatButton(null, channel, options);
+ var button = new im_common.ChatButton(null, channel, options);
button.appendTo($("body"));
if (options.auto)
button.click();
@@ -59,7 +52,7 @@ define(["openerp", "underscore", "require", "jquery",
var add_css = function(relative_file_name) {
var css_def = $.Deferred();
- $('
')
+ $('
')
.appendTo($("head")).ready(function() {
css_def.resolve();
});
@@ -70,9 +63,7 @@ define(["openerp", "underscore", "require", "jquery",
$.achtung({message: message, timeout: 0, showEffects: false, hideEffects: false});
};
- var ERROR_DELAY = 5000;
-
- livesupport.ChatButton = openerp.Widget.extend({
+ im_common.ChatButton = openerp.Widget.extend({
className: "openerp_style oe_chat_button",
events: {
"click": "click"
@@ -88,7 +79,8 @@ define(["openerp", "underscore", "require", "jquery",
},
click: function() {
if (! this.manager) {
- this.manager = new livesupport.ConversationManager(null);
+ this.manager = new im_common.ConversationManager(this, this.options);
+ this.manager.set("bottom_offset", 37);
this.activated_def = this.manager.start_polling();
}
var def = $.Deferred();
@@ -101,16 +93,16 @@ define(["openerp", "underscore", "require", "jquery",
def.reject();
}, 5000);
def.then(_.bind(this.chat, this), function() {
- notification(_t("It seems the connection to the server is encountering problems, please try again later."));
+ im_common.notification(_t("It seems the connection to the server is encountering problems, please try again later."));
});
},
chat: function() {
var self = this;
if (this.manager.conversations.length > 0)
return;
- connection.model("im_livechat.channel").call("get_available_user", [this.channel]).then(function(user_id) {
+ im_common.connection.model("im_livechat.channel").call("get_available_user", [this.channel]).then(function(user_id) {
if (! user_id) {
- notification(_t("None of our collaborators seems to be available, please try again later."));
+ im_common.notification(_t("None of our collaborators seems to be available, please try again later."));
return;
}
self.manager.ensure_users([user_id]).then(function() {
@@ -124,337 +116,5 @@ define(["openerp", "underscore", "require", "jquery",
}
});
- livesupport.ImUser = openerp.Class.extend(openerp.PropertiesMixin, {
- init: function(parent, user_rec) {
- openerp.PropertiesMixin.init.call(this, parent);
- user_rec.image_url = require.toUrl("im_livechat/static/ext/static/img/avatar/avatar.jpeg");
- if (user_rec.image)
- user_rec.image_url = "data:image/png;base64," + user_rec.image;
- this.set(user_rec);
- this.set("watcher_count", 0);
- this.on("change:watcher_count", this, function() {
- if (this.get("watcher_count") === 0)
- this.destroy();
- });
- },
- destroy: function() {
- this.trigger("destroyed");
- openerp.PropertiesMixin.destroy.call(this);
- },
- add_watcher: function() {
- this.set("watcher_count", this.get("watcher_count") + 1);
- },
- remove_watcher: function() {
- this.set("watcher_count", this.get("watcher_count") - 1);
- }
- });
-
- livesupport.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
- init: function(parent) {
- openerp.PropertiesMixin.init.call(this, parent);
- this.set("right_offset", 0);
- this.conversations = [];
- this.users = {};
- this.on("change:right_offset", this, this.calc_positions);
- this.set("window_focus", true);
- this.set("waiting_messages", 0);
- this.focus_hdl = _.bind(function() {
- this.set("window_focus", true);
- }, this);
- $(window).bind("focus", this.focus_hdl);
- this.blur_hdl = _.bind(function() {
- this.set("window_focus", false);
- }, this);
- $(window).bind("blur", this.blur_hdl);
- this.on("change:window_focus", this, this.window_focus_change);
- this.window_focus_change();
- this.on("change:waiting_messages", this, this.messages_change);
- this.messages_change();
- this.create_ting();
- this.activated = false;
- this.users_cache = {};
- this.last = null;
- this.unload_event_handler = _.bind(this.unload, this);
- },
- start_polling: function() {
- var self = this;
-
- var uuid = localStorage["oe_livesupport_uuid"];
- var def = $.when(uuid);
-
- if (! uuid) {
- def = connection.rpc("/longpolling/im/gen_uuid", {});
- }
- return def.then(function(uuid) {
- localStorage["oe_livesupport_uuid"] = uuid;
- return connection.model("im.user").call("get_by_user_id", [uuid]);
- }).then(function(my_id) {
- self.my_id = my_id["id"];
- return connection.model("im.user").call("assign_name", [uuid, userName]);
- }).then(function() {
- return self.ensure_users([self.my_id]);
- }).then(function() {
- var me = self.users_cache[self.my_id];
- delete self.users_cache[self.my_id];
- self.me = me;
- me.set("name", "You");
- return connection.rpc("/longpolling/im/activated", {});
- }).then(function(activated) {
- if (activated) {
- self.activated = true;
- $(window).on("unload", self.unload_event_handler);
- self.poll();
- } else {
- return $.Deferred().reject();
- }
- });
- },
- unload: function() {
- connection.model("im.user").call("im_disconnect", [], {uuid: this.me.get("uuid"), context: {}});
- },
- ensure_users: function(user_ids) {
- var no_cache = {};
- _.each(user_ids, function(el) {
- if (! this.users_cache[el])
- no_cache[el] = el;
- }, this);
- var self = this;
- if (_.size(no_cache) === 0)
- return $.when();
- else
- return connection.model("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
- self.add_to_user_cache(users);
- });
- },
- add_to_user_cache: function(user_recs) {
- _.each(user_recs, function(user_rec) {
- if (! this.users_cache[user_rec.id]) {
- var user = new livesupport.ImUser(this, user_rec);
- this.users_cache[user_rec.id] = user;
- user.on("destroyed", this, function() {
- delete this.users_cache[user_rec.id];
- });
- }
- }, this);
- },
- get_user: function(user_id) {
- return this.users_cache[user_id];
- },
- poll: function() {
- console.debug("live support beggin polling");
- var self = this;
- var user_ids = _.map(this.users_cache, function(el) {
- return el.get("id");
- });
- connection.rpc("/longpolling/im/poll", {
- last: this.last,
- users_watch: user_ids,
- db: connection.database,
- uid: connection.userId,
- password: connection.password,
- uuid: self.me.get("uuid")
- }).then(function(result) {
- _.each(result.users_status, function(el) {
- if (self.get_user(el.id))
- self.get_user(el.id).set(el);
- });
- self.last = result.last;
- var user_ids = _.pluck(_.pluck(result.res, "from_id"), 0);
- self.ensure_users(user_ids).then(function() {
- _.each(result.res, function(mes) {
- var user = self.get_user(mes.from_id[0]);
- self.received_message(mes, user);
- });
- self.poll();
- });
- }, function() {
- setTimeout(_.bind(self.poll, self), ERROR_DELAY);
- });
- },
- get_activated: function() {
- return this.activated;
- },
- create_ting: function() {
- if (typeof(Audio) === "undefined") {
- this.ting = {play: function() {}};
- return;
- }
- this.ting = new Audio(new Audio().canPlayType("audio/ogg; codecs=vorbis") ?
- require.toUrl("im_livechat/static/ext/static/audio/Ting.ogg") :
- require.toUrl("im_livechat/static/ext/static/audio/Ting.mp3")
- );
- },
- window_focus_change: function() {
- if (this.get("window_focus")) {
- this.set("waiting_messages", 0);
- }
- },
- messages_change: function() {
- //if (! instance.webclient.set_title_part)
- // return;
- //instance.webclient.set_title_part("im_messages", this.get("waiting_messages") === 0 ? undefined :
- // _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));
- },
- activate_user: function(user, focus) {
- var conv = this.users[user.get('id')];
- if (! conv) {
- conv = new livesupport.Conversation(this, user, this.me);
- conv.appendTo($("body"));
- conv.on("destroyed", this, function() {
- this.conversations = _.without(this.conversations, conv);
- delete this.users[conv.user.get('id')];
- this.calc_positions();
- });
- this.conversations.push(conv);
- this.users[user.get('id')] = conv;
- this.calc_positions();
- }
- if (focus)
- conv.focus();
- return conv;
- },
- received_message: function(message, user) {
- if (! this.get("window_focus")) {
- this.set("waiting_messages", this.get("waiting_messages") + 1);
- this.ting.play();
- this.create_ting();
- }
- var conv = this.activate_user(user);
- conv.received_message(message);
- },
- calc_positions: function() {
- var current = this.get("right_offset");
- _.each(_.range(this.conversations.length), function(i) {
- this.conversations[i].set("right_position", current);
- current += this.conversations[i].$().outerWidth(true);
- }, this);
- },
- destroy: function() {
- $(window).off("unload", this.unload_event_handler);
- $(window).unbind("blur", this.blur_hdl);
- $(window).unbind("focus", this.focus_hdl);
- openerp.PropertiesMixin.destroy.call(this);
- }
- });
-
- livesupport.Conversation = openerp.Widget.extend({
- className: "openerp_style oe_im_chatview",
- events: {
- "keydown input": "send_message",
- "click .oe_im_chatview_close": "destroy",
- "click .oe_im_chatview_header": "show_hide"
- },
- init: function(parent, user, me) {
- this._super(parent);
- this.me = me;
- this.user = user;
- this.user.add_watcher();
- this.set("right_position", 0);
- this.shown = true;
- this.set("pending", 0);
- this.inputPlaceholder = defaultInputPlaceholder;
- },
- start: function() {
- this.$().append(openerp.qweb.render("conversation", {widget: this}));
- var change_status = function() {
- this.$().toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
- this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
- this._go_bottom();
- };
- this.user.on("change:im_status", this, change_status);
- change_status.call(this);
-
- this.on("change:right_position", this, this.calc_pos);
- this.full_height = this.$().height();
- this.calc_pos();
- this.on("change:pending", this, _.bind(function() {
- if (this.get("pending") === 0) {
- this.$(".oe_im_chatview_nbr_messages").text("");
- } else {
- this.$(".oe_im_chatview_nbr_messages").text("(" + this.get("pending") + ")");
- }
- }, this));
- },
- show_hide: function() {
- if (this.shown) {
- this.$().animate({
- height: this.$(".oe_im_chatview_header").outerHeight()
- });
- } else {
- this.$().animate({
- height: this.full_height
- });
- }
- this.shown = ! this.shown;
- if (this.shown) {
- this.set("pending", 0);
- }
- },
- calc_pos: function() {
- this.$().css("right", this.get("right_position"));
- },
- received_message: function(message) {
- if (this.shown) {
- this.set("pending", 0);
- } else {
- this.set("pending", this.get("pending") + 1);
- }
- this._add_bubble(this.user, message.message, openerp.str_to_datetime(message.date));
- },
- send_message: function(e) {
- if(e && e.which !== 13) {
- return;
- }
- var mes = this.$("input").val();
- if (! mes.trim()) {
- return;
- }
- this.$("input").val("");
- var send_it = _.bind(function() {
- var model = connection.model("im.message");
- return model.call("post", [mes, this.user.get('id')], {uuid: this.me.get("uuid"), context: {}});
- }, this);
- var tries = 0;
- send_it().then(_.bind(function() {
- this._add_bubble(this.me, mes, new Date());
- }, this), function(error, e) {
- tries += 1;
- if (tries < 3)
- return send_it();
- });
- },
- _add_bubble: function(user, item, date) {
- var items = [item];
- if (user === this.last_user) {
- this.last_bubble.remove();
- items = this.last_items.concat(items);
- }
- this.last_user = user;
- this.last_items = items;
- var zpad = function(str, size) {
- str = "" + str;
- return new Array(size - str.length + 1).join('0') + str;
- };
- date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
-
- this.last_bubble = $(openerp.qweb.render("conversation_bubble", {"items": items, "user": user, "time": date}));
- $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
- this._go_bottom();
- },
- _go_bottom: function() {
- this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
- },
- focus: function() {
- this.$(".oe_im_chatview_input").focus();
- },
- destroy: function() {
- this.user.remove_watcher();
- this.trigger("destroyed");
- return this._super();
- }
- });
-
-
-
return livesupport;
});