Permalink
Browse files

Removes Underscore submodule and adds Lo-Dash interoperability and fi…

…les.

Squashed commit of the following:

commit 35fd6db
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 22:17:32 2012 -0700

    Adds minified version of Underscore and Lo-Dash Edge.

commit b74ca9c
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 22:06:35 2012 -0700

    underscore.min.js -> _.min.js

commit 2da7dda
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 22:05:29 2012 -0700

    Switches lodash to Edge version.

commit a5e5c7b
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 21:56:47 2012 -0700

    Adds scripts for switching between Underscore and Lo-Dash.

commit cbb3aa0
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 21:51:57 2012 -0700

    dist/underscore.js -> dist/_.js

commit f3af5f0
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 21:43:22 2012 -0700

    Changes script tags in the tests to point to the _.js file.

commit 9e32284
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 21:38:42 2012 -0700

    Adds minified Underscore.

commit c3e492b
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 21:07:52 2012 -0700

    Adds _.js and lodash.js.

commit d754966
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 20:56:54 2012 -0700

    Adds Underscore 1.3.3.

commit 4d9b89d
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Wed Jun 13 20:51:55 2012 -0700

    Removes Underscore submodule.
  • Loading branch information...
1 parent c754d64 commit 57b5658f3746eff724b59288f0e07140859c8fa0 @jeremyckahn jeremyckahn committed Jun 14, 2012
Showing with 5,837 additions and 61 deletions.
  1. +0 −3 .gitmodules
  2. +1 −1 README.md
  3. +2 −2 build.sh
  4. +1 −1 demo/bargraph.html
  5. +1 −1 demo/bubbles.html
  6. +1 −1 demo/catimate.html
  7. +1 −1 demo/pie.html
  8. 0 dist/{underscore.js → _.js}
  9. +1 −1 docs/examples/actor.html
  10. +1 −1 docs/examples/actor_context.html
  11. +1 −1 docs/examples/actor_copy_properties.html
  12. +1 −1 docs/examples/actor_count.html
  13. +1 −1 docs/examples/actor_modify_keyframe.html
  14. +1 −1 docs/examples/actor_remove_all_keyframe_properties.html
  15. +1 −1 docs/examples/actor_remove_keyframe.html
  16. +1 −1 docs/examples/actor_wait.html
  17. +1 −1 docs/examples/add_actor.html
  18. +1 −1 docs/examples/animation_length.html
  19. +1 −1 docs/examples/bind.html
  20. +1 −1 docs/examples/draw.html
  21. +1 −1 docs/examples/export_timeline.html
  22. +1 −1 docs/examples/framerate.html
  23. +1 −1 docs/examples/get_actor.html
  24. +1 −1 docs/examples/get_actor_ids.html
  25. +1 −1 docs/examples/get_all_actors.html
  26. +1 −1 docs/examples/is_playing.html
  27. +1 −1 docs/examples/kapi.html
  28. +1 −1 docs/examples/last_position_updated.html
  29. +1 −1 docs/examples/move_actor_to_layer.html
  30. +1 −1 docs/examples/pause.html
  31. +1 −1 docs/examples/play.html
  32. +1 −1 docs/examples/play_from.html
  33. +1 −1 docs/examples/play_from_current.html
  34. +1 −1 docs/examples/redraw.html
  35. +1 −1 docs/examples/remove_actor.html
  36. +1 −1 docs/examples/set_order_function.html
  37. +1 −1 docs/examples/stop.html
  38. +1 −1 docs/examples/unbind.html
  39. +1 −1 docs/examples/unset_order_function.html
  40. +1 −1 docs/examples/update.html
  41. +1 −1 ext/to-css/sample/custom_id.html
  42. +1 −1 ext/to-css/sample/grid.html
  43. +1 −1 ext/to-css/sandbox.html
  44. +0 −1 lib/underscore
  45. +1,059 −0 lib/underscore/_.js
  46. +32 −0 lib/underscore/_.min.js
  47. +3,556 −0 lib/underscore/lodash.js
  48. +32 −0 lib/underscore/lodash.min.js
  49. +32 −0 lib/underscore/underscore-min.js
  50. +1,059 −0 lib/underscore/underscore.js
  51. +5 −0 lib/underscore/use_lodash.sh
  52. +5 −0 lib/underscore/use_underscore.sh
  53. +1 −1 tests/test.actor.html
  54. +1 −1 tests/test.amd.html
  55. +1 −1 tests/test.canvas.html
  56. +1 −1 tests/test.color.html
  57. +1 −1 tests/test.doesitlookright.html
  58. +1 −1 tests/test.dom_doesitlookright.html
  59. +1 −1 tests/test.easing.html
  60. +1 −1 tests/test.events.html
  61. +1 −1 tests/test.keyframe_props.html
  62. +1 −1 tests/test.loop.html
  63. +1 −1 tests/test.node.js
  64. +1 −1 tests/test.private.html
  65. +1 −1 tests/test.state.html
  66. +1 −1 tests/test.time.html
  67. +1 −1 tests/test.tween.html
