MDL-19516 dragmath embedding improvements by Mauno Korpelainen

diff --git a/lib/editor/tinymce/plugins/dragmath/dragmath.php b/lib/editor/tinymce/plugins/dragmath/dragmath.php
index 9a1b2cf27e6e112475a2dc021371aba180e01994..017f7d17c1120ecf58eb407728147c9d7a19d71c 100644 (file)
--- a/lib/editor/tinymce/plugins/dragmath/dragmath.php
+++ b/lib/editor/tinymce/plugins/dragmath/dragmath.php
@@ -46,7 +46,7 @@ if (!file_exists("$CFG->dirroot/lib/dragmath/applet/lang/$lang.xml")) {
        width="540" height="300"
 >
        <param name="language" value="<?php echo $lang; ?>" />
-       <param name="outputFormat" value="Latex" />
+       <param name="outputFormat" value="MoodleTex" />
        <param name="showOutputToolBar" value="false" />
     <?php print_string('dragmath:dragmath_javaneeded', 'editor_tinymce', '<a href="http://www.java.com">Java.com</a>')?>
 </applet>

diff --git a/lib/editor/tinymce/plugins/dragmath/js/dragmath.js b/lib/editor/tinymce/plugins/dragmath/js/dragmath.js
index c9c24f601c7ab32a7930244f81996d794a35cc7d..53760b826fd2b6323b1f01fb04475e8fae34b3b9 100644 (file)
--- a/lib/editor/tinymce/plugins/dragmath/js/dragmath.js
+++ b/lib/editor/tinymce/plugins/dragmath/js/dragmath.js
@@ -1,34 +1,21 @@
 tinyMCEPopup.requireLangPack();
 
 var DragMathDialog = {
-               init : function(ed) {
-               
-               },
-               
-       
+    init : function(ed) {
+    },
 
-       insert : function(file, title) {
-               
-           var ed = tinyMCEPopup.editor;
-               var mathExpression = document.dragmath.getMathExpression();
-           //
-           // TBD any massaging needed here?
-           //
-           var text = mathExpression;
-           // convert < and > to entities
-           text = text.replace('<', '&lt;');
-           text = text.replace('>', '&gt;');
-           //
-           // Escape the expression
-           //
-           text = '$$' + text + '$$';
-           ed.execCommand('mceInsertContent', false, text);
+    insert : function(file, title) {
+        var ed = tinyMCEPopup.editor;
+        var tex = document.dragmath.getMathExpression();
 
-               tinyMCEPopup.close();
-       }
+        // convert < and > to entities
+        tex = tex.replace('<', '&lt;');
+        tex = tex.replace('>', '&gt;');
 
-       
-       
+        ed.execCommand('mceInsertContent', false, tex);
+
+        tinyMCEPopup.close();
+    }
 };
 
 tinyMCEPopup.onInit.add(DragMathDialog.init, DragMathDialog);