Permalink
Browse files

Merge branch 'master' of https://github.com/Flotype/now-tests

  • Loading branch information...
2 parents 61c11d7 + 4bca5e0 commit 253ad053d949100fc7dadf143be83988b07617e5 @DungFu DungFu committed Aug 5, 2011
@@ -8,22 +8,44 @@
<script type="text/javascript" src="lib/jasmine-1.0.2/jasmine-html.js"></script>
<!-- include source files here... -->
+ <script type = "text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script type="text/javascript" src="nowjs/now.js"></script>
<script type="text/javascript" src="spec/SpecHelper.js"></script>
- <!-- include spec files here... -->
- <script type="text/javascript" src="spec/RemoteSpec.js"></script>
- <script type="text/javascript" src="spec/ScopeSpec.js"></script>
- <script type="text/javascript" src="spec/VariableSpec.js"></script>
+ <!-- include spec files here...
+ <script type="text/javascript" src="spec/RemoteSpec.js"></script> -->
+ <script type="text/javascript" src="spec/ScopeSpec.js"></script>
+ <script type="text/javascript" src="spec/VariableSpec.js"></script>
+ <script type="text/javascript" src="spec/ClusterSpec.js"></script>
</head>
<body>
<script type="text/javascript">
- now.ready(function(){
- jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
- jasmine.getEnv().execute();
+
+ $(document).ready(function(){
+ now.clientside = function(cb){
+ cb();
+ }
+
+ now.clientside2 = function(one, three){
+ one(function two(){
+ three();
+ });
+ }
+
+ now.getKey = function(key, cb){
+ cb(now[key]);
+ }
+
+
+ now.ready(function(){
+ jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+ jasmine.getEnv().execute();
+ });
+
});
+
</script>
</body>
@@ -2,10 +2,33 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>Now client</title>
+<title>Now client</title>
<!-- include source files here... -->
- <script type="text/javascript" src="http://localhost:81/nowjs/now.js"></script>
+<script type = "text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+<script type="text/javascript"src="http://localhost:8080/nowjs/now.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ now.clientside = function(cb){
+ cb();
+ }
+
+ now.clientside2 = function(one, three){
+ one(function two(){
+ three();
+ });
+ }
+
+ now.getKey = function(key, cb){
+ cb(now[key]);
+ }
+
+ });
+</script>
+
+
+
</head>
<body>
Oops, something went wrong.

0 comments on commit 253ad05

Please sign in to comment.