Merge lp:~openerp-dev/openerp-web/trunk-mail-ie-chm into lp:openerp-web

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-mail-ie-chm]

3613. By Christophe Matthieu (OpenERP) on 2012-12-17

[FIX] web cleditor: bind and trigger event change inside cleditor

3614. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: rewrite braces, spaces, ponctuation

3615. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] web form: fieldtexthtml

3616. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: remove spaces

3617. By Christophe Matthieu (OpenERP) on 2012-12-21

[MERGE] from trunk

Unmerged revisions

3617. By Christophe Matthieu (OpenERP) on 2012-12-21

[MERGE] from trunk

3616. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: remove spaces

3615. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] web form: fieldtexthtml

3614. By Christophe Matthieu (OpenERP) on 2012-12-17

[IMP] cleditor: rewrite braces, spaces, ponctuation

3613. By Christophe Matthieu (OpenERP) on 2012-12-17

[FIX] web cleditor: bind and trigger event change inside cleditor

3612. By Christophe Matthieu (OpenERP) on 2012-12-14

[IMP] web form: change for cleditor field html

3611. By Christophe Matthieu (OpenERP) on 2012-12-14

[IMP] view_form: add console in cleditor for ie debugging

=== modified file 'addons/web/static/lib/cleditor/jquery.cleditor.js'
--- addons/web/static/lib/cleditor/jquery.cleditor.js	2012-10-29 14:35:27 +0000
+++ addons/web/static/lib/cleditor/jquery.cleditor.js	2012-12-21 17:26:22 +0000
@@ -12,7 +12,8 @@
 // @output_file_name jquery.cleditor.min.js
 // ==/ClosureCompiler==
 
-(function($) {
+(function ($) {
+  'use strict';
 
   //==============
   // jQuery Plugin
@@ -25,93 +26,91 @@
       width:        500, // width not including margins, borders or padding
       height:       250, // height not including margins, borders or padding
       controls:     // controls to add to the toolbar
-                    "bold italic underline strikethrough subscript superscript | font size " +
-                    "style | color highlight removeformat | bullets numbering | outdent " +
-                    "indent | alignleft center alignright justify | undo redo | " +
-                    "rule image link unlink | cut copy paste pastetext | print source",
+                    'bold italic underline strikethrough subscript superscript | font size ' +
+                    'style | color highlight removeformat | bullets numbering | outdent ' +
+                    'indent | alignleft center alignright justify | undo redo | ' +
+                    'rule image link unlink | cut copy paste pastetext | print source', 
       colors:       // colors in the color popup
-                    "FFF FCC FC9 FF9 FFC 9F9 9FF CFF CCF FCF " +
-                    "CCC F66 F96 FF6 FF3 6F9 3FF 6FF 99F F9F " +
-                    "BBB F00 F90 FC6 FF0 3F3 6CC 3CF 66C C6C " +
-                    "999 C00 F60 FC3 FC0 3C0 0CC 36F 63F C3C " +
-                    "666 900 C60 C93 990 090 399 33F 60C 939 " +
-                    "333 600 930 963 660 060 366 009 339 636 " +
-                    "000 300 630 633 330 030 033 006 309 303",    
+                    'FFF FCC FC9 FF9 FFC 9F9 9FF CFF CCF FCF ' +
+                    'CCC F66 F96 FF6 FF3 6F9 3FF 6FF 99F F9F ' +
+                    'BBB F00 F90 FC6 FF0 3F3 6CC 3CF 66C C6C ' +
+                    '999 C00 F60 FC3 FC0 3C0 0CC 36F 63F C3C ' +
+                    '666 900 C60 C93 990 090 399 33F 60C 939 ' +
+                    '333 600 930 963 660 060 366 009 339 636 ' +
+                    '000 300 630 633 330 030 033 006 309 303', 
       fonts:        // font names in the font popup
-                    "Arial,Arial Black,Comic Sans MS,Courier New,Narrow,Garamond," +
-                    "Georgia,Impact,Sans Serif,Serif,Tahoma,Trebuchet MS,Verdana",
+                    'Arial, Arial Black, Comic Sans MS, Courier New, Narrow, Garamond, ' +
+                    'Georgia, Impact, Sans Serif, Serif, Tahoma, Trebuchet MS, Verdana', 
       sizes:        // sizes in the font size popup
-                    "1,2,3,4,5,6,7",
+                    '1, 2, 3, 4, 5, 6, 7', 
       styles:       // styles in the style popup
-                    [["Paragraph", "<p>"], ["Header 1", "<h1>"], ["Header 2", "<h2>"],
-                    ["Header 3", "<h3>"],  ["Header 4","<h4>"],  ["Header 5","<h5>"],
-                    ["Header 6","<h6>"]],
+                    [['Paragraph', '<p>'], ['Header 1', '<h1>'], ['Header 2', '<h2>'], 
+                    ['Header 3', '<h3>'],  ['Header 4', '<h4>'],  ['Header 5', '<h5>'], 
+                    ['Header 6', '<h6>']], 
       useCSS:       false, // use CSS to style HTML when possible (not supported in ie)
       docType:      // Document type contained within the editor
-                    '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+                    '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">', 
       docCSSFile:   // CSS file used to style the document contained within the editor
-                    "", 
+                    '', 
       bodyStyle:    // style to assign to document body contained within the editor
-                    "margin:4px; font:10pt Arial,Verdana; cursor:text"
-    },
-
+                    'margin:4px; font:10pt Arial, Verdana; cursor:text'
+    }, 
     // Define all usable toolbar buttons - the init string property is 
     //   expanded during initialization back into the buttons object and 
     //   seperate object properties are created for each button.
-    //   e.g. buttons.size.title = "Font Size"
+    //   e.g. buttons.size.title = 'Font Size'
     buttons: {
-      // name,title,command,popupName (""=use name)
+      // name, title, command, popupName (''=use name)
       init:
-      "bold,,|" +
-      "italic,,|" +
-      "underline,,|" +
-      "strikethrough,,|" +
-      "subscript,,|" +
-      "superscript,,|" +
-      "font,,fontname,|" +
-      "size,Font Size,fontsize,|" +
-      "style,,formatblock,|" +
-      "color,Font Color,forecolor,|" +
-      "highlight,Text Highlight Color,hilitecolor,color|" +
-      "removeformat,Remove Formatting,|" +
-      "bullets,,insertunorderedlist|" +
-      "numbering,,insertorderedlist|" +
-      "outdent,,|" +
-      "indent,,|" +
-      "alignleft,Align Text Left,justifyleft|" +
-      "center,,justifycenter|" +
-      "alignright,Align Text Right,justifyright|" +
-      "justify,,justifyfull|" +
-      "undo,,|" +
-      "redo,,|" +
-      "rule,Insert Horizontal Rule,inserthorizontalrule|" +
-      "image,Insert Image,insertimage,url|" +
-      "link,Insert Hyperlink,createlink,url|" +
-      "unlink,Remove Hyperlink,|" +
-      "cut,,|" +
-      "copy,,|" +
-      "paste,,|" +
-      "pastetext,Paste as Text,inserthtml,|" +
-      "print,,|" +
-      "source,Show Source"
-    },
-
+        'bold,,|' +
+        'italic,,|' +
+        'underline,,|' +
+        'strikethrough,,|' +
+        'subscript,,|' +
+        'superscript,,|' +
+        'font,,fontname,|' +
+        'size,Font Size,fontsize,|' +
+        'style,,formatblock,|' +
+        'color,Font Color,forecolor,|' +
+        'highlight,Text Highlight Color,hilitecolor,color|' +
+        'removeformat,Remove Formatting,|' +
+        'bullets,,insertunorderedlist|' +
+        'numbering,,insertorderedlist|' +
+        'outdent,,|' +
+        'indent,,|' +
+        'alignleft,Align Text Left,justifyleft|' +
+        'center,,justifycenter|' +
+        'alignright,Align Text Right,justifyright|' +
+        'justify,,justifyfull|' +
+        'undo,,|' +
+        'redo,,|' +
+        'rule,Insert Horizontal Rule,inserthorizontalrule|' +
+        'image,Insert Image,insertimage,url|' +
+        'link,Insert Hyperlink,createlink,url|' +
+        'unlink,Remove Hyperlink,|' +
+        'cut,,|' +
+        'copy,,|' +
+        'paste,,|' +
+        'pastetext,Paste as Text,inserthtml,|' +
+        'print,,|' +
+        'source,Show Source'
+    }, 
     // imagesPath - returns the path to the images folder
-    imagesPath: function() { return imagesPath(); }
+    imagesPath: function () { return imagesPath(); }
 
   };
 
   // cleditor - creates a new editor for each of the matched textareas
