[MERGE]merge with trunk

bzr revid: sgo@tinyerp.com-20120813064924-cvva3iqsxik3sn4q

1 files changed, 18 insertions, 0 deletions

diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
new file mode 100644
index 00000000000..555a39d7796
--- /dev/null
+++ b/addons/document_page/static/src/js/document_page.js
@@ -0,0 +1,18 @@
+openerp.document_page = function (openerp) {
+    openerp.web.form.widgets.add('text_wiki', 'openerp.web.form.FieldTextWiki');
+
+    openerp.web.form.FieldTextWiki = openerp.web.form.FieldText.extend({
+        render_value: function() {
+            var show_value = openerp.web.format_value(this.get('value'), this, '');
+            if (!this.get("effective_readonly")) {
+                this.$textarea.val(show_value);
+                if (show_value && this.view.options.resize_textareas) {
+                    this.do_resize(this.view.options.resize_textareas);
+                }
+            } else {
+                var wiki_value = wiky.process(show_value || '');
+                this.$element.html(wiki_value);
+            }
+        },
+    });
+};