Skip to content

Commit c4ca46c

Browse files
kevinsawickikevinsawicki
committed
Merge pull request electron#130 from electron/use-requires-over-script-tags
Use requires over script tags
2 parents df785c3 + c714054 commit c4ca46c

File tree

11 files changed

+46
-30
lines changed

11 files changed

+46
-30
lines changed

‎assets/code-blocks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ var path = require('path')
33

44
var codeBlocks = document.querySelectorAll('code[data-path]')
55
Array.prototype.forEach.call(codeBlocks, function (code) {
6-
code.textContent = fs.readFileSync(path.join(__dirname, code.dataset.path))
6+
var codePath = code.dataset.path
7+
code.textContent = fs.readFileSync(path.join(__dirname, '..', codePath))
78
})

‎index.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,12 @@ <h5 class="nav-category">
9797
<script>
9898
require('electron').hideInternalModules();
9999
process.throwDeprecation = true;
100+
require('./assets/imports')
101+
require('./assets/ex-links')
102+
require('./assets/nav')
103+
require('./assets/demo-btns')
104+
require('./assets/code-blocks')
105+
hljs.initHighlightingOnLoad()
100106
</script>
101-
102-
<script src="assets/imports.js"></script>
103-
<script src="assets/ex-links.js"></script>
104-
<script src="assets/nav.js"></script>
105-
<script src="assets/demo-btns.js"></script>
106-
<script src="assets/code-blocks.js"></script>
107-
<script>hljs.initHighlightingOnLoad();</script>
108-
109107
</body>
110108
</html>

‎sections/communication/ipc.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ <h5>Invisible Window Page HTML</h5>
7575
</div>
7676
</div>
7777

78-
<script type="text/javascript" src="renderer-process/communication/sync-msg.js"></script>
79-
<script type="text/javascript" src="renderer-process/communication/async-msg.js"></script>
80-
<script type="text/javascript" src="renderer-process/communication/invisible-msg.js"></script>
78+
<script type="text/javascript">
79+
require('./renderer-process/communication/sync-msg')
80+
require('./renderer-process/communication/async-msg')
81+
require('./renderer-process/communication/invisible-msg')
82+
</script>
8183

8284
</section>
8385
</template>

‎sections/menus/menus.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ <h5>Renderer Process</h5>
5959
</div>
6060
</div>
6161

62-
<script type="text/javascript" src="renderer-process/menus/context-menu.js"></script>
62+
<script type="text/javascript">
63+
require('./renderer-process/menus/context-menu')
64+
</script>
6365

6466
</section>
6567
</template>

‎sections/native-ui/dialogs.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,12 @@ <h5>Main Process</h5>
107107
</div>
108108
</div>
109109

110-
<script type="text/javascript" src="renderer-process/native-ui/dialogs/open-file.js"></script>
111-
<script type="text/javascript" src="renderer-process/native-ui/dialogs/error.js"></script>
112-
<script type="text/javascript" src="renderer-process/native-ui/dialogs/information.js"></script>
113-
<script type="text/javascript" src="renderer-process/native-ui/dialogs/save.js"></script>
110+
<script type="text/javascript">
111+
require('./renderer-process/native-ui/dialogs/open-file')
112+
require('./renderer-process/native-ui/dialogs/error')
113+
require('./renderer-process/native-ui/dialogs/information')
114+
require('./renderer-process/native-ui/dialogs/save')
115+
</script>
114116

115117
</section>
116118
</template>

‎sections/native-ui/ex-links-file-manager.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ <h5>Renderer Process</h5>
5555
</div>
5656
</div>
5757

58-
<script type="text/javascript" src="renderer-process/native-ui/ex-links-file-manager/file-manager.js"></script>
59-
<script type="text/javascript" src="renderer-process/native-ui/ex-links-file-manager/ex-links.js"></script>
58+
<script type="text/javascript">
59+
require('./renderer-process/native-ui/ex-links-file-manager/file-manager')
60+
require('./renderer-process/native-ui/ex-links-file-manager/ex-links')
61+
</script>
6062

6163
</section>
6264
</template>

‎sections/native-ui/tray.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ <h2>ProTip</h2>
4040
</div>
4141
</div>
4242

43-
<script type="text/javascript" src="renderer-process/native-ui/tray/tray.js"></script>
43+
<script type="text/javascript">
44+
require('./renderer-process/native-ui/tray/tray')
45+
</script>
4446

4547
</section>
4648
</template>

‎sections/printing/pdf.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ <h2>ProTip</h2>
3939
</div>
4040
</div>
4141

42-
<script type="text/javascript" src="renderer-process/printing/pdf.js"></script>
42+
<script type="text/javascript">
43+
require('./renderer-process/printing/pdf')
44+
</script>
4345

4446
</section>
4547
</tempalte>

‎sections/system/app-sys-information.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ <h5>Renderer Process</h5>
8181
</div>
8282
</div>
8383

84-
<script type="text/javascript" src="renderer-process/system/app-information.js"></script>
85-
<script type="text/javascript" src="renderer-process/system/sys-information.js"></script>
86-
<script type="text/javascript" src="renderer-process/system/screen-information.js"></script>
84+
<script type="text/javascript">
85+
require('./renderer-process/system/app-information')
86+
require('./renderer-process/system/sys-information')
87+
require('./renderer-process/system/screen-information')
88+
</script>
8789

8890
</section>
8991
</template>

‎sections/system/clipboard.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ <h5>Renderer Process</h5>
4848
</div>
4949
</div>
5050

51-
<script type="text/javascript" src="renderer-process/system/copy.js"></script>
52-
<script type="text/javascript" src="renderer-process/system/paste.js"></script>
51+
<script type="text/javascript">
52+
require('./renderer-process/system/copy')
53+
require('./renderer-process/system/paste')
54+
</script>
5355

5456
</section>
5557
</tempalte>

‎sections/windows/windows.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,11 @@ <h5>Renderer Process</h5>
9494
</div>
9595
</div>
9696

97-
98-
<script type="text/javascript" src="renderer-process/windows/create-window.js"></script>
99-
<script type="text/javascript" src="renderer-process/windows/manage-window.js"></script>
100-
<script type="text/javascript" src="renderer-process/windows/frameless-window.js"></script>
97+
<script type="text/javascript">
98+
require('./renderer-process/windows/create-window')
99+
require('./renderer-process/windows/manage-window')
100+
require('./renderer-process/windows/frameless-window')
101+
</script>
101102

102103
</section>
103104
</template>

0 commit comments

Comments
 (0)