jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '6808e3bb35'

Browse source 
Conflicts:
	.gitmodules
	Makefile.dryice.js
	demo/demo.js
	demo/kitchen-sink/boot.js
	kitchen-sink.html
	lib/ace/commands/default_commands.js
	lib/ace/test/tests.html
	package.json
	support/pilot
This commit is contained in:
Fabian Jakobs 2011-11-02 13:25:32 +01:00
commit 62a3b4edf5
18 changed files with 704 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kitchen-sink.html
View file

@ -188,21 +188,21 @@
<!-- DEVEL-->
<script type="text/javascript">
var require = {
baseUrl: "/" + window.location.pathname.split("/").slice(0, -1).join("/"),
paths: {
demo: "..",
ace: "../../lib/ace",
cockpit: "../../node_modules/cockpit/lib/cockpit",
pilot: "../../node_modules/pilot/lib/pilot"
ace: "lib/ace",
pilot: "node_modules/pilot/lib/pilot"
}
};
</script>
<script src="demo/kitchen-sink/require.js" data-main="demo/kitchen-sink/boot" type="text/javascript" charset="utf-8"></script>
<script src="demo/kitchen-sink/require.js" data-main="demo/kitchen-sink/demo" type="text/javascript"></script>
<!--DEVEL -->
<!--PACKAGE
<script src="demo/kitchen-sink/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
require("demo/kitchen-sink/boot");
require("demo/kitchen-sink/demo");
</script>
<!--PACKAGE-->