# HG changeset patch # User cavaliet # Date 1370967343 -7200 # Node ID 5e714dc743a483dc9a8f68bd696a7e921d8a7ad5 # Parent eb327c2595db60e3c0f6789bfd02b8634aa5a56e add integration modifs diff -r eb327c2595db -r 5e714dc743a4 src/metadatacomposer/static/metadatacomposer/js/edition.js --- a/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 11 18:07:09 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 11 18:15:43 2013 +0200 @@ -1121,18 +1121,17 @@ ["Header 6","
"]], docType: '', bodyStyle: "margin:0; font-family: 'Helvetica Neue',​Helvetica,​Arial,​sans-serif;", - updateTextArea : function(text){ - disabledPreview(); - currentAnnotation.content.text = text; - return text; - }, - updateFrame: function(text){ - disabledPreview(); - currentAnnotation.content.text = text; - return text; - } + updateTextArea : updateWysiwigText, + updateFrame: updateWysiwigText }; + function updateWysiwigText(text){ + disabledPreview(); + currentAnnotation.content.markup = "html"; + currentAnnotation.content.text = text; + return text; + } + //slider function configSlider(data){ return {