Fixed an issue with <link rel="stylesheet" type="totally/fake">. WebK…

…it loads it, other browsers do not. Added tests.
sorccu · Dec 24, 2010 · 317b706 · 317b706
1 parent e2d8239
commit 317b706
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 0 deletions.
diff --git a/js/cufon.js b/js/cufon.js
@@ -256,7 +256,13 @@ var Cufon = (function() {
 
 		var links = elementsByTagName('link'), styles = elementsByTagName('style');
 
+		var checkTypes = {
+			'': 1,
+			'text/css': 1
+		};
+
 		function isContainerReady(el) {
+			if (!checkTypes[el.type.toLowerCase()]) return true;
 			return el.disabled || isSheetReady(el.sheet, el.media || 'screen');
 		}
 

diff --git a/tests/cssready/index.html b/tests/cssready/index.html
@@ -183,6 +183,7 @@
 				'link-altstylesheet-simple-print/',
 				'link-stylesheet-simple-fake/',
 				'link-altstylesheet-simple-fake/',
+				'link-stylesheet-goodrelbadtype/',
 				'link-stylesheet-disabled/',
 				'link-stylesheet-slow/',
 				'link-stylesheet-slow-print/',
@@ -201,6 +202,7 @@
 				'style-simple/',
 				'style-simple-print/',
 				'style-simple-fake/',
+				'style-badtype/',
 				'style-import/',
 				'style-import-print/',
 				'style-import-fake/',

diff --git a/tests/cssready/link-stylesheet-goodrelbadtype/index.html b/tests/cssready/link-stylesheet-goodrelbadtype/index.html
@@ -0,0 +1,31 @@
+<!doctype html>
+
+<html>
+
+	<head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+		<link rel="stylesheet" type="totally/fake" href="style.css" media="all" />
+
+		<script src="../../../js/cufon.js" type="text/javascript"></script>
+
+		<script type="text/javascript">
+
+			(function(test) {
+
+				Cufon.CSS.ready(function() {
+					test.success();
+				});
+
+			})(parent.testRunner.registerTest('<link rel="stylesheet" type="totally/fake"> with a simple and short style sheet'));
+
+		</script>
+
+	</head>
+
+	<body>
+
+	</body>
+
+</html>
diff --git a/tests/cssready/link-stylesheet-goodrelbadtype/style.css b/tests/cssready/link-stylesheet-goodrelbadtype/style.css
@@ -0,0 +1,6 @@
+body {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	width: 100px;
+}
diff --git a/tests/cssready/style-badtype/index.html b/tests/cssready/style-badtype/index.html
@@ -0,0 +1,40 @@
+<!doctype html>
+
+<html>
+
+	<head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+		<style type="totally/fake">
+
+			body {
+				border: 0;
+				margin: 0;
+				padding: 0;
+				width: 100px;
+			}
+
+		</style>
+
+		<script src="../../../js/cufon.js" type="text/javascript"></script>
+
+		<script type="text/javascript">
+
+			(function(test) {
+
+				Cufon.CSS.ready(function() {
+					test.success();
+				});
+
+			})(parent.testRunner.registerTest('<style type="totally/fake"> with simple CSS'));
+
+		</script>
+
+	</head>
+
+	<body>
+
+	</body>
+
+</html>