[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londocs.pm

[raeburn]

raeburn		Sat Nov 26 19:40:45 2016 EDT

  Modified files:              
    /loncom/interface	londocs.pm loncommon.pm 
  Log:
  - Display resources with URLs containing single quotes in a modal window 
    in the Course Editor. 
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.615 loncom/interface/londocs.pm:1.616
--- loncom/interface/londocs.pm:1.615	Sat Nov 26 15:39:52 2016
+++ loncom/interface/londocs.pm	Sat Nov 26 19:40:44 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.615 2016/11/26 15:39:52 raeburn Exp $
+# $Id: londocs.pm,v 1.616 2016/11/26 19:40:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4154,8 +4154,8 @@
                $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
            }
        }
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
-                                             (($anchor ne '')?$anchor:''),
+       $line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
+                                             (($anchor ne '')?$anchor:'')),
                                              '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
@@ -4164,8 +4164,8 @@
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
-                                             (($anchor ne '')?$anchor:''),
+       $line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
+                                             (($anchor ne '')?$anchor:'')),
                                              $title,600,500);
     } elsif ($hiddenfolder) {
        $line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>';
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1265 loncom/interface/loncommon.pm:1.1266
--- loncom/interface/loncommon.pm:1.1265	Tue Nov 22 00:43:12 2016
+++ loncom/interface/loncommon.pm	Sat Nov 26 19:40:44 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1265 2016/11/22 00:43:12 raeburn Exp $
+# $Id: loncommon.pm,v 1.1266 2016/11/26 19:40:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8663,7 +8663,7 @@
 };
 	var openMyModal = function(source,width,height,scrolling,transparency,style)
 	{
-                source = source.replace("'","'");
+                source = source.replace(/'/g,"'");
 		modalWindow.windowId = "myModal";
 		modalWindow.width = width;
 		modalWindow.height = height;