-  $.fn.cleditor = function(options) {
+  $.fn.cleditor = function (options) {
 
     // Create a new jQuery object to hold the results
     var $result = $([]);
 
     // Loop through all matching textareas and create the editors
-    this.each(function(idx, elem) {
-      if (elem.tagName == "TEXTAREA") {
+    this.each(function (idx, elem) {
+      if (elem.tagName === 'TEXTAREA') {
         var data = $.data(elem, CLEDITOR);
-        if (!data) data = new cleditor(elem, options);
+        if (!data) {data = new cleditor(elem, options);}
         $result = $result.add(data);
       }
     });
@@ -128,45 +127,40 @@
   var
 
   // Misc constants
-  BACKGROUND_COLOR = "backgroundColor",
-  BUTTON           = "button",
-  BUTTON_NAME      = "buttonName",
-  CHANGE           = "change",
-  CLEDITOR         = "cleditor",
-  CLICK            = "click",
-  DISABLED         = "disabled",
-  DIV_TAG          = "<div>",
-  TRANSPARENT      = "transparent",
-  UNSELECTABLE     = "unselectable",
-
-  // Class name constants
-  MAIN_CLASS       = "cleditorMain",    // main containing div
-  TOOLBAR_CLASS    = "cleditorToolbar", // toolbar div inside main div
-  GROUP_CLASS      = "cleditorGroup",   // group divs inside the toolbar div
-  BUTTON_CLASS     = "cleditorButton",  // button divs inside group div
-  DISABLED_CLASS   = "cleditorDisabled",// disabled button divs
-  DIVIDER_CLASS    = "cleditorDivider", // divider divs inside group div
-  POPUP_CLASS      = "cleditorPopup",   // popup divs inside body
-  LIST_CLASS       = "cleditorList",    // list popup divs inside body
-  COLOR_CLASS      = "cleditorColor",   // color popup div inside body
-  PROMPT_CLASS     = "cleditorPrompt",  // prompt popup divs inside body
-  MSG_CLASS        = "cleditorMsg",     // message popup div inside body
-
-  // Test for ie
-  ie = $.browser.msie,
-  ie6 = /msie\s6/i.test(navigator.userAgent),
-
-  // Test for iPhone/iTouch/iPad
-  iOS = /iphone|ipad|ipod/i.test(navigator.userAgent),
-
-  // Popups are created once as needed and shared by all editor instances
-  popups = {},
-
-  // Used to prevent the document click event from being bound more than once
-  documentClickAssigned,
-
-  // Local copy of the buttons object
-  buttons = $.cleditor.buttons;
+    BACKGROUND_COLOR = 'backgroundColor', 
+    BUTTON           = 'button', 
+    BUTTON_NAME      = 'buttonName', 
+    CHANGE           = 'change', 
+    CLEDITOR         = 'cleditor', 
+    CLICK            = 'click', 
+    DISABLED         = 'disabled', 
+    DIV_TAG          = '<div>', 
+    TRANSPARENT      = 'transparent', 
+    UNSELECTABLE     = 'unselectable', 
+    // Class name constants
+    MAIN_CLASS       = 'cleditorMain',    // main containing div
+    TOOLBAR_CLASS    = 'cleditorToolbar', // toolbar div inside main div
+    GROUP_CLASS      = 'cleditorGroup',   // group divs inside the toolbar div
+    BUTTON_CLASS     = 'cleditorButton',  // button divs inside group div
+    DISABLED_CLASS   = 'cleditorDisabled', // disabled button divs
+    DIVIDER_CLASS    = 'cleditorDivider', // divider divs inside group div
+    POPUP_CLASS      = 'cleditorPopup',   // popup divs inside body
+    LIST_CLASS       = 'cleditorList',    // list popup divs inside body
+    COLOR_CLASS      = 'cleditorColor',   // color popup div inside body
+    PROMPT_CLASS     = 'cleditorPrompt',  // prompt popup divs inside body
+    MSG_CLASS        = 'cleditorMsg',     // message popup div inside body
+
+    // Test for ie
+    ie = $.browser.msie, 
+    ie6 = /msie\s6/i.test(navigator.userAgent), 
+    // Test for iPhone/iTouch/iPad
+    iOS = /iphone|ipad|ipod/i.test(navigator.userAgent), 
+    // Popups are created once as needed and shared by all editor instances
+    popups = {}, 
+    // Used to prevent the document click event from being bound more than once
+    documentClickAssigned, 
+    // Local copy of the buttons object
+    buttons = $.cleditor.buttons;
 
   //===============
   // Initialization
@@ -174,15 +168,15 @@
 
   // Expand the buttons.init string back into the buttons object
   //   and create seperate object properties for each button.
-  //   e.g. buttons.size.title = "Font Size"
-  $.each(buttons.init.split("|"), function(idx, button) {
-    var items = button.split(","), name = items[0];
+  //   e.g. buttons.size.title = 'Font Size'
+  $.each(buttons.init.split('|'), function (idx, button) {
+    var items = button.split(','), name = items[0];
     buttons[name] = {
-      stripIndex: idx,
-      name: name,
-      title: items[1] === "" ? name.charAt(0).toUpperCase() + name.substr(1) : items[1],
-      command: items[2] === "" ? name : items[2],
-      popupName: items[3] === "" ? name : items[3]
+      stripIndex: idx, 
+      name: name, 
+      title: items[1] === '' ? name.charAt(0).toUpperCase() + name.substr(1) : items[1], 
+      command: items[2] === '' ? name : items[2], 
+      popupName: items[3] === '' ? name : items[3]
     };
   });
   delete buttons.init;
@@ -192,7 +186,7 @@
   //============
 
   // cleditor - creates a new editor for the passed in textarea element
-  cleditor = function(area, options) {
+  var cleditor = function (area, options) {
 
     var editor = this;
 
@@ -203,7 +197,7 @@
     var $area = editor.$area = $(area)
       .hide()
       .data(CLEDITOR, editor)
-      .blur(function() {
+      .blur(function () {
         // Update the iframe when the textarea loses focus
         updateFrame(editor, true);
       });
@@ -225,11 +219,11 @@
       .appendTo($toolbar);
     
     // Add the buttons to the toolbar
-    $.each(options.controls.split(" "), function(idx, buttonName) {
-      if (buttonName === "") return true;
+    $.each(options.controls.split(' '), function (idx, buttonName) {
+      if (buttonName === '') {return true;}
 
       // Divider
-      if (buttonName == "|") {
+      if (buttonName === '|') {
 
         // Add a new divider to the group
         var $div = $(DIV_TAG)
@@ -253,27 +247,28 @@
         var $buttonDiv = $(DIV_TAG)
           .data(BUTTON_NAME, button.name)
           .addClass(BUTTON_CLASS)
-          .attr("title", button.title)
+          .attr('title', button.title)
           .bind(CLICK, $.proxy(buttonClick, editor))
           .appendTo($group)
           .hover(hoverEnter, hoverLeave);
 
         // Prepare the button image
         var map = {};
-        if (button.css) map = button.css;
-        else if (button.image) map.backgroundImage = imageUrl(button.image);
-        if (button.stripIndex) map.backgroundPosition = button.stripIndex * -24;
+        if (button.css) {map = button.css;}
+        else if (button.image) {map.backgroundImage = imageUrl(button.image);}
+        if (button.stripIndex) {map.backgroundPosition = button.stripIndex * -24;}
         $buttonDiv.css(map);
 
         // Add the unselectable attribute for ie
-        if (ie)
-          $buttonDiv.attr(UNSELECTABLE, "on");
+        if (ie) {
+          $buttonDiv.attr(UNSELECTABLE, 'on');
+        }
 
         // Create the popup
-        if (button.popupName)
-          createPopup(button.popupName, options, button.popupClass,
+        if (button.popupName) {
+          createPopup(button.popupName, options, button.popupClass, 
             button.popupContent, button.popupHover);
-        
+        }
       }
 
     });
@@ -284,23 +279,25 @@
 
     // Bind the document click event handler
     if (!documentClickAssigned) {
-      $(document).click(function(e) {
+      $(document).click(function (e) {
         // Dismiss all non-prompt popups
         var $target = $(e.target);
-        if (!$target.add($target.parents()).is("." + PROMPT_CLASS))
+        if (!$target.add($target.parents()).is('.' + PROMPT_CLASS)) {
           hidePopups();
+        }
       });
       documentClickAssigned = true;
     }
 
     // Bind the window resize event when the width or height is auto or %
-    if (/auto|%/.test("" + options.width + options.height))
-      $(window).resize(function() {
+    if (/auto|%/.test('' + options.width + options.height)) {
+      $(window).resize(function () {
         // CHM Note MonkeyPatch: if the DOM is not remove, refresh the cleditor
         if(editor.$main.parent().parent().size()) {
           refresh(editor);
         }
       });
+    }
 
     // Create the iframe and resize the controls
     refresh(editor);
@@ -311,40 +308,39 @@
   // Public Methods
   //===============
 
-  var fn = cleditor.prototype,
-
+  var fn = cleditor.prototype, 
   // Expose the following private functions as methods on the cleditor object.
   // The closure compiler will rename the private functions. However, the
   // exposed method names on the cleditor object will remain fixed.
   methods = [
-    ["clear", clear],
-    ["disable", disable],
-    ["execCommand", execCommand],
-    ["focus", focus],
-    ["hidePopups", hidePopups],
-    ["sourceMode", sourceMode, true],
-    ["refresh", refresh],
-    ["select", select],
-    ["selectedHTML", selectedHTML, true],
-    ["selectedText", selectedText, true],
-    ["showMessage", showMessage],
-    ["updateFrame", updateFrame],
-    ["updateTextArea", updateTextArea]
+    ['clear', clear], 
+    ['disable', disable], 
+    ['execCommand', execCommand], 
+    ['focus', focus], 
+    ['hidePopups', hidePopups], 
+    ['sourceMode', sourceMode, true], 
+    ['refresh', refresh], 
+    ['select', select], 
+    ['selectedHTML', selectedHTML, true], 
+    ['selectedText', selectedText, true], 
+    ['showMessage', showMessage], 
+    ['updateFrame', updateFrame], 
+    ['updateTextArea', updateTextArea]
   ];
 
-  $.each(methods, function(idx, method) {
-    fn[method[0]] = function() {
+  $.each(methods, function (idx, method) {
+    fn[method[0]] = function () {
       var editor = this, args = [editor];
       // using each here would cast booleans into objects!
       for(var x = 0; x < arguments.length; x++) {args.push(arguments[x]);}
       var result = method[1].apply(editor, args);
-      if (method[2]) return result;
+      if (method[2]) {return result;}
       return editor;
     };
   });
 
-  // change - shortcut for .bind("change", handler) or .trigger("change")
-  fn.change = function(handler) {
+  // change - shortcut for .bind('change', handler) or .trigger('change')
+  fn.change = function (handler) {
     var $this = $(this);
     return handler ? $this.bind(CHANGE, handler) : $this.trigger(CHANGE);
   };
@@ -356,33 +352,35 @@
   // buttonClick - click event handler for toolbar buttons
   function buttonClick(e) {
 
-    var editor = this,
-        buttonDiv = e.target,
-        buttonName = $.data(buttonDiv, BUTTON_NAME),
-        button = buttons[buttonName],
-        popupName = button.popupName,
+    var editor = this, 
+        buttonDiv = e.target, 
+        buttonName = $.data(buttonDiv, BUTTON_NAME), 
+        button = buttons[buttonName], 
+        popupName = button.popupName, 
         popup = popups[popupName];
 
     // Check if disabled
-    if (editor.disabled || $(buttonDiv).attr(DISABLED) == DISABLED)
+    if (editor.disabled || $(buttonDiv).attr(DISABLED) === DISABLED) {
       return;
+    }
 
     // Fire the buttonClick event
     var data = {
-      editor: editor,
-      button: buttonDiv,
-      buttonName: buttonName,
-      popup: popup,
-      popupName: popupName,
-      command: button.command,
+      editor: editor, 
+      button: buttonDiv, 
+      buttonName: buttonName, 
+      popup: popup, 
+      popupName: popupName, 
+      command: button.command, 
       useCSS: editor.options.useCSS
     };
 
-    if (button.buttonClick && button.buttonClick(e, data) === false)
+    if (button.buttonClick && button.buttonClick(e, data) === false) {
       return false;
+    }
 
     // Toggle source
-    if (buttonName == "source") {
+    if (buttonName === 'source') {
 
       // Show the iframe
       if (sourceMode(editor)) {
@@ -396,12 +394,12 @@
       else {
         editor.$frame.hide();
         editor.$area.show();
-        buttonDiv.title = "Show Rich Text";
+        buttonDiv.title = 'Show Rich Text';
       }
 
       // Enable or disable the toolbar buttons
       // IE requires the timeout
-      setTimeout(function() {refreshButtons(editor);}, 100);
+      setTimeout(function () {refreshButtons(editor);}, 100);
 
     }
 
@@ -413,27 +411,28 @@
         var $popup = $(popup);
 
         // URL
-        if (popupName == "url") {
+        if (popupName === 'url') {
 
           // Check for selection before showing the link url popup
-          if (buttonName == "link" && selectedText(editor) === "") {
-            showMessage(editor, "A selection is required when inserting a link.", buttonDiv);
+          if (buttonName === 'link' && selectedText(editor) === '') {
+            showMessage(editor, 'A selection is required when inserting a link.', buttonDiv);
             return false;
           }
 
           // Wire up the submit button click event handler
-          $popup.children(":button")
+          $popup.children(':button')
             .unbind(CLICK)
-            .bind(CLICK, function() {
+            .bind(CLICK, function () {
 
               // Insert the image or link if a url was entered
-              var $text = $popup.find(":text"),
+              var $text = $popup.find(':text'), 
                 url = $.trim($text.val());
-              if (url !== "")
+              if (url !== '') {
                 execCommand(editor, data.command, url, null, data.button);
+              }
 
               // Reset the text, hide the popup and set focus
-              $text.val("http://");
+              $text.val('http://');
               hidePopups();
               focus(editor);
 
@@ -442,21 +441,22 @@
         }
 
         // Paste as Text
-        else if (popupName == "pastetext") {
+        else if (popupName === 'pastetext') {
 
           // Wire up the submit button click event handler
-          $popup.children(":button")
+          $popup.children(':button')
             .unbind(CLICK)
-            .bind(CLICK, function() {
+            .bind(CLICK, function () {
 
               // Insert the unformatted text replacing new lines with break tags
-              var $textarea = $popup.find("textarea"),
-                text = $textarea.val().replace(/\n/g, "<br />");
-              if (text !== "")
+              var $textarea = $popup.find('textarea'), 
+                text = $textarea.val().replace(/\n/g, '<br />');
+              if (text !== '') {
                 execCommand(editor, data.command, text, null, data.button);
+              }
 
               // Reset the text, hide the popup and set focus
-              $textarea.val("");
+              $textarea.val('');
               hidePopups();
               focus(editor);
 
@@ -476,12 +476,14 @@
       }
 
       // Print
-      else if (buttonName == "print")
+      else if (buttonName === 'print') {
         editor.$frame[0].contentWindow.print();
+      }
 
       // All other buttons
-      else if (!execCommand(editor, data.command, data.value, data.useCSS, buttonDiv))
+      else if (!execCommand(editor, data.command, data.value, data.useCSS, buttonDiv)) {
         return false;
+      }
 
     }
 
@@ -492,71 +494,78 @@
 
   // hoverEnter - mouseenter event handler for buttons and popup items
   function hoverEnter(e) {
-    var $div = $(e.target).closest("div");
-    $div.css(BACKGROUND_COLOR, $div.data(BUTTON_NAME) ? "#FFF" : "#FFC");
+    var $div = $(e.target).closest('div');
+    $div.css(BACKGROUND_COLOR, $div.data(BUTTON_NAME) ? '#FFF' : '#FFC');
   }
 
   // hoverLeave - mouseleave event handler for buttons and popup items
   function hoverLeave(e) {
-    $(e.target).closest("div").css(BACKGROUND_COLOR, "transparent");
+    $(e.target).closest('div').css(BACKGROUND_COLOR, 'transparent');
   }
 
   // popupClick - click event handler for popup items
   function popupClick(e) {
 
-    var editor = this,
-        popup = e.data.popup,
+    var editor = this, 
+        popup = e.data.popup, 
         target = e.target;
 
     // Check for message and prompt popups
-    if (popup === popups.msg || $(popup).hasClass(PROMPT_CLASS))
+    if (popup === popups.msg || $(popup).hasClass(PROMPT_CLASS)) {
       return;
+    }
 
     // Get the button info
-    var buttonDiv = $.data(popup, BUTTON),
-        buttonName = $.data(buttonDiv, BUTTON_NAME),
-        button = buttons[buttonName],
-        command = button.command,
-        value,
+    var buttonDiv = $.data(popup, BUTTON), 
+        buttonName = $.data(buttonDiv, BUTTON_NAME), 
+        button = buttons[buttonName], 
+        command = button.command, 
+        value, 
         useCSS = editor.options.useCSS;
 
     // Get the command value
-    if (buttonName == "font")
+    if (buttonName === 'font') {
       // Opera returns the fontfamily wrapped in quotes
-      value = target.style.fontFamily.replace(/"/g, "");
-    else if (buttonName == "size") {
-      if (target.tagName == "DIV")
+      value = target.style.fontFamily.replace(/'/g, '');
+    }
+    else if (buttonName === 'size') {
+      if (target.tagName === 'DIV') {
         target = target.children[0];
+      }
       value = target.innerHTML;
     }
-    else if (buttonName == "style")
-      value = "<" + target.tagName + ">";
-    else if (buttonName == "color")
-      value = hex(target.style.backgroundColor);
-    else if (buttonName == "highlight") {
-      value = hex(target.style.backgroundColor);
-      if (ie) command = 'backcolor';
-      else useCSS = true;
+    else if (buttonName === 'style') {
+      value = '<' + target.tagName + '>';
+    }
+    else if (buttonName === 'color') {
+      value = hex(target.style.backgroundColor);
+    }
+    else if (buttonName === 'highlight') {
+      value = hex(target.style.backgroundColor);
+      if (ie) {command = 'backcolor';}
+      else {useCSS = true;}
     }
 
     // Fire the popupClick event
     var data = {
-      editor: editor,
-      button: buttonDiv,
-      buttonName: buttonName,
-      popup: popup,
-      popupName: button.popupName,
-      command: command,
-      value: value,
+      editor: editor, 
+      button: buttonDiv, 
+      buttonName: buttonName, 
+      popup: popup, 
+      popupName: button.popupName, 
+      command: command, 
+      value: value, 
       useCSS: useCSS
     };
 
-    if (button.popupClick && button.popupClick(e, data) === false)
+    if (button.popupClick && button.popupClick(e, data) === false) {
       return;
+    }
 
     // Execute the command
-    if (data.command && !execCommand(editor, data.command, data.value, data.useCSS, buttonDiv))
+    if (data.command && !execCommand(editor, data.command, data.value, data.useCSS, buttonDiv)) {
       return false;
+    }
 
     // Hide the popup and focus the editor
     hidePopups();
@@ -581,7 +590,7 @@
 
   // clear - clears the contents of the editor
   function clear(editor) {
-    editor.$area.val("");
+    editor.$area.val('');
     updateFrame(editor);
   }
 
@@ -589,82 +598,90 @@
   function createPopup(popupName, options, popupTypeClass, popupContent, popupHover) {
 
     // Check if popup already exists
-    if (popups[popupName])
+    if (popups[popupName]) {
       return popups[popupName];
+    }
 
     // Create the popup
     var $popup = $(DIV_TAG)
       .hide()
       .addClass(POPUP_CLASS)
-      .appendTo("body");
+      .appendTo('body');
 
     // Add the content
 
     // Custom popup
-    if (popupContent)
+    if (popupContent) {
       $popup.html(popupContent);
+    }
 
     // Color
-    else if (popupName == "color") {
-      var colors = options.colors.split(" ");
-      if (colors.length < 10)
-        $popup.width("auto");
-      $.each(colors, function(idx, color) {
+    else if (popupName === 'color') {
+      var colors = options.colors.split(' ');
+      if (colors.length < 10) {
+        $popup.width('auto');
+      }
+      $.each(colors, function (idx, color) {
         $(DIV_TAG).appendTo($popup)
-          .css(BACKGROUND_COLOR, "#" + color);
+          .css(BACKGROUND_COLOR, '#' + color);
       });
       popupTypeClass = COLOR_CLASS;
     }
 
     // Font
-    else if (popupName == "font")
-      $.each(options.fonts.split(","), function(idx, font) {
+    else if (popupName === 'font') {
+      $.each(options.fonts.split(','), function (idx, font) {
         $(DIV_TAG).appendTo($popup)
-          .css("fontFamily", font)
+          .css('fontFamily', font)
           .html(font);
       });
+    }
 
     // Size
-    else if (popupName == "size")
-      $.each(options.sizes.split(","), function(idx, size) {
+    else if (popupName === 'size') {
+      $.each(options.sizes.split(','), function (idx, size) {
         $(DIV_TAG).appendTo($popup)
-          .html("<font size=" + size + ">" + size + "</font>");
+          .html('<font size=' + size + '>' + size + '</font>');
       });
+    }
 
     // Style
-    else if (popupName == "style")
-      $.each(options.styles, function(idx, style) {
+    else if (popupName === 'style') {
+      $.each(options.styles, function (idx, style) {
         $(DIV_TAG).appendTo($popup)
-          .html(style[1] + style[0] + style[1].replace("<", "</"));
+          .html(style[1] + style[0] + style[1].replace('<', '</'));
       });
+    }
 
     // URL
-    else if (popupName == "url") {
+    else if (popupName === 'url') {
       $popup.html('Enter URL:<br><input type=text value="http://" size=35><br><input type=button value="Submit">');
       popupTypeClass = PROMPT_CLASS;
     }
 
     // Paste as Text
-    else if (popupName == "pastetext") {
+    else if (popupName === 'pastetext') {
       $popup.html('Paste your content here and click submit.<br /><textarea cols=40 rows=3></textarea><br /><input type=button value=Submit>');
       popupTypeClass = PROMPT_CLASS;
     }
 
     // Add the popup type class name
-    if (!popupTypeClass && !popupContent)
+    if (!popupTypeClass && !popupContent) {
       popupTypeClass = LIST_CLASS;
+    }
     $popup.addClass(popupTypeClass);
 
     // Add the unselectable attribute to all items
     if (ie) {
-      $popup.attr(UNSELECTABLE, "on")
-        .find("div,font,p,h1,h2,h3,h4,h5,h6")
-        .attr(UNSELECTABLE, "on");
+      $popup.attr(UNSELECTABLE, 'on')
+        .find('div, font, p, h1, h2, h3, h4, h5, h6')
+        .attr(UNSELECTABLE, 'on');
     }
 
     // Add the hover effect to all items
-    if ($popup.hasClass(LIST_CLASS) || popupHover === true)
+    if ($popup.hasClass(LIST_CLASS) || popupHover === true) {
       $popup.children().hover(hoverEnter, hoverLeave);
+    }
 
     // Add the popup to the array and return it
     popups[popupName] = $popup[0];
@@ -687,10 +704,10 @@
 
     // Switch the iframe into design mode.
     // ie6 does not support designMode.
-    // ie7 & ie8 do not properly support designMode="off".
+    // ie7 & ie8 do not properly support designMode='off'.
     try {
-      if (ie) editor.doc.body.contentEditable = !disabled;
-      else editor.doc.designMode = !disabled ? "on" : "off";
+      if (ie) {editor.doc.body.contentEditable = !disabled;}
+      else {editor.doc.designMode = !disabled ? 'on' : 'off';}
     }
     // Firefox 1.5 throws an exception that can be ignored
     // when toggling designMode from off to on.
@@ -709,27 +726,31 @@
 
     // Set the styling method
     if (!ie) {
-      if (useCSS === undefined || useCSS === null)
+      if (useCSS === undefined || useCSS === null) {
         useCSS = editor.options.useCSS;
-      editor.doc.execCommand("styleWithCSS", 0, useCSS.toString());
+      }
+      editor.doc.execCommand('styleWithCSS', 0, useCSS.toString());
     }
 
     // Execute the command and check for error
     var success = true, description;
-    if (ie && command.toLowerCase() == "inserthtml")
+    if (ie && command.toLowerCase() === 'inserthtml') {
       getRange(editor).pasteHTML(value);
+    }
     else {
       try { success = editor.doc.execCommand(command, 0, value || null); }
       catch (err) { description = err.description; success = false; }
       if (!success) {
-        if ("cutcopypaste".indexOf(command) > -1)
-          showMessage(editor, "For security reasons, your browser does not support the " +
-            command + " command. Try using the keyboard shortcut or context menu instead.",
-            button);
-        else
-          showMessage(editor,
-            (description ? description : "Error executing the " + command + " command."),
-            button);
+        if ('cutcopypaste'.indexOf(command) > -1) {
+          showMessage(editor, 'For security reasons, your browser does not support the ' +
+            command + ' command. Try using the keyboard shortcut or context menu instead.', 
+            button);
+        }
+        else {
+          showMessage(editor, 
+            (description ? description : 'Error executing the ' + command + ' command.'), 
+            button);
+        }
       }
     }
 
@@ -741,43 +762,44 @@
 
   // focus - sets focus to either the textarea or iframe
   function focus(editor) {
-    setTimeout(function() {
-      if (sourceMode(editor)) editor.$area.focus();
-      else editor.$frame[0].contentWindow.focus();
+    setTimeout(function () {
+      if (sourceMode(editor)) {editor.$area.focus();}
+      else {editor.$frame[0].contentWindow.focus();}
       refreshButtons(editor);
     }, 0);
   }
 
   // getRange - gets the current text range object
   function getRange(editor) {
-    if (ie) return getSelection(editor).createRange();
+    if (ie) {return getSelection(editor).createRange();}
     return getSelection(editor).getRangeAt(0);
   }
 
   // getSelection - gets the current text range object
   function getSelection(editor) {
-    if (ie) return editor.doc.selection;
+    if (ie) {return editor.doc.selection;}
     return editor.$frame[0].contentWindow.getSelection();
   }
 
   // Returns the hex value for the passed in string.
-  //   hex("rgb(255, 0, 0)"); // #FF0000
-  //   hex("#FF0000"); // #FF0000
-  //   hex("#F00"); // #FF0000
+  //   hex('rgb(255, 0, 0)'); // #FF0000
+  //   hex('#FF0000'); // #FF0000
+  //   hex('#F00'); // #FF0000
   function hex(s) {
-    var m = /rgba?\((\d+), (\d+), (\d+)/.exec(s),
-      c = s.split("");
+    var m = /rgba?\((\d+), (\d+), (\d+)/.exec(s), 
+      c = s.split('');
     if (m) {
       s = ( m[1] << 16 | m[2] << 8 | m[3] ).toString(16);
-      while (s.length < 6)
-        s = "0" + s;
+      while (s.length < 6) {
+        s = '0' + s;
+      }
     }
-    return "#" + (s.length == 6 ? s : c[1] + c[1] + c[2] + c[2] + c[3] + c[3]);
+    return '#' + (s.length === 6 ? s : c[1] + c[1] + c[2] + c[2] + c[3] + c[3]);
   }
 
   // hidePopups - hides all popups
   function hidePopups() {
-    $.each(popups, function(idx, popup) {
+    $.each(popups, function (idx, popup) {
       $(popup)
         .hide()
         .unbind(CLICK)
@@ -787,25 +809,26 @@
 
   // imagesPath - returns the path to the images folder
   function imagesPath() {
-    var cssFile = "jquery.cleditor.css",
-        href = $("link[href$='" + cssFile +"']").attr("href");
-    return href.substr(0, href.length - cssFile.length) + "images/";
+    var cssFile = 'jquery.cleditor.css', 
+        href = $('link[href$="' + cssFile +'"]').attr('href');
+    return href.substr(0, href.length - cssFile.length) + 'images/';
   }
 
   // imageUrl - Returns the css url string for a filemane
   function imageUrl(filename) {
-    return "url(" + imagesPath() + filename + ")";
+    return 'url(' + imagesPath() + filename + ')';
   }
 
   // refresh - creates the iframe and resizes the controls
   function refresh(editor) {
 
-    var $main = editor.$main,
+    var $main = editor.$main, 
       options = editor.options;
 
     // Remove the old iframe
-    if (editor.$frame) 
+    if (editor.$frame) {
       editor.$frame.remove();
+    }
 
     // Create a new iframe
     var $frame = editor.$frame = $('<iframe frameborder="0" src="javascript:true;">')
@@ -813,8 +836,8 @@
       .appendTo($main);
 
     // Load the iframe document content
-    var contentWindow = $frame[0].contentWindow,
-      doc = editor.doc = contentWindow.document,
+    var contentWindow = $frame[0].contentWindow, 
+      doc = editor.doc = contentWindow.document, 
       $doc = $(doc);
 
     doc.open();
@@ -828,8 +851,9 @@
 
     // Work around for bug in IE which causes the editor to lose
     // focus when clicking below the end of the document.
-    if (ie)
-      $doc.click(function() {focus(editor);});
+    if (ie) {
+      $doc.click(function () {focus(editor);});
+    }
 
     // Load the content
     updateFrame(editor);
@@ -840,60 +864,64 @@
       // Save the current user selection. This code is needed since IE will
       // reset the selection just after the beforedeactivate event and just
       // before the beforeactivate event.
-      $doc.bind("beforedeactivate beforeactivate selectionchange keypress", function(e) {
+      $doc.bind('beforedeactivate beforeactivate selectionchange keypress', function (e) {
         
         // Flag the editor as inactive
-        if (e.type == "beforedeactivate")
+        if (e.type === 'beforedeactivate') {
           editor.inactive = true;
+        }
         
         // Get rid of the bogus selection and flag the editor as active
-        else if (e.type == "beforeactivate") {
-          if (!editor.inactive && editor.range && editor.range.length > 1)
+        else if (e.type === 'beforeactivate') {
+          if (!editor.inactive && editor.range && editor.range.length > 1) {
             editor.range.shift();
+          }
           delete editor.inactive;
         }
 
         // Save the selection when the editor is active
         else if (!editor.inactive) {
-          if (!editor.range) 
+          if (!editor.range) {
             editor.range = [];
+          }
           editor.range.unshift(getRange(editor));
 
           // We only need the last 2 selections
-          while (editor.range.length > 2)
+          while (editor.range.length > 2) {
             editor.range.pop();
+          }
         }
 
       });
 
       // Restore the text range when the iframe gains focus
-      $frame.focus(function() {
+      $frame.focus(function () {
         restoreRange(editor);
       });
 
     }
 
     // Update the textarea when the iframe loses focus
-    ($.browser.mozilla ? $doc : $(contentWindow)).blur(function() {
+    ($.browser.mozilla ? $doc : $(contentWindow)).blur(function () {
       updateTextArea(editor, true);
     });
 
     // Enable the toolbar buttons as the user types or clicks
     $doc.click(hidePopups)
-      .bind("keyup mouseup", function() {
+      .bind('keyup mouseup', function () {
         refreshButtons(editor);
       });
 
     // Show the textarea for iPhone/iTouch/iPad or
     // the iframe when design mode is supported.
-    if (iOS) editor.$area.show();
-    else $frame.show();
+    if (iOS) {editor.$area.show();}
+    else {$frame.show();}
 
     // Wait for the layout to finish - shortcut for $(document).ready()
-    $(function() {
+    $(function () {
 
-      var $toolbar = editor.$toolbar,
-          $group = $toolbar.children("div:last"),
+      var $toolbar = editor.$toolbar, 
+          $group = $toolbar.children('div:last'), 
           wid = $main.width();
 
       // Resize the toolbar
@@ -901,7 +929,7 @@
       $toolbar.height(hgt);
 
       // Resize the iframe
-      hgt = (/%/.test("" + options.height) ? $main.height() : parseInt(options.height)) - hgt;
+      hgt = (/%/.test('' + options.height) ? $main.height() : parseInt(options.height)) - hgt;
       $frame.width(wid).height(hgt);
 
       // Resize the textarea. IE6 textareas have a 1px top
@@ -930,42 +958,46 @@
 
     // Get the object used for checking queryCommandEnabled
     var queryObj = editor.doc;
-    if (ie) queryObj = getRange(editor);
+    if (ie) {queryObj = getRange(editor);}
 
     // Loop through each button
     var inSourceMode = sourceMode(editor);
-    $.each(editor.$toolbar.find("." + BUTTON_CLASS), function(idx, elem) {
+    $.each(editor.$toolbar.find('.' + BUTTON_CLASS), function (idx, elem) {
 
-      var $elem = $(elem),
-        button = $.cleditor.buttons[$.data(elem, BUTTON_NAME)],
-        command = button.command,
+      var $elem = $(elem), 
+        button = $.cleditor.buttons[$.data(elem, BUTTON_NAME)], 
+        command = button.command, 
         enabled = true;
 
       // Determine the state
-      if (editor.disabled)
+      if (editor.disabled) {
         enabled = false;
+      }
       else if (button.getEnabled) {
         var data = {
-          editor: editor,
-          button: elem,
-          buttonName: button.name,
-          popup: popups[button.popupName],
-          popupName: button.popupName,
-          command: button.command,
+          editor: editor, 
+          button: elem, 
+          buttonName: button.name, 
+          popup: popups[button.popupName], 
+          popupName: button.popupName, 
+          command: button.command, 
           useCSS: editor.options.useCSS
         };
         enabled = button.getEnabled(data);
-        if (enabled === undefined)
+        if (enabled === undefined) {
           enabled = true;
+        }
       }
-      else if (((inSourceMode || iOS) && button.name != "source") ||
-      (ie && (command == "undo" || command == "redo")))
+      else if (((inSourceMode || iOS) && button.name !== 'source') ||
+      (ie && (command === 'undo' || command === 'redo'))) {
         enabled = false;
-      else if (command && command != "print") {
-        if (ie && command == "hilitecolor")
-          command = "backcolor";
+      }
+      else if (command && command !== 'print') {
+        if (ie && command === 'hilitecolor') {
+          command = 'backcolor';
+        }
         // IE does not support inserthtml, so it's always enabled
-        if (!ie || command != "inserthtml") {
+        if (!ie || command !== 'inserthtml') {
           try {enabled = queryObj.queryCommandEnabled(command);}
           catch (err) {enabled = false;}
         }
@@ -986,15 +1018,16 @@
 
   // restoreRange - restores the current ie selection
   function restoreRange(editor) {
-    if (ie && editor.range)
+    if (ie && editor.range) {
       editor.range[0].select();
+    }
   }
 
   // select - selects all the text in either the textarea or iframe
   function select(editor) {
-    setTimeout(function() {
-      if (sourceMode(editor)) editor.$area.select();
-      else execCommand(editor, "selectall");
+    setTimeout(function () {
+      if (sourceMode(editor)) {editor.$area.select();}
+      else {execCommand(editor, 'selectall');}
     }, 0);
   }
 
@@ -1002,9 +1035,10 @@
   function selectedHTML(editor) {
     restoreRange(editor);
     var range = getRange(editor);
-    if (ie)
+    if (ie) {
       return range.htmlText;
-    var layer = $("<layer>")[0];
+    }
+    var layer = $('<layer>')[0];
     layer.appendChild(range.cloneContents());
     var html = layer.innerHTML;
     layer = null;
@@ -1014,13 +1048,13 @@
   // selectedText - returns the current text selection or and empty string
   function selectedText(editor) {
     restoreRange(editor);
-    if (ie) return getRange(editor).text;
+    if (ie) {return getRange(editor).text;}
     return getSelection(editor).toString();
   }
 
   // showMessage - alert replacement
   function showMessage(editor, message, button) {
-    var popup = createPopup("msg", editor.options, MSG_CLASS);
+    var popup = createPopup('msg', editor.options, MSG_CLASS);
     popup.innerHTML = message;
     showPopup(editor, popup, button);
   }
@@ -1056,31 +1090,32 @@
     }
 
     // Focus the first input element if any
-    setTimeout(function() {
-      $popup.find(":text,textarea").eq(0).focus().select();
+    setTimeout(function () {
+      $popup.find(':text, textarea').eq(0).focus().select();
     }, 100);
 
   }
 
   // sourceMode - returns true if the textarea is showing
   function sourceMode(editor) {
-    return editor.$area.is(":visible");
+    return editor.$area.is(':visible');
   }
 
   // updateFrame - updates the iframe with the textarea contents
   function updateFrame(editor, checkForChange) {
     
-    var code = editor.$area.val(),
-      options = editor.options,
-      updateFrameCallback = options.updateFrame,
+    var code = editor.$area.val(), 
+      options = editor.options, 
+      updateFrameCallback = options.updateFrame, 
       $body = $(editor.doc.body);
 
     // Check for textarea change to avoid unnecessary firing
     // of potentially heavy updateFrame callbacks.
     if (updateFrameCallback) {
       var sum = checksum(code);
-      if (checkForChange && editor.areaChecksum == sum)
+      if (checkForChange && editor.areaChecksum === sum) {
         return;
+      }
       editor.areaChecksum = sum;
     }
 
@@ -1088,14 +1123,15 @@
     var html = updateFrameCallback ? updateFrameCallback(code) : code;
 
     // Prevent script injection attacks by html encoding script tags
-    html = html.replace(/<(?=\/?script)/ig, "&lt;");
+    html = html.replace(/<(?=\/?script)/ig, '&lt;');
 
     // Update the iframe checksum
-    if (options.updateTextArea)
+    if (options.updateTextArea) {
       editor.frameChecksum = checksum(html);
+    }
 
     // Update the iframe and trigger the change event
-    if (html != $body.html()) {
+    if (html !== $body.html()) {
       $body.html(html);
       $(editor).triggerHandler(CHANGE);
     }
@@ -1105,17 +1141,18 @@
   // updateTextArea - updates the textarea with the iframe contents
   function updateTextArea(editor, checkForChange) {
 
-    var html = $(editor.doc.body).html(),
-      options = editor.options,
-      updateTextAreaCallback = options.updateTextArea,
+    var html = $(editor.doc.body).html(), 
+      options = editor.options, 
+      updateTextAreaCallback = options.updateTextArea, 
       $area = editor.$area;
 
     // Check for iframe change to avoid unnecessary firing
     // of potentially heavy updateTextArea callbacks.
     if (updateTextAreaCallback) {
       var sum = checksum(html);
-      if (checkForChange && editor.frameChecksum == sum)
+      if (checkForChange && editor.frameChecksum === sum) {
         return;
+      }
       editor.frameChecksum = sum;
     }
 
@@ -1123,11 +1160,12 @@
     var code = updateTextAreaCallback ? updateTextAreaCallback(html) : html;
 
     // Update the textarea checksum
-    if (options.updateFrame)
+    if (options.updateFrame) {
       editor.areaChecksum = checksum(code);
+    }
 
     // Update the textarea and trigger the change event
-    if (code != $area.val()) {
+    if (code !== $area.val()) {
       $area.val(code);
       $(editor).triggerHandler(CHANGE);
     }

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2012-12-21 14:02:36 +0000
+++ addons/web/static/src/js/view_form.js	2012-12-21 17:26:22 +0000
@@ -2624,7 +2624,7 @@
             this.$textarea = this.$el.find('textarea');
             var width = ((this.node.attrs || {}).editor_width || '100%');
             var height = ((this.node.attrs || {}).editor_height || 250);
-            this.$textarea.cleditor({
+            this.$cleditor = this.$textarea.cleditor({
                 width:      width, // width not including margins, borders or padding
                 height:     height, // height not including margins, borders or padding
                 controls:   // controls to add to the toolbar
@@ -2634,10 +2634,9 @@
                 bodyStyle:  // style to assign to document body contained within the editor
                             "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
             });
-            this.$cleditor = this.$textarea.cleditor()[0];
-            this.$cleditor.change(function() {
+            this.$cleditor.on('change', function() {
                 if (! self._updating_editor) {
-                    self.$cleditor.updateTextArea();
+                    self.$cleditor[0].updateTextArea();
                     self.internal_set_value(self.$textarea.val());
                 }
             });
@@ -2647,7 +2646,7 @@
         if (! this.get("effective_readonly")) {
             this.$textarea.val(this.get('value') || '');
             this._updating_editor = true;
-            this.$cleditor.updateFrame();
+            this.$cleditor[0].updateFrame();
             this._updating_editor = false;
         } else {
             this.$el.html(this.get('value'));