summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2009-01-20 21:26:55 (GMT)
committer sun2009-01-20 21:26:55 (GMT)
commit17473a9a3007bab3f397d7eb741807853eab2b89 (patch)
tree5c787363ef9c2000d59385f5a994d250cc30e94f
parent37c7b8eb2caab39def7c6121eeb5e558cb266e33 (diff)
#361289 by sun: Fixed CSS files do not need to use media 'screen'.
-rw-r--r--CHANGELOG.txt3
-rw-r--r--wysiwyg.module2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b301e20..e2f0d3f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,8 +4,9 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
---------------------------
-Wysiwyg 6.x-x.x, xxxx-xx-xx
+Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#361289 by sun: Fixed CSS files do not need to use media 'screen'.
#360696 by sun: Fixed IE does not trigger onChange event when selecting an input
format.
#342376 by sun: Extended API to allow "preprocess" JavaScript option for some
diff --git a/wysiwyg.module b/wysiwyg.module
index 2ddc9fb..1296b6c 100644
--- a/wysiwyg.module
+++ b/wysiwyg.module
@@ -245,7 +245,7 @@ function wysiwyg_load_editor($profile) {
$files = $editor['css files'];
}
foreach ($files as $file) {
- drupal_add_css($editor['css path'] . '/' . $file, 'module', 'screen');
+ drupal_add_css($editor['css path'] . '/' . $file);
}
drupal_add_js(array('wysiwyg' => array(