pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-14 up to b4e310e7f6

Browse Source
This commit is contained in:
Christophe Simonis
2018-10-29 14:08:08 +01:00
parent d692f3b781 b4e310e7f6
commit 953dfe92c2
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_links/static/src/js/website_links.js
+3 -5
View File
@@ -10,7 +10,6 @@ var Model = require('web.Model');
var qweb = core.qweb;
var _t = core._t;
var ZeroClipboard = window.ZeroClipboard;
var exports = {};
@@ -99,7 +98,8 @@ if(!$('.o_website_links_create_tracked_url').length) {
this.animating_copy = false;
},
start: function() {
new ZeroClipboard(this.$('.btn_shorten_url_clipboard'));
// DO NOT FORWARD PORT ABOVE V11
new Clipboard(this.$('.btn_shorten_url_clipboard')[0]);
},
toggle_copy_button: function() {
var self = this;
@@ -249,8 +249,6 @@ if(!$('.o_website_links_create_tracked_url').length) {
base.ready().done(function() {
ZeroClipboard.config({swfPath: 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, ..'));
@@ -282,7 +280,7 @@ if(!$('.o_website_links_create_tracked_url').length) {
});
// Clipboard Library
var client = new ZeroClipboard($("#btn_shorten_url"));
new Clipboard($("#btn_shorten_url")[0]);
$("#generated_tracked_link a").click(function() {
$("#generated_tracked_link a").text("Copied").removeClass("btn-primary").addClass("btn-success");
addons/website_links/views/website_links_template.xml
-1
View File
@@ -3,7 +3,6 @@
<template id="assets_website_links" inherit_id="website.assets_frontend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_links/static/lib/zeroclipboard/ZeroClipboard.js"/>
<script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
<script type="text/javascript" src="/website_links/static/src/js/website_links_code_editor.js"/>
<script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>