[LON-CAPA-cvs] cvs: loncom /html/htmlarea htmlarea.js /interface lonhtmlcommon.pm

[albertel]

albertel		Thu Jul 27 18:27:22 2006 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
    /loncom/html/htmlarea	htmlarea.js 
  Log:
  - seems like its the CSS loading for the htmlarea in the js that is causing things to go weird in popup's with htmlarea loading on
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.145 loncom/interface/lonhtmlcommon.pm:1.146
--- loncom/interface/lonhtmlcommon.pm:1.145	Fri Jul 21 04:59:30 2006
+++ loncom/interface/lonhtmlcommon.pm	Thu Jul 27 18:27:08 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.145 2006/07/21 08:59:30 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.146 2006/07/27 22:27:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1094,6 +1094,7 @@
 _editor_lang='$lang';
 </script>
 <script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
+<link rel="stylesheet" type="text/css" href="/htmlarea/htmlarea.css" />
 ENDHEADERS
 }
 
Index: loncom/html/htmlarea/htmlarea.js
diff -u loncom/html/htmlarea/htmlarea.js:1.5 loncom/html/htmlarea/htmlarea.js:1.6
--- loncom/html/htmlarea/htmlarea.js:1.5	Thu Feb 17 03:59:45 2005
+++ loncom/html/htmlarea/htmlarea.js	Thu Jul 27 18:27:22 2006
@@ -9,7 +9,7 @@
 // Version 3.0 developed by Mihai Bazon.
 //   http://dynarch.com/mishoo
 //
-// $Id: htmlarea.js,v 1.5 2005/02/17 08:59:45 albertel Exp $
+// $Id: htmlarea.js,v 1.6 2006/07/27 22:27:22 albertel Exp $
 
 if (typeof _editor_url == "string") {
 	// Leave exactly one backslash at the end of _editor_url
@@ -922,7 +922,7 @@
 	url += style;
 	document.write("<style type='text/css'>@import url(" + url + ");</style>");
 };
-HTMLArea.loadStyle("htmlarea.css");
+//HTMLArea.loadStyle("htmlarea.css");
 
 /***************************************************
  *  Category: EDITOR UTILITIES