odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] don't lose link label/text if crap element with no href 

bzr revid: xmo@openerp.com-20140121151310-va8e20avgvzy0anz
This commit is contained in:
Xavier Morel 2014-01-21 16:13:10 +01:00
parent bf262a338e
commit c35ac33cf1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/website/static/src/js/website.editor.js
View File

@ -1087,15 +1087,20 @@
bind_data: function (text, href, new_window) {
href = href || this.element && (this.element.data( 'cke-saved-href')
|| this.element.getAttribute('href'));
if (!href) { return; }
if (new_window === undefined) {
new_window = this.element.getAttribute('target') === '_blank';
new_window = this.element
? this.element.getAttribute('target') === '_blank'
: false;
}
if (text === undefined) {
text = this.element.getText();
text = this.element ? this.element.getText() : '';
}
this.$('input#link-text').val(text);
this.$('input.window-new').prop('checked', new_window);
if (!href) { return; }
var match, $control;
if ((match = /mailto:(.+)/.exec(href))) {
$control = this.$('input.email-address').val(match[1]);
@ -1105,9 +1110,6 @@
}
this.changed($control);
this.$('input#link-text').val(text);
this.$('input.window-new').prop('checked', new_window);
},
changed: function ($e) {
this.$('.url-source').filter(':input').not($e).val('')