Merge pull request #2762 from edx/zub/bugfix/std1336-switcheditors

properly set tinymce editor startContent

common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee

@@ -89,17 +89,15 @@ describe 'HTMLEditingDescriptor', ->
       @descriptor.showingVisualEditor = false
 
       visualEditorStub =
-        isNotDirty: false
         content: 'not set'
         startContent: 'not set',
         focus: () -> true
-        isDirty: () -> not @isNotDirty
+        isDirty: () -> false
         setContent: (x) -> @content = x
         getContent: -> @content
 
       @descriptor.showVisualEditor(visualEditorStub)
       expect(@descriptor.showingVisualEditor).toEqual(true)
-      expect(visualEditorStub.isDirty()).toEqual(false)
       expect(visualEditorStub.getContent()).toEqual('Advanced Editor Text')
       expect(visualEditorStub.startContent).toEqual('Advanced Editor Text')
     it 'When switching to visual editor links are rewritten to c4x format', ->
@@ -109,16 +107,14 @@ describe 'HTMLEditingDescriptor', ->
       @descriptor.showingVisualEditor = false
 
       visualEditorStub =
-        isNotDirty: false
         content: 'not set'
         startContent: 'not set',
         focus: () -> true
-        isDirty: () -> not @isNotDirty
+        isDirty: () -> false
         setContent: (x) -> @content = x
         getContent: -> @content
 
       @descriptor.showVisualEditor(visualEditorStub)
       expect(@descriptor.showingVisualEditor).toEqual(true)
-      expect(visualEditorStub.isDirty()).toEqual(false)
       expect(visualEditorStub.getContent()).toEqual('Advanced Editor Text with link /c4x/foo/bar/asset/dummy.jpg')
       expect(visualEditorStub.startContent).toEqual('Advanced Editor Text with link /c4x/foo/bar/asset/dummy.jpg')

common/lib/xmodule/xmodule/js/src/html/edit.coffee

@@ -123,7 +123,7 @@ class @HTMLEditingDescriptor
     # both the startContent must be sync'ed up and the dirty flag set to false.
     content = rewriteStaticLinks(@advanced_editor.getValue(), '/static/', @base_asset_url)
     visualEditor.setContent(content)
-    visualEditor.startContent = content
+    visualEditor.startContent = visualEditor.getContent({format : 'raw'})
     @focusVisualEditor(visualEditor)
     @showingVisualEditor = true
 
@@ -133,8 +133,6 @@ class @HTMLEditingDescriptor
 
   focusVisualEditor: (visualEditor) =>
     visualEditor.focus()
-    # Need to mark editor as not dirty both when it is initially created and when we switch back to it.
-    visualEditor.isNotDirty = true
     if not @$mceToolbar?
       @$mceToolbar = $(@element).find('table.mceToolbar')