View
@@ -1,6 +1,3 @@
[submodule "lib/shifty"]
path = lib/shifty
url = git@github.com:jeremyckahn/shifty.git
-[submodule "lib/underscore"]
- path = lib/underscore
- url = https://github.com/documentcloud/underscore.git
View
@@ -124,7 +124,7 @@ var r = require('lib/r.js');
r.config({
paths: {
shifty: "dist/shifty",
- underscore: "dist/underscore",
+ underscore: "dist/_",
rekapi: "dist/rekapi"
}
});
View
@@ -56,11 +56,11 @@ else
fi
cat /tmp/rekapi.header.js /tmp/rekapi.compiled.js > dist/rekapi.min.js
-cp lib/underscore/underscore-min.js dist/underscore.js
+cp lib/underscore/_.min.js dist/_.js
cp lib/shifty/dist/shifty.min.js dist/shifty.js
cat /tmp/rekapi.header.js > dist/rekapi.bundle.min.js
-cat dist/underscore.js >> dist/rekapi.bundle.min.js
+cat dist/_.js >> dist/rekapi.bundle.min.js
# Semicolon insertions fix bizarre Closure bugs. They separate the libraries.
echo ";" >> dist/rekapi.bundle.min.js
View
@@ -9,7 +9,7 @@
require.config({
paths: {
shifty: "../dist/shifty",
- underscore: "../dist/underscore",
+ underscore: "../dist/_",
rekapi: "../dist/rekapi"
}
});
View
@@ -9,7 +9,7 @@
require.config({
paths: {
shifty: "../dist/shifty",
- underscore: "../dist/underscore",
+ underscore: "../dist/_",
rekapi: "../dist/rekapi"
}
});
View
@@ -11,7 +11,7 @@
require.config({
paths: {
shifty: "../dist/shifty",
- underscore: "../dist/underscore",
+ underscore: "../dist/_",
rekapi: "../dist/rekapi"
}
});
View
@@ -9,7 +9,7 @@
require.config({
paths: {
shifty: "../dist/shifty",
- underscore: "../dist/underscore",
+ underscore: "../dist/_",
rekapi: "../dist/rekapi"
}
});
File renamed without changes.
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Rekapi example</title>
- <script src="../../dist/underscore.js"></script>
+ <script src="../../dist/_.js"></script>
<script src="../../dist/shifty.js"></script>
<script src="../../dist/rekapi.js"></script>
</head>
@@ -2,7 +2,7 @@
<html>
<head>
<title>rekapi.toCSS();</title>
- <script src="../../../lib/underscore/underscore.js"></script>
+ <script src="../../../lib/underscore/_.js"></script>
<script src="../../../lib/shifty/dist/shifty.js"></script>
<script src="../../../src/rekapi.core.js"></script>
<script src="../../../src/rekapi.actor.js"></script>
@@ -2,7 +2,7 @@
<html>
<head>
<title>rekapi.toCSS();</title>
- <script src="../../../lib/underscore/underscore.js"></script>
+ <script src="../../../lib/underscore/_.js"></script>
<script src="../../../lib/shifty/dist/shifty.js"></script>
<script src="../../../src/rekapi.core.js"></script>
<script src="../../../src/rekapi.actor.js"></script>
View
@@ -2,7 +2,7 @@
<html>
<head>
<title>rekapi.toCSS();</title>
- <script src="../../lib/underscore/underscore.js"></script>
+ <script src="../../lib/underscore/_.js"></script>
<script src="../../lib/shifty/dist/shifty.js"></script>
<script src="../../src/rekapi.core.js"></script>
<script src="../../src/rekapi.actor.js"></script>
Submodule underscore deleted from 599d31
Oops, something went wrong.

0 comments on commit 57b5658

Please sign in to comment.