Skip to content

Commit 24dbe75

Browse files
jrburkejrburke
committed
Create an IE-specific style sheet, and use it to hide some things that do not work out well in IE.
1 parent d93e11b commit 24dbe75

16 files changed

Lines changed: 133 additions & 121 deletions

‎dist/dist-site.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ load("../build/jslib/fileUtil.js");
2727
var files, i, htmlFile, transFile, fileContents,
2828
runtime = Packages.java.lang.Runtime.getRuntime(),
2929
process, preContents, postContents, h1, homePath, cssPath,
30-
jsPath, length, j, isTopPage = false;
30+
ieCssPath, jsPath, length, j, isTopPage = false;
3131

3232
//Copy all the text files to a dist directory
3333
//fileUtil.deleteFile("./dist-site/");
3434
fileUtil.copyFile("main.css", "./dist-site/main.css");
35+
fileUtil.copyFile("ie.css", "./dist-site/ie.css");
3536
fileUtil.copyFile("init.js", "./dist-site/init.js");
3637
fileUtil.copyDir("i/", "./dist-site/i/", /\w/);
3738
fileUtil.copyDir("fonts", "./dist-site/fonts", /\w/);
@@ -76,6 +77,7 @@ for (i = 0; (htmlFile = files[i]); i++) {
7677
isTopPage = true;
7778
homePath = "./";
7879
cssPath = "main.css";
80+
ieCssPath = "ie.css";
7981
jsPath = "init.js";
8082
} else {
8183
isTopPage = false;
@@ -85,10 +87,12 @@ for (i = 0; (htmlFile = files[i]); i++) {
8587
homePath += "../";
8688
}
8789
cssPath = homePath + "main.css";
90+
ieCssPath = homePath + "ie.css";
8891
jsPath = homePath + "init.js";
8992
}
9093
fileContents = fileContents.replace(/HOMEPATH/, homePath);
9194
fileContents = fileContents.replace(/\main\.css/, cssPath);
95+
fileContents = fileContents.replace(/\ie\.css/, ieCssPath);
9296
fileContents = fileContents.replace(/\init\.js/, jsPath);
9397

9498

‎dist/ie.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
body .sect {
3+
display: none;
4+
}
5+
6+
7+
#content ul.index {
8+
list-style: none;
9+
}

‎dist/pre.html‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<title>RequireJS</title>
55
<link rel="stylesheet" type="text/css" href="main.css">
6+
<!--[if IE]> <link rel="stylesheet" type="text/css" href="ie.css" /> <![endif]-->
67
<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.4/dojox/highlight/resources/highlight.css">
78
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
89
<script type="text/javascript" src="init.js"></script>
@@ -30,17 +31,17 @@
3031

3132
<div id="navBg"></div>
3233
<div id="nav" class="mono">
33-
34+
3435
<h1>a javascript module loader</h1>
35-
36+
3637
<ul>
3738
<li class="hbox">
3839
<a href="./">Home</a>
3940
<span class="spacer boxFlex"></span>
4041
<span class="icon home"></span>
4142
</li>
4243
</ul>
43-
44+
4445
<ul>
4546
<li class="hbox">
4647
<a class="local" href="start.html">Start</a>
@@ -63,7 +64,7 @@ <h1>a javascript module loader</h1>
6364
<span class="icon optimize"></span>
6465
</li>
6566
</ul>
66-
67+
6768
<ul>
6869
<li class="hbox">
6970
<a class="local" href="jquery.html">Use with jQuery</a>
@@ -81,20 +82,20 @@ <h1>a javascript module loader</h1>
8182
<span class="icon script"></span>
8283
</li>
8384
</ul>
84-
85+
8586
<ul>
8687
<li class="hbox">
8788
<a class="local" href="faq.html">FAQs</a>
8889
<span class="spacer boxFlex"></span>
8990
<span class="icon question"></span>
9091
</li>
9192
</ul>
92-
93+
9394
<ul>
9495
<li class="hbox">
9596
<a class="local" href="why.html">Why</a>
9697
<span class="spacer boxFlex"></span>
97-
<span class="icon question"></span>
98+
<span class="icon question"></span>
9899
</li>
99100
<li class="hbox">
100101
<a class="local" href="requirements.html">Requirements</a>
@@ -107,7 +108,7 @@ <h1>a javascript module loader</h1>
107108
<span class="icon history"></span>
108109
</li>
109110
</ul>
110-
111+
111112
<ul>
112113
<li class="hbox">
113114
<a href="http://groups.google.com/group/requirejs">Get Help</a>
@@ -122,26 +123,26 @@ <h1>a javascript module loader</h1>
122123
<li class="hbox">
123124
<a href="http://twitter.com/jrburke">Twitter</a>
124125
<span class="spacer boxFlex"></span>
125-
<span class="icon twitter"></span>
126+
<span class="icon twitter"></span>
126127
</li>
127128
</ul>
128-
129+
129130
<ul>
130131
<li class="hbox">
131132
<a href="http://github.com/jrburke/requirejs">GitHub</a>
132133
<span class="spacer boxFlex"></span>
133-
<span class="icon git"></span>
134+
<span class="icon git"></span>
134135
</li>
135136
<li class="hbox">
136137
<a class="local" href="contributing.html">Contributing</a>
137138
<span class="spacer boxFlex"></span>
138-
<span class="icon fork"></span>
139+
<span class="icon fork"></span>
139140
</li>
140141
</ul>
141-
142+
142143
<ul>
143144
<li class="version">0.15.0 Docs</li>
144145
</ul>
145146
</div>
146-
147+
147148
<div id="content">

