Comment-only update to prepare to extend slightly to include default set from 1.1.15 as we probably want to use codemirror over markitup for HTML edits as well.

Author: jonasbardino

mig/shared/editing.py

@@ -96,13 +96,21 @@
 <!-- MarkItUp style -->
 <link rel="stylesheet" type="text/css" href="/images/lib/markitup/markitup/skins/markitup/style.css"/>
 <!--
+<link rel="stylesheet" type="text/css" href="/images/lib/markitup/markitup/sets/default/style.css" title="txt2tags"/>
 <link rel="stylesheet" type="text/css" href="/images/lib/markitup/markitup/sets/txt2tags/style.css" title="txt2tags"/>
 -->
 <link rel="stylesheet" type="text/css" href="/images/lib/markitup/markitup/sets/html/style.css" title="html"/>
 '''
 miu_javascript = '''
 <!-- MarkItUp scripts -->
 <script type="text/javascript" src="/images/lib/markitup/markitup/jquery.markitup.js"></script>
+<!--
+<script type="text/javascript" src="/images/lib/markitup/markitup/sets/default/set.js"></script>
+<script type="text/javascript">
+var myDefaultSettings = mySettings;
+myDefaultSettings["nameSpace"] = "default";
+</script>
+-->
 <script type="text/javascript" src="/images/lib/markitup/markitup/sets/html/set.js"></script>
 <script type="text/javascript">
 var myHtmlSettings = mySettings;
@@ -112,7 +120,7 @@
 <script type="text/javascript" src="/images/lib/markitup/markitup/sets/txt2tags/set.js"></script>
 <script type="text/javascript">
 var myTxt2TagsSettings = mySettings;
-myTxt2TagsSettings["nameSpace"] = "markitup-txt2tags";
+myTxt2TagsSettings["nameSpace"] = "txt2tags";
 </script>
 -->
 '''

mig/shared/functionality/editor.py

@@ -222,6 +222,7 @@ def advanced_editor_js_deps():
             $("#editorarea").markItUpRemove();
             /* stylesheet button settings collide for different sets
             disable all set stylesheets and enable only selected one */
+            //disableStyleSheet("default");
             disableStyleSheet("html");
             //disableStyleSheet("txt2tags");
         } else if (lastEdit == "CodeMirror") {
@@ -234,6 +235,13 @@ def advanced_editor_js_deps():
     function enable_editorarea_editor(newSet) {
         lastEdit = "raw";
         switch(newSet) {
+            /*
+            case "default":
+                lastEdit = "MarkItUp";
+                enableStyleSheet("default");
+                $("#editorarea").markItUp(myDefaultSettings);
+                break;
+            */
             case "html":
                 lastEdit = "MarkItUp";
                 enableStyleSheet("html");
@@ -390,6 +398,7 @@ def edit_file(configuration, client_id, path, abs_path, output_format='html',
     if 'switcher' in includes:
         html += '''
 <ul id="switcher">
+<!--<li class="default"><a href="#">Text Editor</a></li>-->
 <li class="html currentSet"><a href="#">HTML/Text Editor</a></li>
 <li class="codemirror"><a href="#">Code Editor</a></li>
 <!-- <li class="txt2tags"><a href="#">Txt2Tags Editor</a></li> -->