Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't override run_in_init

  • Loading branch information...
commit 37c5d25ac867ef925ef95a8ae1ccb54642850df0 1 parent 1c8e595
@vesse authored
Showing with 9 additions and 4 deletions.
  1. +8 −3 test/browser/helpers/api.js
  2. +1 −1  test/browser/routes-harness.html
View
11 test/browser/helpers/api.js
@@ -24,10 +24,15 @@ function createTest(name, config, use, test) {
use = undefined;
}
- if (HTML5TEST && use === undefined) {
- use = {};
+ if (HTML5TEST) {
+ if (use === undefined) {
+ use = {};
+ }
+
+ if (use.run_handler_in_init === undefined) {
+ use.run_handler_in_init = false;
+ }
use.html5history = true;
- use.run_handler_in_init = false;
}
// Because of the use of setTimeout when defining onpopstate
View
2  test/browser/routes-harness.html
@@ -20,7 +20,7 @@ <h2 id="qunit-userAgent"></h2>
</script>
<script type="text/javascript" src="helpers/jquery.js"></script>
<script type="text/javascript" src="helpers/qunit.js"></script>
-<script type="text/javascript" src="../../build/director-1.0.9-1.js"></script>
+<script type="text/javascript" src="../../build/director-1.0.10.js"></script>
<script type="text/javascript" src="helpers/api.js"></script>
<script type="text/javascript" src="routes-test.js"></script>
</body>
Please sign in to comment.
Something went wrong with that request. Please try again.