Merge pull request #610 from edx/christina/popup-css

Workaround for popup CSS path being wrong (tinymce).

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

@@ -28,6 +28,9 @@ class @HTMLEditingDescriptor
       convert_urls : false,
       # TODO: we should share this CSS with studio (and LMS)
       content_css : "/static/css/tiny-mce.css",
+      # The default popup_css path uses an absolute path referencing page in which tinyMCE is being hosted.
+      # Supply the correct relative path instead.
+      popup_css: '/static/js/vendor/tiny_mce/themes/advanced/skins/default/dialog.css',
       formats : {
         # Disable h4, h5, and h6 styles as we don't have CSS for them.
         h4: {},