Index: webapp/components/inlineEdit/inlineEditDependencies.json
===================================================================
--- webapp/components/inlineEdit/inlineEditDependencies.json	(revision 7630)
+++ webapp/components/inlineEdit/inlineEditDependencies.json	(working copy)
@@ -2,6 +2,6 @@
   	"name": "Inline Edit",
    	"description": "Allows a user to do quick edits to simple text directly on a web page. ",
     "cssFiles": "InlineEdit.css",
-	"files": ["InlineEdit.js", "jquery.tinymce.js", "InlineEditIntegrations.js"],
+	"files": ["InlineEdit.js", "InlineEditIntegrations.js"],
 	"dependencies": ["jQuery", "jQueryTooltipPlugin", "framework", "undo"]
 }}
Index: webapp/components/inlineEdit/js/jquery.tinymce.js
===================================================================
--- webapp/components/inlineEdit/js/jquery.tinymce.js	(revision 7630)
+++ webapp/components/inlineEdit/js/jquery.tinymce.js	(working copy)
@@ -1,35 +0,0 @@
-/*
-Copyright 2008-2009 University of Cambridge
-Copyright 2008-2009 University of Toronto
-Copyright 2007-2009 University of California, Berkeley
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*/
-// A super-simple jQuery TinyMCE plugin that actually works.
-// Written by Colin Clark
-
-/*global jQuery, tinyMCE*/
-
-(function ($) {
-    if (typeof(tinyMCE) !== "undefined") {
-        // Invoke this immediately to prime TinyMCE.
-        tinyMCE.init({
-            mode: "none",
-            theme: "simple"
-        });
-    }
-    
-    $.fn.tinymce = function () {
-        this.each(function () {
-            // Need code to generate an id for the tinymce control if one doesn't exist.            
-            tinyMCE.execCommand("mceAddControl", false, this.id);
-        });
-        
-        return this;
-    };
-})(jQuery);
Index: webapp/components/inlineEdit/js/InlineEditIntegrations.js
===================================================================
--- webapp/components/inlineEdit/js/InlineEditIntegrations.js	(revision 7630)
+++ webapp/components/inlineEdit/js/InlineEditIntegrations.js	(working copy)
@@ -23,7 +23,8 @@
 (function ($, fluid) {
 
     var configureInlineEdit = function (configurationName, container, options) {
-        var assembleOptions = $.extend({}, fluid.defaults(configurationName), options);
+    	var defaults = fluid.defaults(configurationName); 
+        var assembleOptions = fluid.merge(defaults? defaults.mergePolicy: null, {}, defaults, options);
         return fluid.inlineEdit(container, assembleOptions);
     };
 
@@ -36,7 +37,9 @@
      * @param {Object} options configuration options for the components
      */
     fluid.inlineEdit.tinyMCE = function (container, options) {
-        return configureInlineEdit("fluid.inlineEdit.tinyMCE", container, options);
+        var inlineEditor = configureInlineEdit("fluid.inlineEdit.tinyMCE", container, options);
+        tinyMCE.init(inlineEditor.options.tinyMCE);
+        return inlineEditor;
     };
         
     fluid.inlineEdit.tinyMCE.viewAccessor = function (editField) {
@@ -95,12 +98,9 @@
    
    
     fluid.inlineEdit.tinyMCE.editModeRenderer = function (that) {
-        var defaultOptions = {
-            mode: "exact", 
-            theme: "simple"
-        };
-        var options = $.extend(true, defaultOptions, that.options.tinyMCE);
-        options.elements = fluid.allocateSimpleId(that.editField); 
+        var options = that.options.tinyMCE;
+        options.elements = fluid.allocateSimpleId(that.editField);
         var oldinit = options.init_instance_callback;
         
         options.init_instance_callback = function (instance) {
@@ -115,6 +115,10 @@
     
       
     fluid.defaults("fluid.inlineEdit.tinyMCE", {
+        tinyMCE : {
+            mode: "exact", 
+            theme: "simple"
+        },
         useTooltip: true,
         selectors: {
             edit: "textarea" 
Index: webapp/standalone-demos/quick-start-examples/inlineEdit/html/InlineEdit.html
===================================================================
--- webapp/standalone-demos/quick-start-examples/inlineEdit/html/InlineEdit.html	(revision 7630)
+++ webapp/standalone-demos/quick-start-examples/inlineEdit/html/InlineEdit.html	(working copy)
@@ -22,7 +22,6 @@
         <script type="text/javascript" src="../../../../components/inlineEdit/js/InlineEditIntegrations.js"></script>
         <script type="text/javascript" src="../../../../components/undo/js/Undo.js"></script>
         
-        <script type="text/javascript" src="../../../../components/inlineEdit/js/jquery.tinymce.js"></script>
         <script type="text/javascript" src="../../../../tests/manual-tests/lib/fckeditor/fckeditor.js"></script>
         
         <script type="text/javascript" src="../js/InlineEdit-example.js"></script>