From 3a4e2649780744f8a80807df4bef5539c5c70a7e Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 17:50:22 +0200 Subject: [FIX]use bootstrap modal windows. refactor and cleaned from trunk-ui-to-boostrap-modal bzr revid: csn@openerp.com-20140410155022-3cqys3zc55idc4vg --- addons/web_linkedin/static/src/js/linkedin.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'addons/web_linkedin/static/src') diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 5d8d7a29b1d..0d4ab7157fa 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -56,12 +56,12 @@ openerp.web_linkedin = function(instance) { this.linkedin_def.reject(); this.auth_def.reject(); IN = false; - instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning", {'error': error})), { + var dialog = new instance.web.Dialog(this, { title: _t("LinkedIn is not enabled"), buttons: [ - {text: _t("Ok"), click: function() { $(this).dialog("close"); }} - ] - }); + {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }} + ], + }, QWeb.render('LinkedIn.DisabledWarning', {error: error})).open(); }, test_linkedin: function() { var self = this; @@ -369,11 +369,11 @@ openerp.web_linkedin = function(instance) { }, bind_event: function() { var self = this; - this.$el.parent().on("click", ".oe_linkedin_logout", function () { + this.$el.parents('.modal').on("click", ".oe_linkedin_logout", function () { IN.User.logout(); self.destroy(); }); - this.$search = this.$el.parent().find(".oe_linkedin_advanced_search" ); + this.$search = this.$el.parents('.modal').find(".oe_linkedin_advanced_search" ); this.$url = this.$search.find("input[name='search']" ); this.$button = this.$search.find("button"); @@ -396,7 +396,7 @@ openerp.web_linkedin = function(instance) { IN.API.Profile("me") .fields(["firstName", "lastName"]) .result(function (result) { - $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$el.parent().find(".ui-dialog-buttonpane")); + $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$el.parents('.modal').find(".oe_dialog_custom_buttons")); }) }, do_search: function(url) { -- cgit v1.2.3