‎docs/api.html‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22
<h1>RequireJS API</h1>
33

44
<ul class="index mono">
5-
<li class="hbox"><a href="#usage">Usage</a><span class="spacer boxFlex"></span><span>&sect;&sect; 1-1.7</span></li>
5+
<li class="hbox"><a href="#usage">Usage</a><span class="spacer boxFlex"></span><span class="sect">&sect;&sect; 1-1.7</span></li>
66
<ul>
7-
<li class="hbox"><a href="#jsfiles">Loading JavaScript Files</a><span class="spacer boxFlex"></span><span>&sect; 1.1</span></li>
8-
<li class="hbox"><a href="#define">Defining a Module</a><span class="spacer boxFlex"></span><span>&sect; 1.2</span></li>
7+
<li class="hbox"><a href="#jsfiles">Loading JavaScript Files</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.1</span></li>
8+
<li class="hbox"><a href="#define">Defining a Module</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2</span></li>
99
<ul>
10-
<li class="hbox"><a href="#defsimple">Simple Name/Value Pairs</a><span class="spacer boxFlex"></span><span>&sect; 1.2.1</span></li>
11-
<li class="hbox"><a href="#deffunc">Definition Functions</a><span class="spacer boxFlex"></span><span>&sect; 1.2.2</span></li>
12-
<li class="hbox"><a href="#defdep">Definition Functions with Dependencies</a><span class="spacer boxFlex"></span><span>&sect; 1.2.3</span></li>
13-
<li class="hbox"><a href="#funcmodule">Defining a Module as a Function</a><span class="spacer boxFlex"></span><span>&sect; 1.2.4</span></li>
14-
<li class="hbox"><a href="#modulename">Defining a Module with a name</a><span class="spacer boxFlex"></span><span>&sect; 1.2.5</span></li>
15-
<li class="hbox"><a href="#modulenotes">Other Module Notes</a><span class="spacer boxFlex"></span><span>&sect; 1.2.6</span></li>
16-
<li class="hbox"><a href="#circular">Circular Dependencies</a><span class="spacer boxFlex"></span><span>&sect; 1.2.7</span></li>
10+
<li class="hbox"><a href="#defsimple">Simple Name/Value Pairs</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.1</span></li>
11+
<li class="hbox"><a href="#deffunc">Definition Functions</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.2</span></li>
12+
<li class="hbox"><a href="#defdep">Definition Functions with Dependencies</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.3</span></li>
13+
<li class="hbox"><a href="#funcmodule">Defining a Module as a Function</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.4</span></li>
14+
<li class="hbox"><a href="#modulename">Defining a Module with a name</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.5</span></li>
15+
<li class="hbox"><a href="#modulenotes">Other Module Notes</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.6</span></li>
16+
<li class="hbox"><a href="#circular">Circular Dependencies</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.2.7</span></li>
1717
</ul>
18-
<li class="hbox"><a href="#i18n">Define an I18N Bundle</a><span class="spacer boxFlex"></span><span>&sect; 1.3</span></li>
19-
<li class="hbox"><a href="#text">Specify a Text File Dependency</a><span class="spacer boxFlex"></span><span>&sect; 1.4</span></li>
20-
<li class="hbox"><a href="#jsonp">Specify a JSONP Service Dependency</a><span class="spacer boxFlex"></span><span>&sect; 1.5</span></li>
21-
<li class="hbox"><a href="#order">Load Scripts in a Specific Order</a><span class="spacer boxFlex"></span><span>&sect; 1.6</span></li>
18+
<li class="hbox"><a href="#i18n">Define an I18N Bundle</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.3</span></li>
19+
<li class="hbox"><a href="#text">Specify a Text File Dependency</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.4</span></li>
20+
<li class="hbox"><a href="#jsonp">Specify a JSONP Service Dependency</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.5</span></li>
21+
<li class="hbox"><a href="#order">Load Scripts in a Specific Order</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1.6</span></li>
2222
</ul>
23-
<li class="hbox"><a href="#mechanics">Mechanics</a><span class="spacer boxFlex"></span><span>&sect; 2</span></li>
24-
<li class="hbox"><a href="#config">Configuration Options</a><span class="spacer boxFlex"></span><span>&sect; 3</span></li>
25-
<li class="hbox"><a href="#pageload">Page Load Event Support</a><span class="spacer boxFlex"></span><span>&sect; 4</span></li>
26-
<li class="hbox"><a href="#advanced">Advanced Usage</a><span class="spacer boxFlex"></span><span>&sect;&sect; 5-5.6</span></li>
23+
<li class="hbox"><a href="#mechanics">Mechanics</a><span class="spacer boxFlex"></span><span class="sect">&sect; 2</span></li>
24+
<li class="hbox"><a href="#config">Configuration Options</a><span class="spacer boxFlex"></span><span class="sect">&sect; 3</span></li>
25+
<li class="hbox"><a href="#pageload">Page Load Event Support</a><span class="spacer boxFlex"></span><span class="sect">&sect; 4</span></li>
26+
<li class="hbox"><a href="#advanced">Advanced Usage</a><span class="spacer boxFlex"></span><span class="sect">&sect;&sect; 5-5.6</span></li>
2727
<ul>
28-
<li class="hbox"><a href="#packages">Loading Modules from Packages</a><span class="spacer boxFlex"></span><span>&sect; 5.1</span></li>
29-
<li class="hbox"><a href="#multiversion">Multiversion Support</a><span class="spacer boxFlex"></span><span>&sect; 5.2</span></li>
30-
<li class="hbox"><a href="#afterload">Loading Code After Page Load</a><span class="spacer boxFlex"></span><span>&sect; 5.3</span></li>
31-
<li class="hbox"><a href="#modifiers">Module Modifiers</a><span class="spacer boxFlex"></span><span>&sect; 5.4</span></li>
28+
<li class="hbox"><a href="#packages">Loading Modules from Packages</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.1</span></li>
29+
<li class="hbox"><a href="#multiversion">Multiversion Support</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.2</span></li>
30+
<li class="hbox"><a href="#afterload">Loading Code After Page Load</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.3</span></li>
31+
<li class="hbox"><a href="#modifiers">Module Modifiers</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.4</span></li>
3232
<ul>
33-
<li class="hbox"><a href="#modregister">Modifier Registration</a><span class="spacer boxFlex"></span><span>&sect; 5.4.1</span></li>
34-
<li class="hbox"><a href="#moddef">Modifier Definition</a><span class="spacer boxFlex"></span><span>&sect; 5.4.2</span></li>
33+
<li class="hbox"><a href="#modregister">Modifier Registration</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.4.1</span></li>
34+
<li class="hbox"><a href="#moddef">Modifier Definition</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.4.2</span></li>
3535
</ul>
36-
<li class="hbox"><a href="#webworker">Web Worker Support</a><span class="spacer boxFlex"></span><span>&sect; 5.5</span></li>
37-
<li class="hbox"><a href="#rhino">Rhino Support</a><span class="spacer boxFlex"></span><span>&sect; 5.6</span></li>
36+
<li class="hbox"><a href="#webworker">Web Worker Support</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.5</span></li>
37+
<li class="hbox"><a href="#rhino">Rhino Support</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5.6</span></li>
3838
</ul>
3939
</ul>
4040
</div>
@@ -380,7 +380,7 @@ <h3><a name="text">Specify a Text File Dependency</a><span class="sectionMark">&
380380
<pre><code>require(["some/module", "text!some/module.html", "text!some/module.css"],
381381
function(module, html, css) {
382382
//the html variable will be the text of the some/module.html file
383-
//the css variable will be the text of the som/module.css file.
383+
//the css variable will be the text of the som/module.css file.
384384
}
385385
);
386386
</code></pre>
@@ -392,7 +392,7 @@ <h3><a name="text">Specify a Text File Dependency</a><span class="sectionMark">&
392392
<pre><code>require(["text!some/module.html!strip"],
393393
function(html) {
394394
//the html variable will be the text of the some/module.html file,
395-
//but only the part inside the body tag.
395+
//but only the part inside the body tag.
396396
}
397397
);
398398
</code></pre>

