# HG changeset patch # User Anthony Ly # Date 1370966766 -7200 # Node ID 271d3c41f007946de15464213f6fda84289b802f # Parent 6a58575dcac5979c8584a92f37a8176a64ea6e6b text editor define markup to html diff -r 6a58575dcac5 -r 271d3c41f007 integration/js/edition.js --- a/integration/js/edition.js Tue Jun 11 17:30:00 2013 +0200 +++ b/integration/js/edition.js Tue Jun 11 18:06:06 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 {