Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-opw-590535-acl into lp:openerp-web/7.0

  1. 7.0-opw-590535-acl
  2. Merge into 7.0
Proposed by Anaël Closson (openerp)
Status: Merged
Merged at revision: 3923
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-590535-acl
Merge into: lp:openerp-web/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/static/src/js/coresetup.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-590535-acl
Reviewer Review Type Date Requested Status
Fabien Meghazi (OpenERP) Pending
Review via email: mp+158421@code.launchpad.net

Description of the change

Adds support for multi line text, previous trim regex stopped after \n

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js 2013-02-28 16:19:01 +0000
+++ addons/web/static/src/js/coresetup.js 2013-04-11 16:30:33 +0000
@@ -562,7 +562,7 @@
562 if (translation && translation.value === 'off') {562 if (translation && translation.value === 'off') {
563 return;563 return;
564 }564 }
565 var match = /^(\s*)(.+?)(\s*)$/.exec(this.node.data);565 var match = /^(\s*)([\s\S]+?)(\s*)$/.exec(this.node.data);
566 if (match) {566 if (match) {
567 this.node.data = match[1] + instance.web._t(match[2]) + match[3];567 this.node.data = match[1] + instance.web._t(match[2]) + match[3];
568 }568 }