‎docs/commonjs.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<h1>CommonJS Notes</h1>
33

44
<ul class="index mono">
5-
<li class="hbox"><a href="#intro">Introduction</a><span class="spacer boxFlex"></span><span>&sect; 1</span></li>
6-
<li class="hbox"><a href="#manualconversion">Manual Conversion</a><span class="spacer boxFlex"></span><span>&sect; 2</span></li>
7-
<li class="hbox"><a href="#autoconversion">Conversion Tool</a><span class="spacer boxFlex"></span><span>&sect; 3</span></li>
8-
<li class="hbox"><a href="#exports">Setting Exported Value</a><span class="spacer boxFlex"></span><span>&sect; 4</span></li>
9-
<li class="hbox"><a href="#altsyntax">Alternative Syntax</a><span class="spacer boxFlex"></span><span>&sect; 5</span></li>
10-
<li class="hbox"><a href="packages">Loading Modules from CommonJS Packages</a><span class="spacer boxFlex"></span><span>&sect; 6</span></li>
11-
<li class="hbox"><a href="#optimize">Optimization Tool</a><span class="spacer boxFlex"></span><span>&sect; 7</span></li>
5+
<li class="hbox"><a href="#intro">Introduction</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1</span></li>
6+
<li class="hbox"><a href="#manualconversion">Manual Conversion</a><span class="spacer boxFlex"></span><span class="sect">&sect; 2</span></li>
7+
<li class="hbox"><a href="#autoconversion">Conversion Tool</a><span class="spacer boxFlex"></span><span class="sect">&sect; 3</span></li>
8+
<li class="hbox"><a href="#exports">Setting Exported Value</a><span class="spacer boxFlex"></span><span class="sect">&sect; 4</span></li>
9+
<li class="hbox"><a href="#altsyntax">Alternative Syntax</a><span class="spacer boxFlex"></span><span class="sect">&sect; 5</span></li>
10+
<li class="hbox"><a href="packages">Loading Modules from CommonJS Packages</a><span class="spacer boxFlex"></span><span class="sect">&sect; 6</span></li>
11+
<li class="hbox"><a href="#optimize">Optimization Tool</a><span class="spacer boxFlex"></span><span class="sect">&sect; 7</span></li>
1212
</ul>
1313

