diff options
| author | Akash Bhavsar <abh@odoo.com> | 2017-05-03 17:12:12 +0530 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2018-01-16 10:19:39 +0100 |
| commit | 762eb49e09b35eaf301a044434e91ef2b637016a (patch) | |
| tree | 788f46eb93e372f9cec9ca7c3193864cb5c5345b /addons/website_links/static/src | |
| parent | 04cd3771c4d6e31187f04a644a8260ec49b683c5 (diff) | |
[REF] website_links: remove ZeroClipboard lib
... and use Clipboard instead, which is already in web (put in the
assets_common).
Task #33274
Diffstat (limited to 'addons/website_links/static/src')
| -rw-r--r-- | addons/website_links/static/src/js/website_links.js | 8 | ||||
| -rw-r--r-- | addons/website_links/static/src/js/website_links_charts.js | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js index 766ea907d6d..80ccb46fe87 100644 --- a/addons/website_links/static/src/js/website_links.js +++ b/addons/website_links/static/src/js/website_links.js @@ -10,7 +10,6 @@ var base = require('web_editor.base'); var qweb = core.qweb; var _t = core._t; -var ZeroClipboard = window.ZeroClipboard; var exports = {}; @@ -108,7 +107,8 @@ if (!$('.o_website_links_create_tracked_url').length) { this.animating_copy = false; }, start: function () { - new ZeroClipboard(this.$('.btn_shorten_url_clipboard')); + new Clipboard(this.$('.btn_shorten_url_clipboard').get(0)); + return this._super.apply(this, arguments); }, toggle_copy_button: function () { var self = this; @@ -258,8 +258,6 @@ if (!$('.o_website_links_create_tracked_url').length) { base.ready().done(function () { - ZeroClipboard.config({swfPath: window.location.origin + "/website_links/static/lib/zeroclipboard/ZeroClipboard.swf" }); - // UTMS selects widgets var campaign_select = new SelectBox('utm.campaign'); campaign_select.start($("#campaign-select"), _t('e.g. Promotion of June, Winter Newsletter, ..')); @@ -291,7 +289,7 @@ if (!$('.o_website_links_create_tracked_url').length) { }); // Clipboard Library - new ZeroClipboard($("#btn_shorten_url")); + new Clipboard($("#btn_shorten_url").get(0)); $("#generated_tracked_link a").click(function () { $("#generated_tracked_link a").text("Copied").removeClass("btn-primary").addClass("btn-success"); diff --git a/addons/website_links/static/src/js/website_links_charts.js b/addons/website_links/static/src/js/website_links_charts.js index bf07960b8c1..75876b55c35 100644 --- a/addons/website_links/static/src/js/website_links_charts.js +++ b/addons/website_links/static/src/js/website_links_charts.js @@ -233,8 +233,7 @@ if (!$('.o_website_links_chart').length) { }); // Copy to clipboard link - ZeroClipboard.config({swfPath: window.location.origin + "/website_links/static/lib/zeroclipboard/ZeroClipboard.swf" }); - new ZeroClipboard($('.copy-to-clipboard')); + new Clipboard($('.copy-to-clipboard')[0]); var animating_copy = false; |
