Permalink
Browse files

updated to 2.0.0-beta

  • Loading branch information...
1 parent 7998a58 commit 1c80026915bede91052125ef9f8aa6033b4e90b2 @podefr podefr committed Feb 5, 2014
Showing with 23,612 additions and 12,028 deletions.
  1. +27 −29 Makefile
  2. +1 −1 build/LICENSE
  3. +3,368 −3,079 build/Olives-map
  4. +1,840 −1,854 build/Olives.js
  5. +28 −30 build/Olives.min.js
  6. +342 −0 docs/2.0.0-beta/files.html
  7. +237 −0 docs/2.0.0-beta/index.html
  8. +383 −0 docs/2.0.0-beta/symbols/LocalStoreConstructor.html
  9. +620 −0 docs/2.0.0-beta/symbols/LocationRouterConstructor.html
  10. +572 −0 docs/2.0.0-beta/symbols/_global_.html
  11. +2,925 −0 docs/2.0.0-beta/symbols/module.exports.html
  12. +661 −0 docs/2.0.0-beta/symbols/src/src_Bind.plugin.js.html
  13. +112 −0 docs/2.0.0-beta/symbols/src/src_DomUtils.js.html
  14. +136 −0 docs/2.0.0-beta/symbols/src/src_Event.plugin.js.html
  15. +105 −0 docs/2.0.0-beta/symbols/src/src_LocalStore.js.html
  16. +183 −0 docs/2.0.0-beta/symbols/src/src_LocationRouter.js.html
  17. +204 −0 docs/2.0.0-beta/symbols/src/src_OObject.js.html
  18. +95 −0 docs/2.0.0-beta/symbols/src/src_Place.plugin.js.html
  19. +161 −0 docs/2.0.0-beta/symbols/src/src_Plugins.js.html
  20. +169 −0 docs/2.0.0-beta/symbols/src/src_SocketIOTransport.js.html
  21. +319 −0 docs/2.0.0-beta/symbols/src/src_Stack.js.html
  22. +26 −0 docs/2.0.0-beta/symbols/src/src_olives.js.html
  23. +16 −16 docs/latest/files.html
  24. +8 −56 docs/latest/index.html
  25. +383 −0 docs/latest/symbols/LocalStoreConstructor.html
  26. +620 −0 docs/latest/symbols/LocationRouterConstructor.html
  27. +261 −16 docs/latest/symbols/_global_.html
  28. +2,925 −0 docs/latest/symbols/module.exports.html
  29. +646 −649 docs/latest/symbols/src/src_Bind.plugin.js.html
  30. +101 −106 docs/latest/symbols/src/src_DomUtils.js.html
  31. +125 −133 docs/latest/symbols/src/src_Event.plugin.js.html
  32. +92 −99 docs/latest/symbols/src/src_LocalStore.js.html
  33. +170 −174 docs/latest/symbols/src/src_LocationRouter.js.html
  34. +189 −190 docs/latest/symbols/src/src_OObject.js.html
  35. +76 −79 docs/latest/symbols/src/src_Place.plugin.js.html
  36. +145 −149 docs/latest/symbols/src/src_Plugins.js.html
  37. +153 −158 docs/latest/symbols/src/src_SocketIOTransport.js.html
  38. +298 −307 docs/latest/symbols/src/src_Stack.js.html
  39. +26 −0 docs/latest/symbols/src/src_olives.js.html
  40. +3 −3 index.html
  41. BIN release/Olives-2.0.0-beta.tgz
  42. +911 −911 specs/Bind.plugin.spec.js
  43. +142 −144 specs/DomUtils.spec.js
  44. +169 −172 specs/Event.plugin.spec.js
  45. +134 −136 specs/LocalStore.spec.js
  46. +149 −151 specs/LocationRouter.spec.js
  47. +242 −243 specs/OObject.spec.js
  48. +76 −78 specs/Place.plugin.spec.js
  49. +177 −178 specs/Plugins.spec.js
  50. +160 −164 specs/SocketIOTransport.spec.js
  51. +277 −280 specs/Stack.spec.js
  52. +630 −626 specs/integration.spec.js
  53. +1 −2 specs/specHelper.js
  54. +539 −542 src/Bind.plugin.js
  55. +92 −96 src/DomUtils.js
  56. +104 −111 src/Event.plugin.js
  57. +85 −91 src/LocalStore.js
  58. +152 −156 src/LocationRouter.js
  59. +176 −176 src/OObject.js
  60. +66 −68 src/Place.plugin.js
  61. +139 −142 src/Plugins.js
  62. +145 −149 src/SocketIOTransport.js
  63. +276 −284 src/Stack.js
  64. +19 −0 src/olives.js