1414
</div>
@@ -28,7 +28,7 @@ <h2><a name="manualconversion">Manual Conversion</a><span class="sectionMark">&s
2828

2929
<p>If you just have a few modules to convert, then all you need to do is wrap the module in this code:</p>
3030

31-
<pre><code>define(function(require, exports, module) {
31+
<pre><code>define(function(require, exports, module) {
3232
//Put traditional CommonJS module content here
3333
});
3434
</code></pre>
@@ -88,4 +88,3 @@ <h2><a name="optimize">Optimization Tool</a><span class="sectionMark">&sect; 7</
8888

8989
<p>RequireJS has an optimization tool that can combine module definitions together into optimized bundles for browser delivery. It works as a command-line tool that you use as part of code deployment. See the <a href="optimization.html">optimization docs</a> for more information.</p>
9090
</div>
91-

‎docs/contributing.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<h1>Contributing to RequireJS</h1>
33

44
<ul class="index mono">
5-
<li class="hbox"><a href="#whycla">Why a CLA?</a><span class="spacer boxFlex"></span><span>&sect; 1</span></li>
6-
<li class="hbox"><a href="#codestyle">Code style</a><span class="spacer boxFlex"></span><span>&sect; 2</span></li>
5+
<li class="hbox"><a href="#whycla">Why a CLA?</a><span class="spacer boxFlex"></span><span class="sect">&sect; 1</span></li>
6+
<li class="hbox"><a href="#codestyle">Code style</a><span class="spacer boxFlex"></span><span class="sect">&sect; 2</span></li>
77
</ul>
88

99
<span class="note">Note: <a href="http://github.com/jrburke/requirejs">The source for RequireJS is available on GitHub</a></span>

0 commit comments

Comments
 (0)