Fixed bug that *.css path is not correct when #registerCSS is called from

jossonsmith · jossonsmith · commit d9864b4594ee · 2006-08-09T14:19:46.000Z
*.z.js (e.g Composite's css in Shell.z.js)
Now using document.createStyleSheet().cssText instead of former 
"javascript:..." way to insert CSS styles.
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js
@@ -762,14 +762,6 @@ Clazz.forName = function (clazzName) {
 Clazz.cssAlreadyAggregated = false;
 Clazz.cssForcedUsingFile = false;
 
-countxx = 0;
-/* private */
-Clazz.cssForIE = function (key) {
-	var value = window[key];
-	window[key] = true; // loaded and release css text 
-	return value;
-};
-
 /**
  * Register css for the given class. If the given css text is null, it will
  * try to find relative *.css file instead loading css text directly.
@@ -783,15 +775,17 @@ Clazz.registerCSS = function (clazzName, cssText) {
 	}
 	clazzName = ClazzLoader.unwrapArray ([clazzName])[0];
 	var cssPath = ClazzLoader.getClasspathFor (clazzName, false, ".css");
+	
 	var basePath = ClazzLoader.getClasspathFor (clazzName, true);
+	var cssID = "c$$." + clazzName;
 	/*
 	 * Check whether the css resources is loaded or not
 	 */
 	if (!ClazzLoader.isResourceExisted (clazzName, cssPath, basePath)) {
 		if (cssText == null || Clazz.cssForcedUsingFile) {
 			var cssLink = document.createElement ("LINK");
 			cssLink.rel = "stylesheet";
-			cssLink.id = clazzName;
+			cssLink.id = cssID;
 			cssLink.href = cssPath;
 			document.getElementsByTagName ("HEAD")[0].appendChild (cssLink);
 		} else {
@@ -834,20 +828,15 @@ Clazz.registerCSS = function (clazzName, cssText) {
 			if (document.createStyleSheet != null) {
 				/*
 				 * Internet Explorer does not support loading dynamic css styles
-				 * by <STYLE>!
-				 */
-				var cssID = "css." + clazzName;
-				window[cssID] = cssText;
-				/*
-				 * TODO: Keep eyes open on IE. Maybe IE won't initialize this 
-				 * javascript-kind of CSS!
-				 * FIXME: IE7 (or IE6 sp2) does not support this kind of 
-				 * CSS loading!
+				 * by creating <STYLE> element!
 				 */
-				document.createStyleSheet ("javascript:Clazz.cssForIE (\"" + cssID + "\");");
+				var sheet = document.createStyleSheet ();
+				sheet.cssText = cssText;
+				//sheet.id = cssID; // No ID support the this element for IE
+				window[cssID] = true;
 			} else {
 				var cssStyle = document.createElement ("STYLE");
-				cssStyle.id = clazzName;
+				cssStyle.id = cssID;
 				cssStyle.appendChild (document.createTextNode (cssText));
 				document.getElementsByTagName ("HEAD")[0].appendChild (cssStyle);
 			}
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js
@@ -395,6 +395,19 @@ ClazzLoader.getClasspathFor = function (clazz, forRoot, ext) {
 			var idx = path.lastIndexOf (clazz.replace (/\./g, "/"));
 			if (idx != -1) {
 				base = path.substring (0, idx);
+			} else {
+				/*
+				 * Check more: Maybe the same class' *.css is located
+				 * in the same folder.
+				 */
+				idx = clazz.lastIndexOf (".");
+				if (idx != -1) {
+					idx = path.lastIndexOf (clazz.substring (0, idx)
+							.replace (/\./g, "/"));
+					if (idx != -1) {
+						base = path.substring (0, idx);
+					}
+				}
 			}
 		}
 	} else {
