You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/10/09 01:37:07 UTC
[1/2] git commit: Revert "THRIFT-2722: js: Fix javascript service
inheritance namespacing"
Repository: thrift
Updated Branches:
refs/heads/master 87caecf6f -> 275278e00
Revert "THRIFT-2722: js: Fix javascript service inheritance namespacing"
This reverts commit 9a7cb9f6c8e6cab5970075e2faf40944ce331ad2.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/371358ce
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/371358ce
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/371358ce
Branch: refs/heads/master
Commit: 371358ce4e58ed45e86c87cc79d3b67ac95cfc98
Parents: 87caecf
Author: Roger Meier <ro...@apache.org>
Authored: Thu Oct 9 01:17:06 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Thu Oct 9 01:17:06 2014 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_js_generator.cc | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/371358ce/compiler/cpp/src/generate/t_js_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc
index 74ec15a..7711aa5 100644
--- a/compiler/cpp/src/generate/t_js_generator.cc
+++ b/compiler/cpp/src/generate/t_js_generator.cc
@@ -1223,7 +1223,6 @@ void t_js_generator::generate_service_client(t_service* tservice) {
indent(f_service_) << "Thrift.inherits(" <<
js_namespace(tservice->get_program()) <<
service_name_ << "Client, " <<
- js_namespace(tservice->get_extends()->get_program()) <<
tservice->get_extends()->get_name() << "Client);" << endl;
} else {
//init prototype
[2/2] git commit: lib/js/test/test.html: fix thrift.js include
Posted by ro...@apache.org.
lib/js/test/test.html: fix thrift.js include
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/275278e0
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/275278e0
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/275278e0
Branch: refs/heads/master
Commit: 275278e00cf5217c4ec60fb8e7f23e3f51bc6db4
Parents: 371358c
Author: Roger Meier <ro...@apache.org>
Authored: Thu Oct 9 01:28:31 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Thu Oct 9 01:28:31 2014 +0200
----------------------------------------------------------------------
lib/js/test/test.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/275278e0/lib/js/test/test.html
----------------------------------------------------------------------
diff --git a/lib/js/test/test.html b/lib/js/test/test.html
index 91d1a97..cf9874f 100755
--- a/lib/js/test/test.html
+++ b/lib/js/test/test.html
@@ -22,7 +22,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Thrift Javascript Bindings: Unit Test</title>
- <script src="build/js/thrift.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../src/thrift.js" type="text/javascript" charset="utf-8"></script>
<script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
<script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>