[MERGE] forward port branch saas-12 up to b1b700a

2016-09-22 15:23:45 +02:00
parent 4b812d9965 b1b700adb1
commit 856476d441
32 changed files with 1030 additions and 972 deletions
@@ -616,7 +616,6 @@ define([
      var linkUrl = linkInfo.url;
      var linkText = linkInfo.text;
      var isNewWindow = linkInfo.isNewWindow;
-      var className = linkInfo.className || null; // ODOO: addition
      var rng = linkInfo.range || this.createRange($editable);
      var isTextChanged = rng.toString() !== linkText;

@@ -647,7 +646,8 @@ define([

      $.each(anchors, function (idx, anchor) {
        $(anchor).attr('href', linkUrl);
-        $(anchor).attr('class', className); // ODOO: addition
+        $(anchor).attr('class', linkInfo.className || null); // ODOO: addition
+        $(anchor).css(linkInfo.style || {}); // ODOO: addition
        if (isNewWindow) {
          $(anchor).attr('target', '_blank');
        } else {