Diacritic Plugin for Annotator Tool: Pull-request Fixes

Making sure extension comes after annotator css

lms/envs/common.py

@@ -871,8 +871,8 @@ PIPELINE_CSS = {
             'css/vendor/jquery.qtip.min.css',
             'css/vendor/responsive-carousel/responsive-carousel.css',
             'css/vendor/responsive-carousel/responsive-carousel.slide.css',
-            'css/vendor/ova/edx-annotator.css',
             'css/vendor/ova/annotator.css',
+            'css/vendor/ova/edx-annotator.css',
             'css/vendor/ova/video-js.min.css',
             'css/vendor/ova/rangeslider.css',
             'css/vendor/ova/share-annotator.css',

lms/templates/textannotation.html

@@ -148,6 +148,9 @@ ${static.css(group='style-vendor-tinymce-skin', raw=True)}
             highlightTags:{
                 tag: "${tag}",
             },
+            diacriticMarks:{
+                diacritics: "${diacritic_marks}"
+            }
         },
         optionsVideoJS: {techOrder: ["html5","flash","youtube"]},
         optionsRS: {},