Merge branch 'merge-staging' into staging

www/pad/inner.js

@@ -30,7 +30,7 @@ define([
     '/api/config',
     '/common/common-hash.js',
     '/common/common-util.js',
-    '/bower_components/chainpad-json-validator/json-ot.js',
+    '/bower_components/chainpad/chainpad.dist.js',
 
     '/bower_components/diff-dom/diffDOM.js',
 
@@ -50,7 +50,7 @@ define([
     ApiConfig,
     Hash,
     Util,
-    JsonOT)
+    ChainPad)
 {
     var DiffDom = window.diffDOM;
 
@@ -537,7 +537,7 @@ define([
             Framework.create({
                 toolbarContainer: '#cke_1_toolbox',
                 contentContainer: '#cke_1_contents',
-                transformFunction: JsonOT.validate,
+                patchTransformer: ChainPad.NaiveJSONTransformer,
                 thumbnail: {
                     getContainer: function () { return $('iframe').contents().find('html')[0]; },
                     filter: function (el, before) {

www/pad/wysiwygarea-plugin.js

@@ -487,16 +487,6 @@ define(['/api/config'], function (ApiConfig) {
 						CKEDITOR.tools.callFunction(fw._.frameLoadedHandler, _iframe.contentWindow);
                     }, 10);
                     return;
-
-					// Work around Firefox bug - error prune when called from XUL (http://dev.ckeditor.com/ticket/320),
-					// defer it thanks to the async nature of this method.
-					try {
-						doc.write( data );
-					} catch ( e ) {
-						setTimeout( function() {
-							doc.write( data );
-						}, 0 );
-					}
 				}
 			},
 
@@ -737,4 +727,4 @@ CKEDITOR.config.disableNativeSpellChecker = true;
  * @member CKEDITOR.editor
  * @param {CKEDITOR.editor} editor This editor instance.
  * @param {CKEDITOR.dom.element} data The element being added.
- */
+ */