--- loncom/xml/scripttag.pm	2014/08/03 14:20:43	1.171
+++ loncom/xml/scripttag.pm	2015/01/19 15:36:16	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.171 2014/08/03 14:20:43 raeburn Exp $
+# $Id: scripttag.pm,v 1.173 2015/01/19 15:36:16 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,9 +118,43 @@ sub start_script {
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
-	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-	$result=&Apache::edit::tag_start($target,$token,'Script');
-	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+    	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+    	$result=&Apache::edit::tag_start($target,$token,'Script');
+
+        my $depth = $Apache::lonxml::curdepth;
+        $result.='<span id="LC_edit_problem_codemirror">';
+        unless ($env{'environment.nocodemirror'}) {
+            # only show button if codemirror activated
+            $result.='<input type="button" id="fitsize'.$depth.'" value="'.&mt("Dynamic size").
+            '" onclick="autosize(\''.$depth.'\')" />';
+        }
+        $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4).'</span>';
+
+        unless ($env{'environment.nocodemirror'}) {
+            $result.='<script type="text/javascript">
+                var cm'.$depth.' = CodeMirror.fromTextArea(document.getElementById("homework_edit_'.$depth.'"),
+                {
+                    mode: "perl",
+                    lineWrapping: true,
+                    lineNumbers: true,
+                    tabSize: 4,
+                    indentUnit: 4,
+                    autoCloseBrackets: true,
+                    styleActiveLine: true,
+                    
+                    extraKeys: {
+                        "Tab": "indentMore",
+                        "Shift-Tab": "indentLess"
+                    }
+                });
+                if(sessionStorage.getItem("autosized_'.$depth.'") != null) {
+                    document.getElementById("fitsize'.$depth.'").value = "'.&mt("Fixed size").'";
+                    cm'.$depth.'.setSize("","auto");
+                }
+            </script>';
+        }
+                
+
     } elsif ($target eq 'meta') {
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }
@@ -141,7 +175,7 @@ sub start_script {
                   }
               }
           } elsif (($type eq 'text/javascript') && ($bodytext ne '')) {
-              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
+              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {
                   if ($bodytext =~ m{\.addMediaSrc\((["'])((?!\1).)+\1\);}) {
                       my $quote = $1;
                       if ($bodytext =~ m{\Q.addMediaSrc($quote\E([^$quote]+)\Q$quote)\E}) {