View
@@ -1,14 +1,14 @@
###############################################################################################
# Olives http://flams.github.com/olives
# The MIT License (MIT)
-# Copyright (c) 2012-2013 Olivier Scherrer <pode.fr@gmail.com>
+# Copyright (c) 2012-2014 Olivier Scherrer <pode.fr@gmail.com>
#
# Targets:
#
-# make tests: runs the JsTestDriver tests
+# make test: launch tests and watch for changes
#
# make docs: generates the documentation into docs/latest
-# make build: generates Olives.js and Olives.min.js as they appear in the release
+# make build: generates olives.js and olives.min.js as they appear in the release
#
# make all: tests + docs + build
#
@@ -19,39 +19,51 @@
################################################################################################
SRC := $(wildcard src/*.js)
-JsTestDriver = $(shell find tools -name "JsTestDriver-*.jar" -type f)
-all: tests docs build
+all: test docs build
+
+clean-temp:
+ rm -f temp.js
clean-docs:
-rm -rf docs/latest/
clean-build:
-rm -rf build/
-clean-temp:
- rm -f temp.js
-
docs: clean-docs
java -jar tools/JsDoc/jsrun.jar \
tools/JsDoc/app/run.js src \
-r=2 \
-d=docs/latest/ \
-t=tools/JsDoc/templates/jsdoc
-tests: temp.js
- java -jar $(JsTestDriver) \
- --tests all \
- --reset
+test:
+ watchify -r ./specs/*.js -i olives -o tests.js &
+ karma start karma.config.js
jshint:
jshint src/*.js specs/*.js
-build: clean-build Olives.js
+temp.js:
+ browserify -r ./src/olives.js:olives -u emily -o temp.js
+
+olives.js: temp.js
+ mkdir -p build
+ cat LICENSE-MINI temp.js > build/$@
+
+olives.min.js:
+ java -jar tools/GoogleCompiler/compiler.jar \
+ --js build/olives.js \
+ --js_output_file build/olives.min.js \
+ --create_source_map build/olives-map
+
+clean: clean-build clean-docs clean-temp
+
+build: clean-build clean-temp olives.js olives.min.js
cp LICENSE build/
- cp -rf src/ build/src/
-release: all
+release: docs build
ifndef VERSION
@echo "You must give a VERSION number to make release"
@exit 2
@@ -81,20 +93,6 @@ endif
git push --tags
-temp.js: clean-temp
- r.js -o tools/build.js
-
-Olives.js: temp.js
- mkdir -p build
- cat LICENSE-MINI temp.js > build/$@
-
- java -jar tools/GoogleCompiler/compiler.jar \
- --js build/Olives.js \
- --js_output_file build/Olives.min.js \
- --create_source_map build/Olives-map
-
-clean: clean-build clean-docs clean-temp
-
gh-pages:
ifndef VERSION
@echo "You must give a VERSION number to make gh-pages"
View
@@ -1,7 +1,7 @@
/**
* @license Olives http://flams.github.com/olives
* The MIT License (MIT)
- * Copyright (c) 2012-2013 Olivier Scherrer <pode.fr@gmail.com> - Olivier Wietrich <olivier.wietrich@gmail.com>
+ * Copyright (c) 2012-2014 Olivier Scherrer <pode.fr@gmail.com> - Olivier Wietrich <olivier.wietrich@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation
Oops, something went wrong.

0 comments on commit 1c80026

Please sign in to comment.